播声音时按钮抬一下

This commit is contained in:
yangjing 2022-02-14 19:17:52 +08:00
parent a1b8386459
commit 993b7c37a9
5 changed files with 284 additions and 37 deletions

View File

@ -1473,11 +1473,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5298792260161447625} m_GameObject: {fileID: 5298792260161447625}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215490045069} m_Father: {fileID: 6497802586797708776}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -1548,11 +1548,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5298792260417177393} m_GameObject: {fileID: 5298792260417177393}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215490045069} m_Father: {fileID: 6497802586797708776}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -1916,7 +1916,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215842647045} m_Father: {fileID: 6302610832969893245}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -2136,11 +2136,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6286447948244971707} m_GameObject: {fileID: 6286447948244971707}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215451146749} m_Father: {fileID: 34053776397527907}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -2468,11 +2468,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6286447948628228390} m_GameObject: {fileID: 6286447948628228390}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215842647045} m_Father: {fileID: 6302610832969893245}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -2799,7 +2799,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6887168215451146749} m_Father: {fileID: 34053776397527907}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -3177,6 +3177,82 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6458051694319614635
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6302610832969893245}
- component: {fileID: 6149561236280679359}
- component: {fileID: 4099982278243283620}
m_Layer: 5
m_Name: Rct_Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6302610832969893245
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6458051694319614635}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6286447948628228385}
- {fileID: 6286447947997352258}
m_Father: {fileID: 6887168215842647045}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 137, y: 102}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6149561236280679359
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6458051694319614635}
m_CullTransparentMesh: 0
--- !u!114 &4099982278243283620
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6458051694319614635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 534877475a2b849d8aa17ea7b0b49e14, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6830972509022268529 --- !u!1 &6830972509022268529
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3910,8 +3986,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6286447948244971706} - {fileID: 34053776397527907}
- {fileID: 6286447949064428470}
m_Father: {fileID: 6887168215316828483} m_Father: {fileID: 6887168215316828483}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3941,7 +4016,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
@ -4012,6 +4087,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3} m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mRctContent: {fileID: 34053776397527907}
mGobCurrentSign: {fileID: 6286447948244971707} mGobCurrentSign: {fileID: 6286447948244971707}
mImgSound: {fileID: 6286447949064428465} mImgSound: {fileID: 6286447949064428465}
--- !u!1 &6887168215490045070 --- !u!1 &6887168215490045070
@ -4045,8 +4121,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 5298792260417177392} - {fileID: 6497802586797708776}
- {fileID: 5298792260161447624}
m_Father: {fileID: 6887168215316828483} m_Father: {fileID: 6887168215316828483}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4076,7 +4151,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
@ -4147,6 +4222,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3} m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mRctContent: {fileID: 6497802586797708776}
mGobCurrentSign: {fileID: 5298792260417177393} mGobCurrentSign: {fileID: 5298792260417177393}
mImgSound: {fileID: 5298792260161447623} mImgSound: {fileID: 5298792260161447623}
--- !u!1 &6887168215529506213 --- !u!1 &6887168215529506213
@ -4733,8 +4809,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6286447948628228385} - {fileID: 6302610832969893245}
- {fileID: 6286447947997352258}
m_Father: {fileID: 6887168215316828483} m_Father: {fileID: 6887168215316828483}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4764,7 +4839,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
@ -4835,6 +4910,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3} m_Script: {fileID: 11500000, guid: e454f797526d64a73b0979b60c44b9c1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mRctContent: {fileID: 6302610832969893245}
mGobCurrentSign: {fileID: 6286447948628228390} mGobCurrentSign: {fileID: 6286447948628228390}
mImgSound: {fileID: 6286447947997352269} mImgSound: {fileID: 6286447947997352269}
--- !u!1 &6887168215974240228 --- !u!1 &6887168215974240228
@ -6303,6 +6379,158 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &7816079273216334204
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6497802586797708776}
- component: {fileID: 3509114743643824023}
- component: {fileID: 6215445959091548766}
m_Layer: 5
m_Name: Rct_Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6497802586797708776
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7816079273216334204}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5298792260417177392}
- {fileID: 5298792260161447624}
m_Father: {fileID: 6887168215490045069}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 137, y: 102}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3509114743643824023
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7816079273216334204}
m_CullTransparentMesh: 0
--- !u!114 &6215445959091548766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7816079273216334204}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b2514bda504134539b420733ac6e0621, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8118063384032129243
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 34053776397527907}
- component: {fileID: 1459972613220067040}
- component: {fileID: 550952534874208141}
m_Layer: 5
m_Name: Rct_Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &34053776397527907
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8118063384032129243}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6286447948244971706}
- {fileID: 6286447949064428470}
m_Father: {fileID: 6887168215451146749}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 137, y: 102}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1459972613220067040
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8118063384032129243}
m_CullTransparentMesh: 0
--- !u!114 &550952534874208141
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8118063384032129243}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 898077f8ab73d4a5ab3bf565051d7fbc, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &9146214338938509918 --- !u!1 &9146214338938509918
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6502,15 +6730,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3cd75d2f64d6d2f4893878e1557b9426, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3cd75d2f64d6d2f4893878e1557b9426, type: 3}
--- !u!224 &3279367650155368925 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7209050224969113681, guid: 3cd75d2f64d6d2f4893878e1557b9426,
type: 3}
m_PrefabInstance: {fileID: 5298792261148012940}
m_PrefabAsset: {fileID: 0}
--- !u!95 &3279367650155368924 stripped --- !u!95 &3279367650155368924 stripped
Animator: Animator:
m_CorrespondingSourceObject: {fileID: 7209050224969113680, guid: 3cd75d2f64d6d2f4893878e1557b9426, m_CorrespondingSourceObject: {fileID: 7209050224969113680, guid: 3cd75d2f64d6d2f4893878e1557b9426,
type: 3} type: 3}
m_PrefabInstance: {fileID: 5298792261148012940} m_PrefabInstance: {fileID: 5298792261148012940}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!224 &3279367650155368925 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7209050224969113681, guid: 3cd75d2f64d6d2f4893878e1557b9426,
type: 3}
m_PrefabInstance: {fileID: 5298792261148012940}
m_PrefabAsset: {fileID: 0}

