Merge branch 'main' into iOS_release

2024-08-23 17:18:48 +08:00 · 2024-08-23 17:18:48 +08:00 · 96bc671c6a
parent db9eb019af 535707e9cc
commit 96bc671c6a
59 changed files with 29 additions and 2954 deletions
--- a/Forest/Assets/Art/Animation/Btn.controller
+++ b/Forest/Assets/Art/Animation/Btn.controller
@ -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}
--- a/Forest/Assets/Art/Animation/Btn.controller.meta
+++ b/Forest/Assets/Art/Animation/Btn.controller.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 22841974cbc8b49789df714a5855a75d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim
+++ b/Forest/Assets/Art/Animation/Build/Bubble_Shake.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
--- a/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim.meta
+++ b/Forest/Assets/Art/Animation/Build/Bubble_Shake.anim.meta
--- a/Forest/Assets/Art/Animation/Build/BubbleShake.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:
--- a/Forest/Assets/Art/Animation/Build/BubbleShake.controller.meta
+++ b/Forest/Assets/Art/Animation/Build/BubbleShake.controller.meta
--- a/Forest/Assets/Art/Animation/BuildBtn.anim
+++ b/Forest/Assets/Art/Animation/BuildBtn.anim
@ -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: []
--- a/Forest/Assets/Art/Animation/BuildBtn.anim.meta
+++ b/Forest/Assets/Art/Animation/BuildBtn.anim.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 92dffcc790379443195b5e5a024f387d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Art/Animation/CoinShake.anim
+++ b/Forest/Assets/Art/Animation/CoinShake.anim
@ -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: []
--- a/Forest/Assets/Art/Animation/CoinShake.anim.meta
+++ b/Forest/Assets/Art/Animation/CoinShake.anim.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 75dae27ca1bb6d44098022162f8145a7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Art/Animation/Img_Avatar.controller
+++ b/Forest/Assets/Art/Animation/Img_Avatar.controller
@ -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}
--- a/Forest/Assets/Art/Animation/Img_Avatar.controller.meta
+++ b/Forest/Assets/Art/Animation/Img_Avatar.controller.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec6c9581e26e93447b3582a73bbef090
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab.meta
+++ b/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab.meta
@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 14ca64db8ed8aa74daf6d6c6bfcfd662
-PrefabImporter:
+guid: 8a6f6106d98f44a87b7dbfa276225122
+folderAsset: yes
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Forest/Assets/Art/Animation/Level/ADIconShake.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
--- a/Forest/Assets/Art/Animation/Level/ADIconShake.anim.meta
+++ b/Forest/Assets/Art/Animation/Level/ADIconShake.anim.meta
--- a/Forest/Assets/Art/Animation/Level/ADIconShake.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:
--- a/Forest/Assets/Art/Animation/Level/ADIconShake.controller.meta
+++ b/Forest/Assets/Art/Animation/Level/ADIconShake.controller.meta
--- a/Forest/Assets/Art/Animation/Level/AddTimeNumber.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
--- a/Forest/Assets/Art/Animation/Level/AddTimeNumber.anim.meta
+++ b/Forest/Assets/Art/Animation/Level/AddTimeNumber.anim.meta
--- a/Forest/Assets/Art/Animation/Level/AddTimeNumber.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
--- a/Forest/Assets/Art/Animation/Level/AddTimeNumber.controller.meta
+++ b/Forest/Assets/Art/Animation/Level/AddTimeNumber.controller.meta
--- a/Forest/Assets/Art/Animation/Level/LevelFailADPopup.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
--- a/Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim.meta
+++ b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.anim.meta
--- a/Forest/Assets/Art/Animation/Level/LevelFailADPopup.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:
--- a/Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller.meta
+++ b/Forest/Assets/Art/Animation/Level/LevelFailADPopup.controller.meta
--- a/Forest/Assets/Art/Animation/Level/LevelGuideFinger.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
--- a/Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim.meta
+++ b/Forest/Assets/Art/Animation/Level/LevelGuideFinger.anim.meta
--- a/Forest/Assets/Art/Animation/Level/LosePanelAddTime.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
--- a/Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim.meta
+++ b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.anim.meta
--- a/Forest/Assets/Art/Animation/Level/LosePanelAddTime.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:
--- a/Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller.meta
+++ b/Forest/Assets/Art/Animation/Level/LosePanelAddTime.controller.meta
--- a/Forest/Assets/Art/Animation/OwnCoins.controller
+++ b/Forest/Assets/Art/Animation/OwnCoins.controller
@ -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
--- a/Forest/Assets/Art/Animation/OwnCoins.controller.meta
+++ b/Forest/Assets/Art/Animation/OwnCoins.controller.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 28633b2a5cb7a9b4d8b34dda8064f4bb
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Art/Animation/Select/BlueMove.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
--- a/Forest/Assets/Art/Animation/Select/BlueMove.anim.meta
+++ b/Forest/Assets/Art/Animation/Select/BlueMove.anim.meta
--- a/Forest/Assets/Art/Animation/Select/BlueMove.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:
--- a/Forest/Assets/Art/Animation/Select/BlueMove.controller.meta
+++ b/Forest/Assets/Art/Animation/Select/BlueMove.controller.meta
--- a/Forest/Assets/Art/Animation/Select/YellowMove.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
--- a/Forest/Assets/Art/Animation/Select/YellowMove.anim.meta
+++ b/Forest/Assets/Art/Animation/Select/YellowMove.anim.meta
--- a/Forest/Assets/Art/Animation/Select/YellowMove.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:
--- a/Forest/Assets/Art/Animation/Select/YellowMove.controller.meta
+++ b/Forest/Assets/Art/Animation/Select/YellowMove.controller.meta
--- a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab.meta
+++ b/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab.meta
@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 6653f0be8ebd14d1dae3fa9fa16a6fa4
-PrefabImporter:
+guid: 8ea9bcfcfc4b04d3ab8fd771c5f575fc
+folderAsset: yes
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Forest/Assets/Art/Animation/StartMain/Cloud1Move.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
--- a/Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim.meta
+++ b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.anim.meta
--- a/Forest/Assets/Art/Animation/StartMain/Cloud1Move.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:
--- a/Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller.meta
+++ b/Forest/Assets/Art/Animation/StartMain/Cloud1Move.controller.meta
--- a/Forest/Assets/Art/Animation/StartMain/Cloud2Move.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
--- a/Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim.meta
+++ b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.anim.meta
--- a/Forest/Assets/Art/Animation/StartMain/Cloud2Move.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:
--- a/Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller.meta
+++ b/Forest/Assets/Art/Animation/StartMain/Cloud2Move.controller.meta
--- a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab
+++ b/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab
--- a/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab
+++ b/Forest/Assets/Art/UI/Prefab/UIMainPanelBG.prefab
@ -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
--- 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";
--- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs
+++ b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs
@ -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();
-    }
-}
--- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta
+++ b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelBGController.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 45d6f62915a374229a3a32024c946cbd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs
+++ b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs
@ -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());
-    }
-
-    /// <summary>
-    /// 打开商店
-    /// </summary>
-    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");
-    }
-
-    /// <summary>
-    /// 开始游戏
-    /// </summary>
-    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);
-        }
-    }
-
-    /// <summary>
-    /// 选择关卡
-    /// </summary>
-    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);
-    }
-}*/
--- a/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta
+++ b/Forest/Assets/Scripts/Framework/UI/StartPanel/UIMainPanelController.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3d13c9c1124e0c748b81b3a9b12073fb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- 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);
--- a/Forest/Assets/Scripts/Gameplay/LevelState.cs
+++ b/Forest/Assets/Scripts/Gameplay/LevelState.cs
@ -184,7 +184,7 @@ namespace Gameplay.Level
        /// </summary>
        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;
            }