From ad7f341a0967b3a6909f3b1a98aa19eceb41c5c8 Mon Sep 17 00:00:00 2001 From: yangjing Date: Thu, 10 Feb 2022 18:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91bug=E5=92=8C=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/UIs/PanelEndings.prefab | 76 ++ Assets/Resources/UIs/PanelResult.prefab | 728 +++++++++++------- Assets/Scenes/Game.unity | 289 +++---- Assets/Scripts/Core/UIManager/BasePanel.cs | 30 +- Assets/Scripts/Core/UIManager/UIManager.cs | 29 +- Assets/Scripts/Game/GameLogic.cs | 11 +- Assets/Scripts/Storage/PlayerData.cs | 7 +- .../Scripts/UI/CustomControl/ButtonEndings.cs | 14 +- Assets/Scripts/UI/CustomControl/EndingCell.cs | 49 ++ Assets/Scripts/UI/PanelLevel.cs | 2 +- Assets/Scripts/UI/PanelResult.cs | 12 +- Assets/Scripts/UI/PanelSettings.cs | 4 +- 12 files changed, 804 insertions(+), 447 deletions(-) diff --git a/Assets/Resources/UIs/PanelEndings.prefab b/Assets/Resources/UIs/PanelEndings.prefab index bd922888..c23e2c4c 100644 --- a/Assets/Resources/UIs/PanelEndings.prefab +++ b/Assets/Resources/UIs/PanelEndings.prefab @@ -471,6 +471,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3265794304846577251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7718813726305274948} + - component: {fileID: 2147496012826409282} + - component: {fileID: 8607548136821256746} + m_Layer: 5 + m_Name: Gob_Playing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7718813726305274948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3265794304846577251} + 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: [] + m_Father: {fileID: 9139824452674523509} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -45, y: 0} + m_SizeDelta: {x: 55, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2147496012826409282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3265794304846577251} + m_CullTransparentMesh: 0 +--- !u!114 &8607548136821256746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3265794304846577251} + 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: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 53f4508396ce24d06871c936a8433750, 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 &5815201018659226921 GameObject: m_ObjectHideFlags: 0 @@ -966,6 +1040,7 @@ RectTransform: - {fileID: 1203140507409294579} - {fileID: 1203140507551499888} - {fileID: 9139824452435959342} + - {fileID: 7718813726305274948} m_Father: {fileID: 1696796731471630041} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -991,6 +1066,7 @@ MonoBehaviour: mGobGood: {fileID: 1203140507409294578} mBtnTip: {fileID: 1203140507551499889} mBtnAdTip: {fileID: 9139824452435959343} + mGobPlayingTip: {fileID: 3265794304846577251} --- !u!1 &9139824453269283209 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UIs/PanelResult.prefab b/Assets/Resources/UIs/PanelResult.prefab index 874c04ed..ac052b29 100644 --- a/Assets/Resources/UIs/PanelResult.prefab +++ b/Assets/Resources/UIs/PanelResult.prefab @@ -1,5 +1,443 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &32449617194617116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32449617194617117} + - component: {fileID: 32449617194617107} + - component: {fileID: 32449617194617106} + - component: {fileID: 32449617194617104} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32449617194617117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617194617116} + 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: [] + m_Father: {fileID: 8204993569498794287} + 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: 9} + m_SizeDelta: {x: 66, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &32449617194617107 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617194617116} + m_CullTransparentMesh: 0 +--- !u!114 &32449617194617106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617194617116} + 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: 9cb6cd5093480465ba753642bcda4f0c, 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!114 &32449617194617104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617194617116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 539362ffcf9bc4a8cb2be32a27fb8d79, type: 3} + m_Name: + m_EditorClassIdentifier: + mSprFrames: + - {fileID: 21300000, guid: 9cb6cd5093480465ba753642bcda4f0c, type: 3} + - {fileID: 21300000, guid: c3ada877c1f314dc3a4e4a0d607c6a97, type: 3} + mFrameRate: 10 + mIsPlaying: 1 +--- !u!1 &32449617214598456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32449617214598457} + - component: {fileID: 32449617214598460} + - component: {fileID: 32449617214598463} + - component: {fileID: 32449617214598462} + m_Layer: 5 + m_Name: Gob_New + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &32449617214598457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617214598456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 6904755265547789116} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 60, y: -40} + m_SizeDelta: {x: 91, y: 80} + m_Pivot: {x: 1, y: 0} +--- !u!222 &32449617214598460 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617214598456} + m_CullTransparentMesh: 0 +--- !u!114 &32449617214598463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617214598456} + 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: 96dcae40f043d4249bea93cb53505f92, 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!114 &32449617214598462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617214598456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3} + m_Name: + m_EditorClassIdentifier: + updateType: 0 + isSpeedBased: 0 + hasOnStart: 0 + hasOnPlay: 0 + hasOnUpdate: 0 + hasOnStepComplete: 0 + hasOnComplete: 0 + hasOnTweenCreated: 0 + hasOnRewind: 0 + onStart: + m_PersistentCalls: + m_Calls: [] + onPlay: + m_PersistentCalls: + m_Calls: [] + onUpdate: + m_PersistentCalls: + m_Calls: [] + onStepComplete: + m_PersistentCalls: + m_Calls: [] + onComplete: + m_PersistentCalls: + m_Calls: [] + onTweenCreated: + m_PersistentCalls: + m_Calls: [] + onRewind: + m_PersistentCalls: + m_Calls: [] + targetIsSelf: 1 + targetGO: {fileID: 0} + tweenTargetIsTargetGO: 1 + delay: 0 + duration: 0.5 + easeType: 30 + easeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + loopType: 0 + loops: 1 + id: + isRelative: 0 + isFrom: 0 + isIndependentUpdate: 0 + autoKill: 1 + isActive: 1 + isValid: 1 + target: {fileID: 32449617214598457} + animationType: 5 + targetType: 11 + forcedTargetType: 0 + autoPlay: 1 + useTargetAsV3: 0 + endValueFloat: 1 + endValueV3: {x: 0, y: 0, z: 0} + endValueV2: {x: 0, y: 0} + endValueColor: {r: 1, g: 1, b: 1, a: 1} + endValueString: + endValueRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + endValueTransform: {fileID: 0} + optionalBool0: 1 + optionalFloat0: 0 + optionalInt0: 0 + optionalRotationMode: 0 + optionalScrambleMode: 0 + optionalString: +--- !u!1 &32449617334058881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32449617334058886} + - component: {fileID: 32449617334058884} + - component: {fileID: 32449617334058887} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32449617334058886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617334058881} + 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: [] + m_Father: {fileID: 6904755266457718618} + 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: -360} + m_SizeDelta: {x: 880, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &32449617334058884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617334058881} + m_CullTransparentMesh: 0 +--- !u!114 &32449617334058887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617334058881} + 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: f68a4873256bf455db78251dd4103b87, type: 3} + m_Type: 1 + 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 &32449617347673152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32449617347673153} + - component: {fileID: 32449617347673159} + - component: {fileID: 32449617347673158} + - component: {fileID: 32449617347673156} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32449617347673153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617347673152} + 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: [] + m_Father: {fileID: 8204993569651742230} + 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: 9} + m_SizeDelta: {x: 66, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &32449617347673159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617347673152} + m_CullTransparentMesh: 0 +--- !u!114 &32449617347673158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617347673152} + 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: 5047ba78c2fbd4f3188c06fd4560b19a, 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!114 &32449617347673156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32449617347673152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 539362ffcf9bc4a8cb2be32a27fb8d79, type: 3} + m_Name: + m_EditorClassIdentifier: + mSprFrames: + - {fileID: 21300000, guid: 5047ba78c2fbd4f3188c06fd4560b19a, type: 3} + - {fileID: 21300000, guid: dcfd40aeb39d14840a3562873a91d161, type: 3} + mFrameRate: 10 + mIsPlaying: 1 --- !u!1 &1969282074757018000 GameObject: m_ObjectHideFlags: 0 @@ -263,15 +701,15 @@ RectTransform: m_GameObject: {fileID: 1969282075625028089} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6904755266457718618} + m_Father: {fileID: 6904755264509920498} 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: -360} - m_SizeDelta: {x: 880, y: 800} + m_AnchoredPosition: {x: 0, y: -85} + m_SizeDelta: {x: 880, y: 249} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1969282075625028092 CanvasRenderer: @@ -301,7 +739,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f68a4873256bf455db78251dd4103b87, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -321,7 +759,6 @@ GameObject: - component: {fileID: 1969282075647130169} - component: {fileID: 1969282075647130175} - component: {fileID: 1969282075647130174} - - component: {fileID: 1969282075647130172} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -340,13 +777,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8204993569651742230} - m_RootOrder: 0 + m_Father: {fileID: 3844714965755522504} + m_RootOrder: 1 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: 9} - m_SizeDelta: {x: 66, y: 72} + m_AnchoredPosition: {x: -8, y: 17} + m_SizeDelta: {x: 37, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1969282075647130175 CanvasRenderer: @@ -375,7 +812,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5047ba78c2fbd4f3188c06fd4560b19a, type: 3} + m_Sprite: {fileID: 21300000, guid: 83e86ecb7fe7d4c84adf9e0882c0b40e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -385,115 +822,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1969282075647130172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969282075647130168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 539362ffcf9bc4a8cb2be32a27fb8d79, type: 3} - m_Name: - m_EditorClassIdentifier: - mSprFrames: - - {fileID: 21300000, guid: 5047ba78c2fbd4f3188c06fd4560b19a, type: 3} - - {fileID: 21300000, guid: dcfd40aeb39d14840a3562873a91d161, type: 3} - mFrameRate: 10 - mIsPlaying: 1 ---- !u!1 &1969282075816939364 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1969282075816939365} - - component: {fileID: 1969282075816939371} - - component: {fileID: 1969282075816939370} - - component: {fileID: 1969282075816939368} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1969282075816939365 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969282075816939364} - 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: [] - m_Father: {fileID: 8204993569498794287} - 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: 9} - m_SizeDelta: {x: 66, y: 72} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1969282075816939371 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969282075816939364} - m_CullTransparentMesh: 0 ---- !u!114 &1969282075816939370 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969282075816939364} - 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: 9cb6cd5093480465ba753642bcda4f0c, 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!114 &1969282075816939368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969282075816939364} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 539362ffcf9bc4a8cb2be32a27fb8d79, type: 3} - m_Name: - m_EditorClassIdentifier: - mSprFrames: - - {fileID: 21300000, guid: 9cb6cd5093480465ba753642bcda4f0c, type: 3} - - {fileID: 21300000, guid: c3ada877c1f314dc3a4e4a0d607c6a97, type: 3} - mFrameRate: 10 - mIsPlaying: 1 --- !u!1 &1969282075864200453 GameObject: m_ObjectHideFlags: 0 @@ -834,7 +1162,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3844714966604585977} - - {fileID: 6904755265945468661} + - {fileID: 1969282075647130169} m_Father: {fileID: 6904755265547789116} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1131,7 +1459,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6904755265390003727} + - {fileID: 1969282075625028094} - {fileID: 8204993568888409271} - {fileID: 8204993569410405308} m_Father: {fileID: 6904755265700125195} @@ -1298,80 +1626,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 8 ---- !u!1 &6904755265390003726 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6904755265390003727} - - component: {fileID: 6904755265390003725} - - component: {fileID: 6904755265390003724} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6904755265390003727 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265390003726} - 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: [] - m_Father: {fileID: 6904755264509920498} - 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: -85} - m_SizeDelta: {x: 880, y: 249} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6904755265390003725 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265390003726} - m_CullTransparentMesh: 0 ---- !u!114 &6904755265390003724 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265390003726} - 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: f68a4873256bf455db78251dd4103b87, 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 &6904755265547789119 GameObject: m_ObjectHideFlags: 0 @@ -1408,6 +1662,7 @@ RectTransform: - {fileID: 3844714966868319705} - {fileID: 3844714965959359736} - {fileID: 3844714965755522504} + - {fileID: 32449617214598457} m_Father: {fileID: 6904755266457718618} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1514,6 +1769,7 @@ MonoBehaviour: mTxtTotal: {fileID: 6904755265327570260} mImgIcon: {fileID: 3844714966604585976} mGobTips: {fileID: 3844714966868319526} + mGobNew: {fileID: 32449617214598456} --- !u!95 &7676866810232408424 Animator: serializedVersion: 3 @@ -1685,80 +1941,6 @@ MonoBehaviour: mBtnNext: {fileID: 1969282075994291292} mBtnChoose: {fileID: 1969282075043006507} mBtnEndings: {fileID: 3844714966269200113} ---- !u!1 &6904755265945468660 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6904755265945468661} - - component: {fileID: 6904755265945468667} - - component: {fileID: 6904755265945468666} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6904755265945468661 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265945468660} - 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: [] - m_Father: {fileID: 3844714965755522504} - m_RootOrder: 1 - 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: -8, y: 17} - m_SizeDelta: {x: 37, y: 39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6904755265945468667 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265945468660} - m_CullTransparentMesh: 0 ---- !u!114 &6904755265945468666 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6904755265945468660} - 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: 83e86ecb7fe7d4c84adf9e0882c0b40e, 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 &6904755266457718613 GameObject: m_ObjectHideFlags: 0 @@ -1786,7 +1968,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1969282075625028094} + - {fileID: 32449617334058886} - {fileID: 6904755264961136810} - {fileID: 6904755265547789116} - {fileID: 8204993569498794287} @@ -1977,7 +2159,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1969282075816939365} + - {fileID: 32449617194617117} m_Father: {fileID: 6904755266457718618} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2013,7 +2195,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1969282075647130169} + - {fileID: 32449617347673153} m_Father: {fileID: 6904755266457718618} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 617c20e7..8158de57 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -300,9 +300,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4946020809530057780} - - {fileID: 7676866811056894034} + - {fileID: 4937869104808819833} - {fileID: 987875187} - - {fileID: 1714038173902949465} + - {fileID: 8767444850111818679} - {fileID: 8174312654083100069} m_Father: {fileID: 1041748534} m_RootOrder: 2 @@ -497,6 +497,12 @@ Transform: m_Father: {fileID: 1041748534} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1770684846 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5217953656601869386, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, + type: 3} + m_PrefabInstance: {fileID: 32449617244610570} + m_PrefabAsset: {fileID: 0} --- !u!1 &2101175958 GameObject: m_ObjectHideFlags: 0 @@ -532,13 +538,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &1714038173902949465 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - m_PrefabInstance: {fileID: 9139824453546146422} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1969282075732289138 +--- !u!1001 &32449617244610570 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -660,8 +660,19 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8204993569251464742, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, + type: 3} + propertyPath: mGobFx + value: + objectReference: {fileID: 1770684846} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, type: 3} +--- !u!224 &4937869104808819833 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, + type: 3} + m_PrefabInstance: {fileID: 32449617244610570} + m_PrefabAsset: {fileID: 0} --- !u!224 &4946020809530057780 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6887168216434345711, guid: 841ca4be8d96342da81473d244f04f57, @@ -872,12 +883,130 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 841ca4be8d96342da81473d244f04f57, type: 3} ---- !u!224 &7676866811056894034 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, - type: 3} - m_PrefabInstance: {fileID: 1969282075732289138} - m_PrefabAsset: {fileID: 0} +--- !u!1001 &6395436234779048092 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 981190536} + m_Modifications: + - target: {fileID: 539047986927620544, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_Name + value: PanelEndings + objectReference: {fileID: 0} + - target: {fileID: 539047986927620544, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 25cbbba289b6a49d6916bc6215534770, type: 3} --- !u!224 &8174312654083100069 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, @@ -1013,6 +1142,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} +--- !u!224 &8767444850111818679 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, + type: 3} + m_PrefabInstance: {fileID: 6395436234779048092} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9049642900195122466 PrefabInstance: m_ObjectHideFlags: 0 @@ -1137,127 +1272,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8385fb91fee3f4c06b62f2d911f48b3b, type: 3} ---- !u!1001 &9139824453546146422 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 981190536} - m_Modifications: - - target: {fileID: 539047986927620544, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_Name - value: PanelEndings - objectReference: {fileID: 0} - - target: {fileID: 539047986927620544, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 25cbbba289b6a49d6916bc6215534770, type: 3} diff --git a/Assets/Scripts/Core/UIManager/BasePanel.cs b/Assets/Scripts/Core/UIManager/BasePanel.cs index d35ed428..a528787b 100644 --- a/Assets/Scripts/Core/UIManager/BasePanel.cs +++ b/Assets/Scripts/Core/UIManager/BasePanel.cs @@ -6,35 +6,23 @@ public class BasePanel : MonoBehaviour { public bool IsOpened => gameObject.activeSelf; - public void Open() + public virtual void OnOpen() { - gameObject.SetActive(true); - OnOpen(); + } - protected virtual void OnOpen() + public virtual void OnClose() + { + + } + + public virtual void OnFocus(bool pFocus) { } public void Close() { - gameObject.SetActive(false); - OnClose(); - } - - protected virtual void OnClose() - { - - } - - public void Focus(bool pFocus) - { - OnFocus(pFocus); - } - - protected virtual void OnFocus(bool pFocus) - { - + UIManager.Instance.CloseUI(this); } } \ No newline at end of file diff --git a/Assets/Scripts/Core/UIManager/UIManager.cs b/Assets/Scripts/Core/UIManager/UIManager.cs index 253880e3..0c54e974 100644 --- a/Assets/Scripts/Core/UIManager/UIManager.cs +++ b/Assets/Scripts/Core/UIManager/UIManager.cs @@ -48,7 +48,8 @@ public class UIManager : S_MonoSingleton public T OpenUI() where T : BasePanel { T tUI = GetUI(); - tUI.Open(); + tUI.gameObject.SetActive(true); + tUI.OnOpen(); if (mUIList.Contains(tUI)) { @@ -56,7 +57,7 @@ public class UIManager : S_MonoSingleton } if (mUIList.Count > 0) { - mUIList[mUIList.Count - 1].Focus(false); + mUIList[mUIList.Count - 1].OnFocus(false); } mUIList.Add(tUI); @@ -66,7 +67,8 @@ public class UIManager : S_MonoSingleton public T CloseUI() where T : BasePanel { T tUI = GetUI(); - tUI.Close(); + tUI.gameObject.SetActive(false); + tUI.OnClose(); int tIndex = mUIList.IndexOf(tUI); if (tIndex == mUIList.Count - 1) @@ -74,7 +76,7 @@ public class UIManager : S_MonoSingleton mUIList.Remove(tUI); if (mUIList.Count > 0) { - mUIList[mUIList.Count - 1].Focus(true); + mUIList[mUIList.Count - 1].OnFocus(true); } } else @@ -85,6 +87,25 @@ public class UIManager : S_MonoSingleton return tUI; } + public void CloseUI(BasePanel pBasePanel) + { + pBasePanel.gameObject.SetActive(false); + + int tIndex = mUIList.IndexOf(pBasePanel); + if (tIndex == mUIList.Count - 1) + { + mUIList.Remove(pBasePanel); + if (mUIList.Count > 0) + { + mUIList[mUIList.Count - 1].OnFocus(true); + } + } + else + { + mUIList.Remove(pBasePanel); + } + } + public T GetUI() where T : BasePanel { T tUI = null; diff --git a/Assets/Scripts/Game/GameLogic.cs b/Assets/Scripts/Game/GameLogic.cs index 267920b0..a3ae9586 100644 --- a/Assets/Scripts/Game/GameLogic.cs +++ b/Assets/Scripts/Game/GameLogic.cs @@ -66,15 +66,18 @@ public class GameLogic : MonoBehaviour PanelResult tUIResult = UIManager.Instance.OpenUI(); if (tEndingID >= 0) { - PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID); - PlayerData.Instance.UnlockNewLevel(); + bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID); EndingData tEdData = tLvData.Endings[tEndingID]; - tUIResult.Init(PlayerData.Instance.CurrentLevelID, tEdData.EndingName, tEdData.IsGoodEnding, false); + if (tEdData.IsGoodEnding) + { + PlayerData.Instance.UnlockNewLevel(); + } + tUIResult.Init(PlayerData.Instance.CurrentLevelID, tEdData.EndingName, tEdData.IsGoodEnding, tHasNew, PlayerData.Instance.HasUnlockedAllLevel()); } else { - tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, false); + tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, false, PlayerData.Instance.HasUnlockedAllLevel()); } tUIResult.DelAgain = PlayAgain; diff --git a/Assets/Scripts/Storage/PlayerData.cs b/Assets/Scripts/Storage/PlayerData.cs index c77105e5..0d4e825f 100644 --- a/Assets/Scripts/Storage/PlayerData.cs +++ b/Assets/Scripts/Storage/PlayerData.cs @@ -40,12 +40,17 @@ public class PlayerData : StorageBase public void UnlockNewLevel() { - if (mUnlockedLevel < GameConfig.Instance.LevelSort.Count) + if (mCurrentLevel == mUnlockedLevel && mUnlockedLevel < GameConfig.Instance.LevelSort.Count) { mUnlockedLevel++; } } + public bool HasUnlockedAllLevel() + { + return mUnlockedLevel == GameConfig.Instance.LevelSort.Count; + } + public bool AddEnding(int pLevelID, int pEndingID) { if (!mEndingDic.ContainsKey(pLevelID)) diff --git a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs index d714ce8c..572ff751 100644 --- a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs +++ b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs @@ -17,6 +17,7 @@ public class ButtonEndings : MonoBehaviour [SerializeField] Image mImgIcon; [SerializeField] GameObject mGobTips; + [SerializeField] GameObject mGobNew; private bool mIsCompleted; @@ -48,7 +49,18 @@ public class ButtonEndings : MonoBehaviour public void ShowTip(bool pShow) { - mGobTips.SetActive(pShow); + if (mGobTips != null) + { + mGobTips.SetActive(pShow); + } + } + + public void ShowNew(bool pShow) + { + if (mGobNew != null) + { + mGobNew.SetActive(pShow); + } } private void OnClick() diff --git a/Assets/Scripts/UI/CustomControl/EndingCell.cs b/Assets/Scripts/UI/CustomControl/EndingCell.cs index a91a14c8..c9db1b42 100644 --- a/Assets/Scripts/UI/CustomControl/EndingCell.cs +++ b/Assets/Scripts/UI/CustomControl/EndingCell.cs @@ -10,17 +10,31 @@ public class EndingCell : MonoBehaviour [SerializeField] GameObject mGobGood; [SerializeField] Button mBtnTip; [SerializeField] Button mBtnAdTip; + [SerializeField] GameObject mGobPlayingTip; private int mLevelID; private int mEndingID; private EndingData mEdData; + private List mTipSoundList; + private TimerUnit mTipPlayTimer; + private int mTipIndex; + private void Awake() { UIUtils.BindBtn(mBtnTip, OnClickTip); UIUtils.BindBtn(mBtnAdTip, OnClickAdTip); } + private void OnDisable() + { + if (mTipPlayTimer != null) + { + mTipPlayTimer.Destroy(); + mTipPlayTimer = null; + } + } + public void Init(int pLevelID, int pEndingID) { mLevelID = pLevelID; @@ -35,11 +49,46 @@ public class EndingCell : MonoBehaviour bool tHasWatchedAdTip = PlayerData.Instance.HasWatchedEndingAdTip(mLevelID, mEndingID); mBtnTip.gameObject.SetActive(tHasWatchedAdTip); mBtnAdTip.gameObject.SetActive(!tHasWatchedAdTip); + + mGobPlayingTip.SetActive(false); } private void OnClickTip() { + string[] tTemplateEndingStrs = mEdData.EndingCode.Split(';'); + mTipSoundList = new List(); + for (int i = 0; i < tTemplateEndingStrs[0].Length; i++) + { + int tSoundIndex = tTemplateEndingStrs[0][i] == 'X' ? 0 : (int.Parse(tTemplateEndingStrs[0][i].ToString()) - 1); + + mTipSoundList.Add(ResourceManager.Instance.LoadRes(Const.Path.GetSound(mLevelID, tSoundIndex))); + } + + if (mTipPlayTimer == null) + { + mTipPlayTimer = TimerManager.Instance.CreateTimerUnit(); + } + + mTipIndex = 0; + mTipPlayTimer.CancelTimer(); + mTipPlayTimer.StartTimer(PlayOneTip, 0.3f); + mGobPlayingTip.SetActive(true); + } + + private void PlayOneTip() + { + AudioManager.Instance.PlaySound(mTipSoundList[mTipIndex]); + mTipIndex++; + + if (mTipIndex < mTipSoundList.Count) + { + mTipPlayTimer.StartTimer(PlayOneTip, 1f); + } + else + { + mGobPlayingTip.SetActive(false); + } } private void OnClickAdTip() diff --git a/Assets/Scripts/UI/PanelLevel.cs b/Assets/Scripts/UI/PanelLevel.cs index 90155dd0..2dd22725 100644 --- a/Assets/Scripts/UI/PanelLevel.cs +++ b/Assets/Scripts/UI/PanelLevel.cs @@ -19,7 +19,7 @@ public class PanelLevel : BasePanel mLvList.DelClickLevel = OnClickLevel; } - protected override void OnOpen() + public override void OnOpen() { base.OnOpen(); diff --git a/Assets/Scripts/UI/PanelResult.cs b/Assets/Scripts/UI/PanelResult.cs index 1126ada8..a6628b81 100644 --- a/Assets/Scripts/UI/PanelResult.cs +++ b/Assets/Scripts/UI/PanelResult.cs @@ -19,6 +19,8 @@ public class PanelResult : BasePanel [SerializeField] GameObject mGobWinBtns; [SerializeField] GameObject mGobOtherBtns; + [SerializeField] GameObject mGobFx; + [SerializeField] Button mBtnAgain1; [SerializeField] Button mBtnAgain2; [SerializeField] Button mBtnNext; @@ -36,7 +38,14 @@ public class PanelResult : BasePanel mBtnEndings.DelClick = OnClickEndings; } - public void Init(int pLevelID, string pEndingName,bool pIsWin, bool pAllLevelClear) + public override void OnFocus(bool pFocus) + { + base.OnFocus(pFocus); + + mGobFx.SetActive(pFocus); + } + + public void Init(int pLevelID, string pEndingName,bool pIsWin, bool pHasNew, bool pAllLevelClear) { mTxtEndingName.text = pEndingName; @@ -51,6 +60,7 @@ public class PanelResult : BasePanel LevelData tLvData = GameConfig.Instance.GetLevelData(pLevelID); mBtnEndings.Init(pLevelID, PlayerData.Instance.EndingCountOfLevel(pLevelID), tLvData.Endings.Count); + mBtnEndings.ShowNew(pHasNew); } private void OnClickAgain() diff --git a/Assets/Scripts/UI/PanelSettings.cs b/Assets/Scripts/UI/PanelSettings.cs index 282d9611..3edc68ec 100644 --- a/Assets/Scripts/UI/PanelSettings.cs +++ b/Assets/Scripts/UI/PanelSettings.cs @@ -18,7 +18,7 @@ public class PanelSettings : BasePanel UIUtils.BindBtn(mBtnMask, OnClickMask); } - protected override void OnOpen() + public override void OnOpen() { base.OnOpen(); @@ -35,7 +35,7 @@ public class PanelSettings : BasePanel mRctBg.DOAnchorPosY(170, 0.3f); } - protected override void OnClose() + public override void OnClose() { base.OnClose();