View File

@ -11,17 +11,19 @@ public class GameLogic : MonoBehaviour
private string mEndingStr; private string mEndingStr;
private int mCurIndex; private int mCurIndex;
private PanelGame mUIGame;
private void Start() private void Start()
{ {
PanelGame tUIGame = UIManager.Instance.OpenUI<PanelGame>(); mUIGame = UIManager.Instance.OpenUI<PanelGame>();
tUIGame.Init(true); mUIGame.Init(true);
mFilm = Instantiate(ResourceManager.Instance.LoadRes<Film>(Const.Path.GetFilm(PlayerData.Instance.CurrentLevelID))); mFilm = Instantiate(ResourceManager.Instance.LoadRes<Film>(Const.Path.GetFilm(PlayerData.Instance.CurrentLevelID)));
mFilm.transform.SetParent(mCtnStage); mFilm.transform.SetParent(mCtnStage);
mFilm.transform.localPosition = Vector3.zero; mFilm.transform.localPosition = Vector3.zero;
mFilm.transform.localScale = Vector3.one; mFilm.transform.localScale = Vector3.one;
tUIGame.DelPlay = PlayFilm; mUIGame.DelPlay = PlayFilm;
} }
private void PlayFilm(int[] pSoundOrder) private void PlayFilm(int[] pSoundOrder)
@ -40,9 +42,8 @@ public class GameLogic : MonoBehaviour
mFilm.PlayScene(mEndingStr); mFilm.PlayScene(mEndingStr);
mCurIndex = 0; mCurIndex = -1;
AudioManager.Instance.PlaySound(ResourceManager.Instance.LoadRes<AudioClip>(Const.Path.GetSound(PlayerData.Instance.CurrentLevelID, mSoundOrder[mCurIndex]))); PlaySound();
TimerManager.Instance.Schedule(PlaySound, 1.5f, mSoundOrder.Length);
} }
private void PlaySound() private void PlaySound()
@ -50,7 +51,9 @@ public class GameLogic : MonoBehaviour
mCurIndex++; mCurIndex++;
if (mCurIndex < mSoundOrder.Length) if (mCurIndex < mSoundOrder.Length)
{ {
mUIGame.RiseSlot(mCurIndex);
AudioManager.Instance.PlaySound(ResourceManager.Instance.LoadRes<AudioClip>(Const.Path.GetSound(PlayerData.Instance.CurrentLevelID, mSoundOrder[mCurIndex]))); AudioManager.Instance.PlaySound(ResourceManager.Instance.LoadRes<AudioClip>(Const.Path.GetSound(PlayerData.Instance.CurrentLevelID, mSoundOrder[mCurIndex])));
TimerManager.Instance.Schedule(PlaySound, 1.5f);
} }
else else
{ {
@ -61,11 +64,11 @@ public class GameLogic : MonoBehaviour
UIManager.Instance.CloseUI<PanelGame>(); UIManager.Instance.CloseUI<PanelGame>();
PanelResult tUIResult = UIManager.Instance.OpenUI<PanelResult>(); PanelResult tUIResult = UIManager.Instance.OpenUI<PanelResult>();
bool tHasComplete = PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count;
if (tEndingID >= 0) if (tEndingID >= 0)
{ {
bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID); bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID);
bool tHasComplete = tHasNew && (PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count);
EndingData tEdData = tLvData.Endings[tEndingID]; EndingData tEdData = tLvData.Endings[tEndingID];
if (tEdData.IsGoodEnding) if (tEdData.IsGoodEnding)
{ {
@ -81,7 +84,7 @@ public class GameLogic : MonoBehaviour
else else
{ {
AudioManager.Instance.PlaySound(AudioType.Lose); AudioManager.Instance.PlaySound(AudioType.Lose);
tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed()); tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed(), false, true);
} }
tUIResult.DelAgain = PlayAgain; tUIResult.DelAgain = PlayAgain;
@ -92,8 +95,8 @@ public class GameLogic : MonoBehaviour
{ {
UIManager.Instance.CloseUI<PanelResult>(); UIManager.Instance.CloseUI<PanelResult>();
PanelGame tUIGame = UIManager.Instance.OpenUI<PanelGame>(); mUIGame = UIManager.Instance.OpenUI<PanelGame>();
tUIGame.Init(); mUIGame.Init();
mFilm.PlayScene("0"); mFilm.PlayScene("0");
} }

View File

@ -3,11 +3,13 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using DG.Tweening;
public class ButtonSlot : MonoBehaviour public class ButtonSlot : MonoBehaviour
{ {
public Action<int> DelClick; public Action<int> DelClick;
[SerializeField] RectTransform mRctContent;
[SerializeField] GameObject mGobCurrentSign; [SerializeField] GameObject mGobCurrentSign;
[SerializeField] Image mImgSound; [SerializeField] Image mImgSound;
@ -36,6 +38,15 @@ public class ButtonSlot : MonoBehaviour
mImgSound.sprite = pSoundPic; mImgSound.sprite = pSoundPic;
} }
public void RiseUp()
{
Sequence tRiseSeq = DOTween.Sequence();
tRiseSeq.Append(mRctContent.DOAnchorPosY(70, 0.3f));
tRiseSeq.AppendInterval(0.5f);
tRiseSeq.Append(mRctContent.DOAnchorPosY(0, 0.3f));
tRiseSeq.Play();
}
private void OnClick() private void OnClick()
{ {
DelClick?.Invoke(mIndex); DelClick?.Invoke(mIndex);

View File

@ -61,6 +61,11 @@ public class PanelGame : BasePanel
} }
} }
public void RiseSlot(int pIndex)
{
mBtnSlots[pIndex].RiseUp();
}
private void ShowStage() private void ShowStage()
{ {
LevelData tLvData = GameConfig.Instance.GetLevelData(PlayerData.Instance.CurrentLevelID); LevelData tLvData = GameConfig.Instance.GetLevelData(PlayerData.Instance.CurrentLevelID);

View File

@ -74,7 +74,7 @@ public class PanelResult : BasePanel
} }
else else
{ {
mBtnEndings.ShowTip(!pIsWin); mBtnEndings.ShowTip(!pIsWin && !pHasComplete);
} }
} }