From 535707e9cca6de9fd92c2e4478a6a4de635b35bd Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Fri, 23 Aug 2024 17:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90Bug=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E8=B5=84=E6=BA=90=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Forest/Assets/Art/Animation/Btn.controller | 72 - .../Assets/Art/Animation/Btn.controller.meta | 8 - .../{Bubble_Shake.anim => BubbleShake.anim} | 2 +- ..._Shake.anim.meta => BubbleShake.anim.meta} | 0 ...bble.controller => BubbleShake.controller} | 2 +- ...oller.meta => BubbleShake.controller.meta} | 0 Forest/Assets/Art/Animation/BuildBtn.anim | 191 --- .../Assets/Art/Animation/BuildBtn.anim.meta | 8 - Forest/Assets/Art/Animation/CoinShake.anim | 284 --- .../Assets/Art/Animation/CoinShake.anim.meta | 8 - .../Art/Animation/Img_Avatar.controller | 72 - .../Art/Animation/Img_Avatar.controller.meta | 8 - .../Level.meta} | 5 +- .../{ADShake.anim => Level/ADIconShake.anim} | 2 +- .../ADIconShake.anim.meta} | 0 .../ADIconShake.controller} | 2 +- .../ADIconShake.controller.meta} | 0 .../AddTimeNumber.anim} | 2 +- .../AddTimeNumber.anim.meta} | 0 .../AddTimeNumber.controller} | 2 +- .../AddTimeNumber.controller.meta} | 0 .../LevelFailADPopup.anim} | 2 +- .../LevelFailADPopup.anim.meta} | 0 .../LevelFailADPopup.controller} | 4 +- .../LevelFailADPopup.controller.meta} | 0 .../LevelGuideFinger.anim} | 2 +- .../LevelGuideFinger.anim.meta} | 0 .../LosePanelAddTime.anim} | 2 +- .../LosePanelAddTime.anim.meta} | 0 .../LosePanelAddTime.controller} | 4 +- .../LosePanelAddTime.controller.meta} | 0 .../Assets/Art/Animation/OwnCoins.controller | 133 -- .../Art/Animation/OwnCoins.controller.meta | 8 - .../Select/{Blue.anim => BlueMove.anim} | 2 +- .../{Blue.anim.meta => BlueMove.anim.meta} | 0 ...mg_Blue.controller => BlueMove.controller} | 2 +- ...ntroller.meta => BlueMove.controller.meta} | 0 .../Select/{Yellow.anim => YellowMove.anim} | 2 +- ...{Yellow.anim.meta => YellowMove.anim.meta} | 0 ...ellow.controller => YellowMove.controller} | 2 +- ...roller.meta => YellowMove.controller.meta} | 0 .../StartMain.meta} | 5 +- .../Cloud1Move.anim} | 2 +- .../Cloud1Move.anim.meta} | 0 .../Cloud1Move.controller} | 2 +- .../Cloud1Move.controller.meta} | 0 .../Cloud2Move.anim} | 2 +- .../Cloud2Move.anim.meta} | 0 .../Cloud2Move.controller} | 2 +- .../Cloud2Move.controller.meta} | 0 .../Assets/Art/UI/Prefab/UIMainPanel.prefab | 1515 ----------------- .../Assets/Art/UI/Prefab/UIMainPanelBG.prefab | 417 ----- .../Framework/Constants/Constants.UI.cs | 2 - .../UI/StartPanel/UIMainPanelBGController.cs | 38 - .../UIMainPanelBGController.cs.meta | 11 - .../UI/StartPanel/UIMainPanelController.cs | 139 -- .../StartPanel/UIMainPanelController.cs.meta | 11 - .../Assets/Scripts/Framework/UI/UIManager.cs | 4 +- Forest/Assets/Scripts/Gameplay/LevelState.cs | 2 +- 59 files changed, 29 insertions(+), 2954 deletions(-) delete mode 100644 Forest/Assets/Art/Animation/Btn.controller delete mode 100644 Forest/Assets/Art/Animation/Btn.controller.meta rename Forest/Assets/Art/Animation/Build/{Bubble_Shake.anim => BubbleShake.anim} (99%) rename Forest/Assets/Art/Animation/Build/{Bubble_Shake.anim.meta => BubbleShake.anim.meta} (100%) rename Forest/Assets/Art/Animation/Build/{Bubble.controller => BubbleShake.controller} (98%) rename Forest/Assets/Art/Animation/Build/{Bubble.controller.meta => BubbleShake.controller.meta} (100%) delete mode 100644 Forest/Assets/Art/Animation/BuildBtn.anim delete mode 100644 Forest/Assets/Art/Animation/BuildBtn.anim.meta delete mode 100644 Forest/Assets/Art/Animation/CoinShake.anim delete mode 100644 Forest/Assets/Art/Animation/CoinShake.anim.meta delete mode 100644 Forest/Assets/Art/Animation/Img_Avatar.controller delete mode 100644 Forest/Assets/Art/Animation/Img_Avatar.controller.meta rename Forest/Assets/Art/{UI/Prefab/UIMainPanel.prefab.meta => Animation/Level.meta} (57%) rename Forest/Assets/Art/Animation/{ADShake.anim => Level/ADIconShake.anim} (99%) rename Forest/Assets/Art/Animation/{ADShake.anim.meta => Level/ADIconShake.anim.meta} (100%) rename Forest/Assets/Art/Animation/{ADShake.controller => Level/ADIconShake.controller} (98%) rename Forest/Assets/Art/Animation/{ADShake.controller.meta => Level/ADIconShake.controller.meta} (100%) rename Forest/Assets/Art/Animation/{AddTime.anim => Level/AddTimeNumber.anim} (99%) rename Forest/Assets/Art/Animation/{AddTime.anim.meta => Level/AddTimeNumber.anim.meta} (100%) rename Forest/Assets/Art/Animation/{AddTime.controller => Level/AddTimeNumber.controller} (99%) rename Forest/Assets/Art/Animation/{AddTime.controller.meta => Level/AddTimeNumber.controller.meta} (100%) rename Forest/Assets/Art/Animation/{ADPopup.anim => Level/LevelFailADPopup.anim} (99%) rename Forest/Assets/Art/Animation/{ADPopup.anim.meta => Level/LevelFailADPopup.anim.meta} (100%) rename Forest/Assets/Art/Animation/{UIADPopup.controller => Level/LevelFailADPopup.controller} (96%) rename Forest/Assets/Art/Animation/{UIADPopup.controller.meta => Level/LevelFailADPopup.controller.meta} (100%) rename Forest/Assets/Art/Animation/{Guide_finger.anim => Level/LevelGuideFinger.anim} (99%) rename Forest/Assets/Art/Animation/{Guide_finger.anim.meta => Level/LevelGuideFinger.anim.meta} (100%) rename Forest/Assets/Art/Animation/{LoseAddTime.anim => Level/LosePanelAddTime.anim} (99%) rename Forest/Assets/Art/Animation/{LoseAddTime.anim.meta => Level/LosePanelAddTime.anim.meta} (100%) rename Forest/Assets/Art/Animation/{Btn_AddTime.controller => Level/LosePanelAddTime.controller} (96%) rename Forest/Assets/Art/Animation/{Btn_AddTime.controller.meta => Level/LosePanelAddTime.controller.meta} (100%) delete mode 100644 Forest/Assets/Art/Animation/OwnCoins.controller delete mode 100644 Forest/Assets/Art/Animation/OwnCoins.controller.meta rename Forest/Assets/Art/Animation/Select/{Blue.anim => BlueMove.anim} (99%) rename Forest/Assets/Art/Animation/Select/{Blue.anim.meta => BlueMove.anim.meta} (100%) rename Forest/Assets/Art/Animation/Select/{Img_Blue.controller => BlueMove.controller} (99%) rename Forest/Assets/Art/Animation/Select/{Img_Blue.controller.meta => BlueMove.controller.meta} (100%) rename Forest/Assets/Art/Animation/Select/{Yellow.anim => YellowMove.anim} (99%) rename Forest/Assets/Art/Animation/Select/{Yellow.anim.meta => YellowMove.anim.meta} (100%) rename Forest/Assets/Art/Animation/Select/{Img_Yellow.controller => YellowMove.controller} (98%) rename Forest/Assets/Art/Animation/Select/{Img_Yellow.controller.meta => YellowMove.controller.meta} (100%) rename Forest/Assets/Art/{UI/Prefab/UIMainPanelBG.prefab.meta => Animation/StartMain.meta} (57%) rename Forest/Assets/Art/Animation/{Loading_Cloud1.anim => StartMain/Cloud1Move.anim} (99%) rename Forest/Assets/Art/Animation/{Loading_Cloud1.anim.meta => StartMain/Cloud1Move.anim.meta} (100%) rename Forest/Assets/Art/Animation/{Img_Cloud1.controller => StartMain/Cloud1Move.controller} (98%) rename Forest/Assets/Art/Animation/{Img_Cloud1.controller.meta => StartMain/Cloud1Move.controller.meta} (100%) rename Forest/Assets/Art/Animation/{Loading_Cloud2.anim => StartMain/Cloud2Move.anim} (99%) rename Forest/Assets/Art/Animation/{Loading_Cloud2.anim.meta => StartMain/Cloud2Move.anim.meta} (100%) rename Forest/Assets/Art/Animation/{Img_Cloud2.controller => StartMain/Cloud2Move.controller} (98%) rename Forest/Assets/Art/Animation/{Img_Cloud2.controller.meta => StartMain/Cloud2Move.controller.meta} (100%) delete mode 100644 Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab delete mode 100644 Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab delete mode 100644 Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs delete mode 100644 Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta delete mode 100644 Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs delete mode 100644 Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta diff --git a/Forest/Assets/Art/Animation/Btn.controller b/Forest/Assets/Art/Animation/Btn.controller deleted file mode 100644 index d890afa..0000000 --- a/Forest/Assets/Art/Animation/Btn.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Btn - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 8215574744943731194} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &4194790842417685210 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BuildBtn - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 92dffcc790379443195b5e5a024f387d, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &8215574744943731194 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 4194790842417685210} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 4194790842417685210} diff --git a/Forest/Assets/Art/Animation/Btn.controller.meta b/Forest/Assets/Art/Animation/Btn.controller.meta deleted file mode 100644 index b81bcad..0000000 --- a/Forest/Assets/Art/Animation/Btn.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 22841974cbc8b49789df714a5855a75d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim b/Forest/Assets/Art/Animation/Build/BubbleShake.anim similarity index 99% rename from Forest/Assets/Art/Animation/Build/Bubble_Shake.anim rename to Forest/Assets/Art/Animation/Build/BubbleShake.anim index 4f53cc6..d4cc141 100644 --- a/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim +++ b/Forest/Assets/Art/Animation/Build/BubbleShake.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bubble_Shake + m_Name: BubbleShake serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim.meta b/Forest/Assets/Art/Animation/Build/BubbleShake.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Build/Bubble_Shake.anim.meta rename to Forest/Assets/Art/Animation/Build/BubbleShake.anim.meta diff --git a/Forest/Assets/Art/Animation/Build/Bubble.controller b/Forest/Assets/Art/Animation/Build/BubbleShake.controller similarity index 98% rename from Forest/Assets/Art/Animation/Build/Bubble.controller rename to Forest/Assets/Art/Animation/Build/BubbleShake.controller index 442ffe4..e52e878 100644 --- a/Forest/Assets/Art/Animation/Build/Bubble.controller +++ b/Forest/Assets/Art/Animation/Build/BubbleShake.controller @@ -32,7 +32,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bubble + m_Name: BubbleShake serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Build/Bubble.controller.meta b/Forest/Assets/Art/Animation/Build/BubbleShake.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Build/Bubble.controller.meta rename to Forest/Assets/Art/Animation/Build/BubbleShake.controller.meta diff --git a/Forest/Assets/Art/Animation/BuildBtn.anim b/Forest/Assets/Art/Animation/BuildBtn.anim deleted file mode 100644 index 4e487d9..0000000 --- a/Forest/Assets/Art/Animation/BuildBtn.anim +++ /dev/null @@ -1,191 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BuildBtn - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.y - path: - classID: 224 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 538195251 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 2 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.y - path: - classID: 224 - script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Forest/Assets/Art/Animation/BuildBtn.anim.meta b/Forest/Assets/Art/Animation/BuildBtn.anim.meta deleted file mode 100644 index fa40a61..0000000 --- a/Forest/Assets/Art/Animation/BuildBtn.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 92dffcc790379443195b5e5a024f387d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Animation/CoinShake.anim b/Forest/Assets/Art/Animation/CoinShake.anim deleted file mode 100644 index acb2e00..0000000 --- a/Forest/Assets/Art/Animation/CoinShake.anim +++ /dev/null @@ -1,284 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CoinShake - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: -100 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -90 - inSlope: 120.00001 - outSlope: 120.00001 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -80 - inSlope: 120 - outSlope: 120 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: -70 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: -80 - inSlope: -180.00002 - outSlope: -180.00002 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -100 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5833333 - value: -80 - inSlope: 179.99998 - outSlope: 179.99998 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: -70 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6666666 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} - flags: 0 - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1.6666666 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: -100 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -90 - inSlope: 120.00001 - outSlope: 120.00001 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -80 - inSlope: 120 - outSlope: 120 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: -70 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: -80 - inSlope: -180.00002 - outSlope: -180.00002 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -100 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5833333 - value: -80 - inSlope: 179.99998 - outSlope: 179.99998 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: -70 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6666666 - value: -80 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: - classID: 224 - script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Forest/Assets/Art/Animation/CoinShake.anim.meta b/Forest/Assets/Art/Animation/CoinShake.anim.meta deleted file mode 100644 index ada3e86..0000000 --- a/Forest/Assets/Art/Animation/CoinShake.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 75dae27ca1bb6d44098022162f8145a7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Animation/Img_Avatar.controller b/Forest/Assets/Art/Animation/Img_Avatar.controller deleted file mode 100644 index fa28756..0000000 --- a/Forest/Assets/Art/Animation/Img_Avatar.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-5296414761936137617 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: IPWink - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: dbf83d3e878c0bc4d9ea581d0ed5f4d4, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-2665515078865383837 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -5296414761936137617} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -5296414761936137617} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Img_Avatar - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -2665515078865383837} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Forest/Assets/Art/Animation/Img_Avatar.controller.meta b/Forest/Assets/Art/Animation/Img_Avatar.controller.meta deleted file mode 100644 index de3e6bc..0000000 --- a/Forest/Assets/Art/Animation/Img_Avatar.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec6c9581e26e93447b3582a73bbef090 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab.meta b/Forest/Assets/Art/Animation/Level.meta similarity index 57% rename from Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab.meta rename to Forest/Assets/Art/Animation/Level.meta index ad63a4b..24d0dce 100644 --- a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab.meta +++ b/Forest/Assets/Art/Animation/Level.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 14ca64db8ed8aa74daf6d6c6bfcfd662 -PrefabImporter: +guid: 8a6f6106d98f44a87b7dbfa276225122 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Forest/Assets/Art/Animation/ADShake.anim b/Forest/Assets/Art/Animation/Level/ADIconShake.anim similarity index 99% rename from Forest/Assets/Art/Animation/ADShake.anim rename to Forest/Assets/Art/Animation/Level/ADIconShake.anim index 35e666c..e4b6ea5 100644 --- a/Forest/Assets/Art/Animation/ADShake.anim +++ b/Forest/Assets/Art/Animation/Level/ADIconShake.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ADShake + m_Name: ADIconShake serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/ADShake.anim.meta b/Forest/Assets/Art/Animation/Level/ADIconShake.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/ADShake.anim.meta rename to Forest/Assets/Art/Animation/Level/ADIconShake.anim.meta diff --git a/Forest/Assets/Art/Animation/ADShake.controller b/Forest/Assets/Art/Animation/Level/ADIconShake.controller similarity index 98% rename from Forest/Assets/Art/Animation/ADShake.controller rename to Forest/Assets/Art/Animation/Level/ADIconShake.controller index 414f6ba..890c4c1 100644 --- a/Forest/Assets/Art/Animation/ADShake.controller +++ b/Forest/Assets/Art/Animation/Level/ADIconShake.controller @@ -32,7 +32,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ADShake + m_Name: ADIconShake serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/ADShake.controller.meta b/Forest/Assets/Art/Animation/Level/ADIconShake.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/ADShake.controller.meta rename to Forest/Assets/Art/Animation/Level/ADIconShake.controller.meta diff --git a/Forest/Assets/Art/Animation/AddTime.anim b/Forest/Assets/Art/Animation/Level/AddTimeNumber.anim similarity index 99% rename from Forest/Assets/Art/Animation/AddTime.anim rename to Forest/Assets/Art/Animation/Level/AddTimeNumber.anim index 306ebbf..a718819 100644 --- a/Forest/Assets/Art/Animation/AddTime.anim +++ b/Forest/Assets/Art/Animation/Level/AddTimeNumber.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AddTime + m_Name: AddTimeNumber serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/AddTime.anim.meta b/Forest/Assets/Art/Animation/Level/AddTimeNumber.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/AddTime.anim.meta rename to Forest/Assets/Art/Animation/Level/AddTimeNumber.anim.meta diff --git a/Forest/Assets/Art/Animation/AddTime.controller b/Forest/Assets/Art/Animation/Level/AddTimeNumber.controller similarity index 99% rename from Forest/Assets/Art/Animation/AddTime.controller rename to Forest/Assets/Art/Animation/Level/AddTimeNumber.controller index 34646dc..7ebc2fc 100644 --- a/Forest/Assets/Art/Animation/AddTime.controller +++ b/Forest/Assets/Art/Animation/Level/AddTimeNumber.controller @@ -57,7 +57,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AddTime + m_Name: AddTimeNumber serializedVersion: 5 m_AnimatorParameters: - m_Name: Play diff --git a/Forest/Assets/Art/Animation/AddTime.controller.meta b/Forest/Assets/Art/Animation/Level/AddTimeNumber.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/AddTime.controller.meta rename to Forest/Assets/Art/Animation/Level/AddTimeNumber.controller.meta diff --git a/Forest/Assets/Art/Animation/ADPopup.anim b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim similarity index 99% rename from Forest/Assets/Art/Animation/ADPopup.anim rename to Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim index e960235..f320164 100644 --- a/Forest/Assets/Art/Animation/ADPopup.anim +++ b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ADPopup + m_Name: LevelFailADPopup serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/ADPopup.anim.meta b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/ADPopup.anim.meta rename to Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim.meta diff --git a/Forest/Assets/Art/Animation/UIADPopup.controller b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller similarity index 96% rename from Forest/Assets/Art/Animation/UIADPopup.controller rename to Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller index 4c78fbc..e2d2a84 100644 --- a/Forest/Assets/Art/Animation/UIADPopup.controller +++ b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 7561872766227600735} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 310, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -28,7 +28,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UIADPopup + m_Name: LevelFailADPopup serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/UIADPopup.controller.meta b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/UIADPopup.controller.meta rename to Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller.meta diff --git a/Forest/Assets/Art/Animation/Guide_finger.anim b/Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim similarity index 99% rename from Forest/Assets/Art/Animation/Guide_finger.anim rename to Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim index 6d38933..76e2710 100644 --- a/Forest/Assets/Art/Animation/Guide_finger.anim +++ b/Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Guide_finger + m_Name: LevelGuideFinger serializedVersion: 7 m_Legacy: 1 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Guide_finger.anim.meta b/Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Guide_finger.anim.meta rename to Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim.meta diff --git a/Forest/Assets/Art/Animation/LoseAddTime.anim b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim similarity index 99% rename from Forest/Assets/Art/Animation/LoseAddTime.anim rename to Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim index 85c9633..bda2687 100644 --- a/Forest/Assets/Art/Animation/LoseAddTime.anim +++ b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: LoseAddTime + m_Name: LosePanelAddTime serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/LoseAddTime.anim.meta b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/LoseAddTime.anim.meta rename to Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim.meta diff --git a/Forest/Assets/Art/Animation/Btn_AddTime.controller b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller similarity index 96% rename from Forest/Assets/Art/Animation/Btn_AddTime.controller rename to Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller index 72eb88a..743582f 100644 --- a/Forest/Assets/Art/Animation/Btn_AddTime.controller +++ b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1955863328462273037} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 280, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -54,7 +54,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Btn_AddTime + m_Name: LosePanelAddTime serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Btn_AddTime.controller.meta b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Btn_AddTime.controller.meta rename to Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller.meta diff --git a/Forest/Assets/Art/Animation/OwnCoins.controller b/Forest/Assets/Art/Animation/OwnCoins.controller deleted file mode 100644 index d9ff05e..0000000 --- a/Forest/Assets/Art/Animation/OwnCoins.controller +++ /dev/null @@ -1,133 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-378998551314204245 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CoinShake - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 75dae27ca1bb6d44098022162f8145a7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: OwnCoins - serializedVersion: 5 - m_AnimatorParameters: - - m_Name: Play - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 5706751097174091922} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &5090946142463229846 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New State - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &5706751097174091922 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 5090946142463229846} - m_Position: {x: 240, y: 160, z: 0} - - serializedVersion: 1 - m_State: {fileID: -378998551314204245} - m_Position: {x: 160, y: 390, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: 8230009193583027635} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 140, y: 630, z: 0} - m_EntryPosition: {x: -110, y: 140, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 5090946142463229846} ---- !u!1101 &8230009193583027635 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Play - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -378998551314204245} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 diff --git a/Forest/Assets/Art/Animation/OwnCoins.controller.meta b/Forest/Assets/Art/Animation/OwnCoins.controller.meta deleted file mode 100644 index cd8624e..0000000 --- a/Forest/Assets/Art/Animation/OwnCoins.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28633b2a5cb7a9b4d8b34dda8064f4bb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Animation/Select/Blue.anim b/Forest/Assets/Art/Animation/Select/BlueMove.anim similarity index 99% rename from Forest/Assets/Art/Animation/Select/Blue.anim rename to Forest/Assets/Art/Animation/Select/BlueMove.anim index 4b9d36a..e3f9424 100644 --- a/Forest/Assets/Art/Animation/Select/Blue.anim +++ b/Forest/Assets/Art/Animation/Select/BlueMove.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Blue + m_Name: BlueMove serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Select/Blue.anim.meta b/Forest/Assets/Art/Animation/Select/BlueMove.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Select/Blue.anim.meta rename to Forest/Assets/Art/Animation/Select/BlueMove.anim.meta diff --git a/Forest/Assets/Art/Animation/Select/Img_Blue.controller b/Forest/Assets/Art/Animation/Select/BlueMove.controller similarity index 99% rename from Forest/Assets/Art/Animation/Select/Img_Blue.controller rename to Forest/Assets/Art/Animation/Select/BlueMove.controller index 90c4e0f..cb91d57 100644 --- a/Forest/Assets/Art/Animation/Select/Img_Blue.controller +++ b/Forest/Assets/Art/Animation/Select/BlueMove.controller @@ -28,7 +28,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Img_Blue + m_Name: BlueMove serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Select/Img_Blue.controller.meta b/Forest/Assets/Art/Animation/Select/BlueMove.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Select/Img_Blue.controller.meta rename to Forest/Assets/Art/Animation/Select/BlueMove.controller.meta diff --git a/Forest/Assets/Art/Animation/Select/Yellow.anim b/Forest/Assets/Art/Animation/Select/YellowMove.anim similarity index 99% rename from Forest/Assets/Art/Animation/Select/Yellow.anim rename to Forest/Assets/Art/Animation/Select/YellowMove.anim index 75206a6..7f5cf6e 100644 --- a/Forest/Assets/Art/Animation/Select/Yellow.anim +++ b/Forest/Assets/Art/Animation/Select/YellowMove.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Yellow + m_Name: YellowMove serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Select/Yellow.anim.meta b/Forest/Assets/Art/Animation/Select/YellowMove.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Select/Yellow.anim.meta rename to Forest/Assets/Art/Animation/Select/YellowMove.anim.meta diff --git a/Forest/Assets/Art/Animation/Select/Img_Yellow.controller b/Forest/Assets/Art/Animation/Select/YellowMove.controller similarity index 98% rename from Forest/Assets/Art/Animation/Select/Img_Yellow.controller rename to Forest/Assets/Art/Animation/Select/YellowMove.controller index 258f401..e71b24a 100644 --- a/Forest/Assets/Art/Animation/Select/Img_Yellow.controller +++ b/Forest/Assets/Art/Animation/Select/YellowMove.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Img_Yellow + m_Name: YellowMove serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Select/Img_Yellow.controller.meta b/Forest/Assets/Art/Animation/Select/YellowMove.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Select/Img_Yellow.controller.meta rename to Forest/Assets/Art/Animation/Select/YellowMove.controller.meta diff --git a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab.meta b/Forest/Assets/Art/Animation/StartMain.meta similarity index 57% rename from Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab.meta rename to Forest/Assets/Art/Animation/StartMain.meta index d67b2e0..0120732 100644 --- a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab.meta +++ b/Forest/Assets/Art/Animation/StartMain.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 6653f0be8ebd14d1dae3fa9fa16a6fa4 -PrefabImporter: +guid: 8ea9bcfcfc4b04d3ab8fd771c5f575fc +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Forest/Assets/Art/Animation/Loading_Cloud1.anim b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim similarity index 99% rename from Forest/Assets/Art/Animation/Loading_Cloud1.anim rename to Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim index 4a4e303..9acaff8 100644 --- a/Forest/Assets/Art/Animation/Loading_Cloud1.anim +++ b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Loading_Cloud1 + m_Name: Cloud1Move serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Loading_Cloud1.anim.meta b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Loading_Cloud1.anim.meta rename to Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim.meta diff --git a/Forest/Assets/Art/Animation/Img_Cloud1.controller b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller similarity index 98% rename from Forest/Assets/Art/Animation/Img_Cloud1.controller rename to Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller index 1a11ec5..e93b356 100644 --- a/Forest/Assets/Art/Animation/Img_Cloud1.controller +++ b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Img_Cloud1 + m_Name: Cloud1Move serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Img_Cloud1.controller.meta b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Img_Cloud1.controller.meta rename to Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller.meta diff --git a/Forest/Assets/Art/Animation/Loading_Cloud2.anim b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim similarity index 99% rename from Forest/Assets/Art/Animation/Loading_Cloud2.anim rename to Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim index df93287..5d85f43 100644 --- a/Forest/Assets/Art/Animation/Loading_Cloud2.anim +++ b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Loading_Cloud2 + m_Name: Cloud2Move serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Forest/Assets/Art/Animation/Loading_Cloud2.anim.meta b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim.meta similarity index 100% rename from Forest/Assets/Art/Animation/Loading_Cloud2.anim.meta rename to Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim.meta diff --git a/Forest/Assets/Art/Animation/Img_Cloud2.controller b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller similarity index 98% rename from Forest/Assets/Art/Animation/Img_Cloud2.controller rename to Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller index 39aba15..32e3799 100644 --- a/Forest/Assets/Art/Animation/Img_Cloud2.controller +++ b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Img_Cloud2 + m_Name: Cloud2Move serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Forest/Assets/Art/Animation/Img_Cloud2.controller.meta b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller.meta similarity index 100% rename from Forest/Assets/Art/Animation/Img_Cloud2.controller.meta rename to Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller.meta diff --git a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab b/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab deleted file mode 100644 index 800c6d4..0000000 --- a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab +++ /dev/null @@ -1,1515 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &662458836254170456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8837351923394513257} - m_Layer: 5 - m_Name: UIMainPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8837351923394513257 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 662458836254170456} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5940626574529633915} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1587541022406742309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4316519208730348209} - - component: {fileID: 6987987258047137632} - - component: {fileID: 2551198965520345966} - m_Layer: 5 - m_Name: Img_Bottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4316519208730348209 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1587541022406742309} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 494} - m_Pivot: {x: 0, y: 0} ---- !u!222 &6987987258047137632 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1587541022406742309} - m_CullTransparentMesh: 1 ---- !u!114 &2551198965520345966 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1587541022406742309} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e701fe54462544c438e958c18d6f1288, 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 &1907487617862740684 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7797609966467347885} - - component: {fileID: 2918127017197467270} - - component: {fileID: 8398657987914529872} - m_Layer: 5 - m_Name: Img_Cloud - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7797609966467347885 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907487617862740684} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8191094134680472009} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 50, y: -350} - m_SizeDelta: {x: 798, y: 461} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2918127017197467270 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907487617862740684} - m_CullTransparentMesh: 1 ---- !u!114 &8398657987914529872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907487617862740684} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 74c2958980fa24985b6fca399bcab4eb, 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 &2458731147884334544 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6982326748267163293} - - component: {fileID: 6575208010741934435} - - component: {fileID: 2129466584408063865} - m_Layer: 5 - m_Name: Img_Title_CN - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6982326748267163293 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458731147884334544} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1901886252975893447} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -563} - m_SizeDelta: {x: 1080, y: 817} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6575208010741934435 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458731147884334544} - m_CullTransparentMesh: 1 ---- !u!114 &2129466584408063865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458731147884334544} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 50a04592501344405948b77d73a61b91, 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 &2478789642403004832 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4730431326859452550} - m_Layer: 5 - m_Name: UI_LiuHaiBottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4730431326859452550 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2478789642403004832} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3118219658441007785 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5940626574529633915} - - component: {fileID: 7810327144601852640} - m_Layer: 5 - m_Name: Bg_MainPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5940626574529633915 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3118219658441007785} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8191094134680472009} - - {fileID: 1901886252975893447} - - {fileID: 4316519208730348209} - - {fileID: 4923674628100320101} - - {fileID: 5562081337808076743} - - {fileID: 4730431326859452550} - m_Father: {fileID: 8837351923394513257} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7810327144601852640 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3118219658441007785} - m_CullTransparentMesh: 1 ---- !u!1 &3496896062908629532 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4923674628100320101} - - component: {fileID: 5051796452294842446} - - component: {fileID: 8027579034067137035} - - component: {fileID: 5888589728343067064} - m_Layer: 5 - m_Name: Btn_Challenge - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4923674628100320101 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496896062908629532} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2650368049667982707} - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 458} - m_SizeDelta: {x: 569, y: 182} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5051796452294842446 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496896062908629532} - m_CullTransparentMesh: 1 ---- !u!114 &8027579034067137035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496896062908629532} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41699e2fc30cd4afab26e41ce3a062f0, 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 &5888589728343067064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496896062908629532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8027579034067137035} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4186899658557637826 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3985669373862856427} - - component: {fileID: 6418115356263925853} - - component: {fileID: 4114348164886726797} - - component: {fileID: 2760893344359827689} - m_Layer: 5 - m_Name: txt_Option - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3985669373862856427 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4186899658557637826} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5562081337808076743} - 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: 420, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6418115356263925853 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4186899658557637826} - m_CullTransparentMesh: 1 ---- !u!114 &4114348164886726797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4186899658557637826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Select - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} - m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278193459 - m_fontColor: {r: 0.2, g: 0.050980393, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 75 - m_fontSizeBase: 75 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &2760893344359827689 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4186899658557637826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 311397461488a864a9380a67b5d5d6c6, type: 3} - m_Name: - m_EditorClassIdentifier: - textKey: Main_Select ---- !u!1 &4279273280082095229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2650368049667982707} - - component: {fileID: 5729265418443019202} - - component: {fileID: 1231883314262242005} - - component: {fileID: 3138659969619829740} - m_Layer: 5 - m_Name: txt_Challenge - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2650368049667982707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4279273280082095229} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4923674628100320101} - 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: 420, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5729265418443019202 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4279273280082095229} - m_CullTransparentMesh: 1 ---- !u!114 &1231883314262242005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4279273280082095229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Start - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} - m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278193459 - m_fontColor: {r: 0.2, g: 0.050980393, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 75 - m_fontSizeBase: 75 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &3138659969619829740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4279273280082095229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 311397461488a864a9380a67b5d5d6c6, type: 3} - m_Name: - m_EditorClassIdentifier: - textKey: Main_Start ---- !u!1 &4748566108609016155 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1901886252975893447} - m_Layer: 5 - m_Name: UI_LiuHaiTop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1901886252975893447 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4748566108609016155} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6982326748267163293} - - {fileID: 8812620321565741061} - - {fileID: 4604865081895034613} - - {fileID: 8940570680951576411} - - {fileID: 1573026161209438454} - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5442123927815431782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5562081337808076743} - - component: {fileID: 1614995208389606824} - - component: {fileID: 1164103103916450654} - - component: {fileID: 3206858865914060128} - m_Layer: 5 - m_Name: Btn_Option - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5562081337808076743 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5442123927815431782} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3985669373862856427} - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 238} - m_SizeDelta: {x: 569, y: 182} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1614995208389606824 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5442123927815431782} - m_CullTransparentMesh: 1 ---- !u!114 &1164103103916450654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5442123927815431782} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41699e2fc30cd4afab26e41ce3a062f0, 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 &3206858865914060128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5442123927815431782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1164103103916450654} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &7083752970861741234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8812620321565741061} - - component: {fileID: 2978644034181805563} - - component: {fileID: 3375038825435621001} - m_Layer: 5 - m_Name: Img_Title_EN - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8812620321565741061 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7083752970861741234} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1901886252975893447} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -563} - m_SizeDelta: {x: 1080, y: 817} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2978644034181805563 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7083752970861741234} - m_CullTransparentMesh: 1 ---- !u!114 &3375038825435621001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7083752970861741234} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5c87d6905cca4400ad7e2576a7bc679, 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 &7561472440805325230 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8191094134680472009} - - component: {fileID: 1074120590869714054} - - component: {fileID: 2118002454880161382} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8191094134680472009 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7561472440805325230} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7797609966467347885} - - {fileID: 8048006188168832422} - m_Father: {fileID: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1074120590869714054 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7561472440805325230} - m_CullTransparentMesh: 1 ---- !u!114 &2118002454880161382 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7561472440805325230} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c3038322a4b13425c884de20cc4956f0, 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 &7675644909149764563 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1573026161209438454} - - component: {fileID: 6448815884737594814} - - component: {fileID: 1070919464906470905} - - component: {fileID: 9206445889408590897} - m_Layer: 5 - m_Name: Btn_Build - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1573026161209438454 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7675644909149764563} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1901886252975893447} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442, y: -270} - m_SizeDelta: {x: 131, y: 154} - m_Pivot: {x: 0, y: 1} ---- !u!222 &6448815884737594814 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7675644909149764563} - m_CullTransparentMesh: 1 ---- !u!114 &1070919464906470905 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7675644909149764563} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 58d67975c851f426984ecfa630b09f44, 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 &9206445889408590897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7675644909149764563} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1070919464906470905} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &7858642420970555349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4604865081895034613} - - component: {fileID: 7343026179997426337} - - component: {fileID: 6514132801652090698} - - component: {fileID: 6220959240340082681} - m_Layer: 5 - m_Name: Btn_Setting - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4604865081895034613 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7858642420970555349} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1901886252975893447} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -457.07196, y: -100} - m_SizeDelta: {x: 120, y: 125} - m_Pivot: {x: 0, y: 1} ---- !u!222 &7343026179997426337 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7858642420970555349} - m_CullTransparentMesh: 1 ---- !u!114 &6514132801652090698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7858642420970555349} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a0aef7d0b8bf42ebb926ee9cfbfb760, 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 &6220959240340082681 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7858642420970555349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6514132801652090698} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &8212353738588284979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8940570680951576411} - - component: {fileID: 8614631914898852519} - - component: {fileID: 8102644084932038727} - - component: {fileID: 777897129238763933} - m_Layer: 5 - m_Name: Btn_Shop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8940570680951576411 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8212353738588284979} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1901886252975893447} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 430, y: -90} - m_SizeDelta: {x: 155, y: 149} - m_Pivot: {x: 0, y: 1} ---- !u!222 &8614631914898852519 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8212353738588284979} - m_CullTransparentMesh: 1 ---- !u!114 &8102644084932038727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8212353738588284979} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0eb8324995d9a48268ee748a23e0231a, 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 &777897129238763933 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8212353738588284979} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8102644084932038727} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &8440047613927848178 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8048006188168832422} - - component: {fileID: 1637885211778764577} - - component: {fileID: 8879489471768776117} - m_Layer: 5 - m_Name: BG_Top - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8048006188168832422 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8440047613927848178} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8191094134680472009} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1637885211778764577 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8440047613927848178} - m_CullTransparentMesh: 1 ---- !u!114 &8879489471768776117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8440047613927848178} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1533e0c184b164e88bd1ded189caf6ab, 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 diff --git a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab b/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab deleted file mode 100644 index 2ab7c78..0000000 --- a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab +++ /dev/null @@ -1,417 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1474381420083046241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2572478662506942710} - - component: {fileID: 7123912342445624541} - - component: {fileID: 4596333894144043644} - m_Layer: 5 - m_Name: Bg_MainPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2572478662506942710 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474381420083046241} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3787833917268946334} - - {fileID: 8494761850271678832} - - {fileID: 7680128354498908394} - - {fileID: 6679646174452240329} - m_Father: {fileID: 2517744685217155804} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7123912342445624541 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474381420083046241} - m_CullTransparentMesh: 1 ---- !u!114 &4596333894144043644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1474381420083046241} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c3038322a4b13425c884de20cc4956f0, 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 &1504305489266380954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6679646174452240329} - - component: {fileID: 4295696286403315370} - - component: {fileID: 289959955320953285} - m_Layer: 5 - m_Name: Img_Title_CN - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6679646174452240329 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504305489266380954} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2572478662506942710} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -513} - m_SizeDelta: {x: 1080, y: 817} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4295696286403315370 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504305489266380954} - m_CullTransparentMesh: 1 ---- !u!114 &289959955320953285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504305489266380954} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 50a04592501344405948b77d73a61b91, 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 &1747082990765963427 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8494761850271678832} - - component: {fileID: 2828201176218715096} - - component: {fileID: 6048858606711302037} - m_Layer: 5 - m_Name: BG_Top - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8494761850271678832 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747082990765963427} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2572478662506942710} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2828201176218715096 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747082990765963427} - m_CullTransparentMesh: 1 ---- !u!114 &6048858606711302037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747082990765963427} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1533e0c184b164e88bd1ded189caf6ab, 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 &6159674643101331994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2517744685217155804} - m_Layer: 5 - m_Name: UIMainPanelBG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2517744685217155804 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6159674643101331994} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2572478662506942710} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6321845792177783947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7680128354498908394} - - component: {fileID: 1534522364070347659} - - component: {fileID: 8861832695289939223} - m_Layer: 5 - m_Name: Img_Title_EN - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7680128354498908394 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6321845792177783947} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2572478662506942710} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -513} - m_SizeDelta: {x: 1080, y: 817} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1534522364070347659 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6321845792177783947} - m_CullTransparentMesh: 1 ---- !u!114 &8861832695289939223 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6321845792177783947} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5c87d6905cca4400ad7e2576a7bc679, 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 &6799279234484031509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3787833917268946334} - - component: {fileID: 217564583143310680} - - component: {fileID: 5867240446946715319} - m_Layer: 5 - m_Name: Img_Cloud - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3787833917268946334 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6799279234484031509} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2572478662506942710} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 50, y: -350} - m_SizeDelta: {x: 798, y: 461} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &217564583143310680 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6799279234484031509} - m_CullTransparentMesh: 1 ---- !u!114 &5867240446946715319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6799279234484031509} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 74c2958980fa24985b6fca399bcab4eb, 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 diff --git a/Forest/Assets/Scripts/Framework/Constants/Constants.UI.cs b/Forest/Assets/Scripts/Framework/Constants/Constants.UI.cs index 678f36e..75e475f 100644 --- a/Forest/Assets/Scripts/Framework/Constants/Constants.UI.cs +++ b/Forest/Assets/Scripts/Framework/Constants/Constants.UI.cs @@ -16,8 +16,6 @@ namespace Framework.Constants public static readonly string UIWinPanel = "UIWinPanel"; public static readonly string UIBuyGoods = "UIBuyGoods"; public static readonly string UILosePanel = "UILosePanel"; - //public static readonly string UIMainPanel = "UIMainPanel"; - public static readonly string UIMainPanelBg = "UIMainPanelBG"; public static readonly string UIStayTuned = "UIStayTuned"; public static readonly string UIPausePanel = "UIPausePanel"; public static readonly string UILevelSelect = "UILevelSelect"; diff --git a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs deleted file mode 100644 index 79f599e..0000000 --- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Framework.Event; -using Framework.UI; - -public class UIMainPanelBGController : UIWindow -{ - private string _imgName; - - protected override void OnAwake() - { - RegisterEvent(); - ChangeLanguage(); - } - - private void ChangeLanguage() - { - if (_imgName != null) - FindObj(_imgName).gameObject.SetActive(false); - _imgName = StringManager.CurLanguage == StringManager.LanguageType.CN - ? "Bg_MainPanel/Img_Title_CN" - : "Bg_MainPanel/Img_Title_EN"; - FindObj(_imgName).gameObject.SetActive(true); - } - - private void RegisterEvent() - { - EventManager.Instance.Register(EventManager.EventName.RefreshLanguage, ChangeLanguage); - } - - private void UnregisterEvent() - { - EventManager.Instance.Unregister(EventManager.EventName.RefreshLanguage, ChangeLanguage); - } - - private void OnDestroy() - { - UnregisterEvent(); - } -} diff --git a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta deleted file mode 100644 index 0b8e4b7..0000000 --- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 45d6f62915a374229a3a32024c946cbd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs deleted file mode 100644 index 6b56149..0000000 --- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs +++ /dev/null @@ -1,139 +0,0 @@ -//// 旧的主界面 - -/*using cfg.BI; -using UnityEngine; -using Framework.BI; -using Framework.UI; -using Gameplay.Level; -using Framework.Event; -using Gameplay.Manager; -using Framework.Constants; -using Framework.GameBuild; -using Event = cfg.BI.Event; - -public class UIMainPanelController : UIWindow -{ - private string _imgName; - private GameObject _gfxCharacter; - private bool _otherPanel; - - protected override void OnAwake() - { - RegisterEvent(); - - BindButton("Bg_MainPanel/Btn_Challenge", OnEnterLevel); - BindButton("Bg_MainPanel/Btn_Option", OnSelectLevel); - BindButton("Bg_MainPanel/UI_LiuHaiTop/Btn_Setting", OpenSettingPanel); - BindButton("Bg_MainPanel/UI_LiuHaiTop/Btn_Shop", OpenShop); - BindButton("Bg_MainPanel/UI_LiuHaiTop/Btn_Build", OpenBuild); - CommonUIUtils.CaptureScreenshot(); - - FindObj("Bg_MainPanel/BG").SetActive(false); - UIManager.Instance.OpenWindow(UIConstants.UIMainPanelBg); - } - - private void Start() - { - OnStart("Bg_MainPanel/"); - } - - protected override void OnCloseWindow(bool destroy = false) - { - //TODO 特效 - HideGfx(); - } - - private void CheckOtherPanel() - { - if (UIManager.Instance.IsWindowStay(UIConstants.UILogin) || - UIManager.Instance.IsWindowStay(UIConstants.UISyncTip) || - UIManager.Instance.IsWindowStay(UIConstants.UIUserAgreement)) - _otherPanel = true; - if (!_otherPanel) - InitGfx(); - } - - private async void InitGfx() - { - _gfxCharacter = await GfxManager.Instance.LoadGfx("Effect_MainCharacter"); - } - - private void HideGfx() - { - if (_gfxCharacter) - GfxManager.Instance.ReturnGfxObj(_gfxCharacter); - } - - private async void OpenSettingPanel() - { - CommonUIUtils.CaptureScreenshot(); - BIManager.Instance.TrackEvent(Event.click_setting); - await UIManager.Instance.OpenWindow(UIConstants.UISettingPanel); - } - - private async void OpenBuild() - { - GameStateManager.Instance.ChangeState(new GameBuildStateStart()); - } - - /// - /// 打开商店 - /// - private async void OpenShop() - { - await UIManager.Instance.OpenWindow(UIConstants.UIShop); - BIManager.Instance.TrackEvent(Event.open_shop, "UIMainPanel"); - BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "UIMainPanel"); - } - - /// - /// 开始游戏 - /// - private async void OnEnterLevel() - { - BIManager.Instance.TrackEvent(Event.click_level_start); - BIManager.Instance.TrackEventOnce(EventFirst.fte_click_level_start); - var levelID = $"level{LevelSelectManager.Instance.CurPassLevelIndex + 1}"; - if (LevelManager.Instance.IsLevelExist(levelID)) - { - CloseWindow(); - GameStateManager.Instance.ChangeState(new LevelState(levelID)); - } - else - { - EventManager.Instance.Send(EventManager.EventName.HideGfx); - await UIManager.Instance.OpenWindow(UIConstants.UIStayTuned); - } - } - - /// - /// 选择关卡 - /// - private async void OnSelectLevel() - { - CloseWindow(); - BIManager.Instance.TrackEvent(Event.click_level_select); - await UIManager.Instance.OpenWindow(UIConstants.UILevelSelect); - } - - - private void RegisterEvent() - { - EventManager.Instance.Register(EventManager.EventName.LoadingEnd, CheckOtherPanel); - EventManager.Instance.Register(EventManager.EventName.ShowGfx, InitGfx); - EventManager.Instance.Register(EventManager.EventName.HideGfx, HideGfx); - } - - private void UnregisterEvent() - { - EventManager.Instance.Unregister(EventManager.EventName.LoadingEnd, CheckOtherPanel); - EventManager.Instance.Unregister(EventManager.EventName.ShowGfx, InitGfx); - EventManager.Instance.Unregister(EventManager.EventName.HideGfx, HideGfx); - } - - private void OnDestroy() - { - UnregisterEvent(); - UIManager.Instance.CloseWindow(UIConstants.UIMainPanelBg); - } -}*/ \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta deleted file mode 100644 index c4bd6ef..0000000 --- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3d13c9c1124e0c748b81b3a9b12073fb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Scripts/Framework/UI/UIManager.cs b/Forest/Assets/Scripts/Framework/UI/UIManager.cs index ee13b6b..b1a15c7 100644 --- a/Forest/Assets/Scripts/Framework/UI/UIManager.cs +++ b/Forest/Assets/Scripts/Framework/UI/UIManager.cs @@ -305,15 +305,13 @@ namespace Framework.UI _WindowMeta(UIConstants.UIStartMain, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIBuyGoods, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIWinPanel, UIWindowLayer.Normal); - //_WindowMeta(UIConstants.UIMainPanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIStayTuned, UIWindowLayer.Normal); _WindowMeta(UIConstants.UILosePanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIPausePanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UILevelPanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UILevelSelect, UIWindowLayer.Normal); _WindowMeta(UIConstants.UISettingPanel, UIWindowLayer.Normal); - - _WindowMeta(UIConstants.UIMainPanelBg, UIWindowLayer.BgTop); + _WindowMeta(UIConstants.UILevelBg, UIWindowLayer.BackGround); _WindowMeta(UIConstants.ImgLoading, UIWindowLayer.BackGround); _WindowMeta(UIConstants.UISelectBuild, UIWindowLayer.Normal); diff --git a/Forest/Assets/Scripts/Gameplay/LevelState.cs b/Forest/Assets/Scripts/Gameplay/LevelState.cs index d17f411..5506dc5 100644 --- a/Forest/Assets/Scripts/Gameplay/LevelState.cs +++ b/Forest/Assets/Scripts/Gameplay/LevelState.cs @@ -184,7 +184,7 @@ namespace Gameplay.Level /// private void PutThumbtack() { - if ((LevelManager.Instance.IsPause || LevelManager.Instance.IsOver) && _curThumbtack != null) + if ((LevelManager.Instance.IsPause || LevelManager.Instance.IsOver) && _isMoving && _curThumbtack != null) { _curThumbtack.Obj.transform.position = _target.position; }