Squashed commit of the following:

commit 66545e8d88f6d1c6c341217722ed596fdc47615b
Author: lspdC <961907320@qq.com>
Date:   Wed Apr 6 12:54:54 2022 +0800

    4.6
    修改了切换场景BUG
    补上了老虎死亡时uI动画

commit 9dbb855441c5b777bca9808280c8600e78e2363a
Author: lspdC <961907320@qq.com>
Date:   Wed Apr 6 00:41:10 2022 +0800

    4.5
    简单UI动画
    完成老虎boss战
    场景切换会导致武器切换bug，排查中

commit f29c5c2a4cec3f062bdd6bbfd9bbb365188023d0
Author: lspdC <961907320@qq.com>
Date:   Sun Apr 3 01:45:27 2022 +0800

    4.2（已合并）
    合并分支

commit aed35a5f956c1f4cce30bd86cdb40bd0773d0322
Author: lspdC <961907320@qq.com>
Date:   Sun Apr 3 01:36:12 2022 +0800

    4.2（未合并）
    1、调整老虎动画，可以在简单的逻辑下连贯播放
    2、修正开局没有武器会报错的bug，第一关倒下的树的树叶可以遮挡玩家。

commit 4383c04279f5a4270a3abe3b9f4cf67b4d133965
Author: lspdC <961907320@qq.com>
Date:   Fri Apr 1 23:35:01 2022 +0800

    4.1（合并后）
    整合摄像机等

commit 48e7207d351cfdb9363db27c0f8c1aba91fc05d9
Author: lspdC <961907320@qq.com>
Date:   Fri Apr 1 23:19:50 2022 +0800

    4.1（未合并）

commit 6154ddfbb4db880c270f650d090b47263e388cfd
Author: lspdC <961907320@qq.com>
Date:   Thu Mar 31 00:17:09 2022 +0800

    3.30
    更新落雷动画，修复手持武器位置
    明天整合摄像头并最后校对第一关场景和元素的大小比例

commit 28b3246896099b84afc84a05e39b581facfacce2
Author: lspdC <961907320@qq.com>
Date:   Mon Mar 28 11:24:23 2022 +0800

    3.28（修改了京力酱场景内的player 不会报错）

commit 399d8d91d968ef2e4538fc22acf2e5c9089f95cf
Author: lspdC <961907320@qq.com>
Date:   Sun Mar 27 19:27:24 2022 +0800

    3.27
    整合了移动，受伤，与树、火交互的动画
    物体绑定位置和部分动画衔接还有待进一步调整。

commit 76c1cf529eee651619a9542b85a90bdfe8d0bed1
Author: lspdC <961907320@qq.com>
Date:   Sat Mar 26 19:18:13 2022 +0800

    3.26
    下载美术动画素材
    进一步整合中（预计还要整合一段时间，houdini还没做喵）

commit 3771f6a9c19e37e50f62e5e054f2aefd94af9965
Author: lspdC <961907320@qq.com>
Date:   Fri Mar 25 23:39:57 2022 +0800

    3.25 合并分支

commit c9c9ab412170ffd32a12b0660858625856aa3244
Author: lspdC <961907320@qq.com>
Date:   Thu Mar 24 22:11:29 2022 +0800

    3.24
    完成除boss战以外交互，逐步整合美术素材

commit 2a2a11e8514ab67008c85b25b6703888f1ed8824
Author: lspdC <961907320@qq.com>
Date:   Tue Mar 22 22:15:12 2022 +0800

    3.22
    完成了跟踪雷击与玩家的碰撞判定，玩家的受击反馈
    击碎石头那边还有bug，明天再改

commit db3134349aaabb0ba0aaa64e43851ee0d6812fa0
Author: lspdC <961907320@qq.com>
Date:   Mon Mar 21 19:51:46 2022 +0800

    3.21(和霄酱搅在一起了喵)

commit d5836fec13668bd6a00ab8e9377f3959d86ab037
Author: lspdC <961907320@qq.com>
Date:   Mon Mar 21 19:49:15 2022 +0800

    3.21(未合并)
    完成火焰，碎石交互，武器升级替换。
    设置好打雷演出框架，自动追击的雷击框架，尚未加入碰撞判定。

commit 698339a63c5ad608945a2e5702b7b216c97245c3
Author: lspdC <961907320@qq.com>
Date:   Sun Mar 20 23:28:11 2022 +0800

    3.20 和京力交融之后的版本

commit 44c4946a717cd915dae1c92cb536031abf2f9343
Author: lspdC <961907320@qq.com>
Date:   Sun Mar 20 23:24:29 2022 +0800

    3.20
    整理了树木交互，写了个具体互动物品的基类。
    创建了火类，实现火焰交互示意（拿上木棍才能成功交互）。

commit 1b5d15c2d2c98a71d12a79c9443d9cf4c89c7f40
Author: lspdC <961907320@qq.com>
Date:   Sun Mar 20 14:43:08 2022 +0800

    sb coding

# Conflicts:
#	Assets/Scenes/乐/Sample1.unity
#	Assets/Scenes/乐/Sample2.unity
#	Assets/Scripts/乐/Player.cs
#	Assets/Scripts/乐/Tiger.cs
#	Assets/Scripts/乐/TransSense.cs
#	Assets/Scripts/乐/UIWord.cs
#	Assets/Scripts/勍/角色/PlayerControl.cs
#	UserSettings/EditorUserSettings.asset

Assets/Scenes/乐/Sample1.unity

@@ -132,7 +132,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
       propertyPath: m_RootOrder
-      value: 17
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -180,17 +180,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: edecf791093330a4b8299512214e3c7b, type: 3}
---- !u!114 &28184874 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1020564151765312497, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
-  m_PrefabInstance: {fileID: 1020564151788253915}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 94a70686225bbcc40a44a76ac05951e0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &28184876 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
@@ -273,11 +262,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 96574217}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 26.052097, y: -1.2, z: 0}
+  m_LocalPosition: {x: 14.431048, y: -1.2, z: 0}
   m_LocalScale: {x: 0.8524737, y: 1.1058197, z: 0.9215932}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &96574220
 MonoBehaviour:
@@ -351,7 +340,7 @@ Transform:
   m_LocalScale: {x: 1.40125, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 33
+  m_RootOrder: 32
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &223863017
 GameObject:
@@ -460,7 +449,7 @@ Transform:
   m_LocalScale: {x: 52.73806, y: 2.321, z: 2.321}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &278615300
 GameObject:
@@ -558,7 +547,7 @@ RectTransform:
   - {fileID: 521191131}
   - {fileID: 318831000}
   m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -705,7 +694,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &353254809
 GameObject:
@@ -903,7 +892,7 @@ Transform:
   m_Children:
   - {fileID: 1185727662}
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &442489147
 GameObject:
@@ -1133,11 +1122,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 447569230}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 50.16049, y: -1.0834508, z: -10}
+  m_LocalPosition: {x: -7.9447613, y: -1.1173111, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 31
+  m_RootOrder: 30
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &521191130
 GameObject:
@@ -1342,7 +1331,7 @@ Transform:
   m_LocalScale: {x: 55.699375, y: 2.321, z: 2.321}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &530194771
 GameObject:
@@ -1426,137 +1415,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &537498726
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 537498729}
-  - component: {fileID: 537498728}
-  - component: {fileID: 537498727}
-  - component: {fileID: 537498730}
-  - component: {fileID: 537498731}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!81 &537498727
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 537498726}
-  m_Enabled: 1
---- !u!20 &537498728
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 537498726}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 1
-  orthographic size: 4.5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &537498729
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 537498726}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &537498730
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 537498726}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
---- !u!114 &537498731
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 537498726}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 72ff3269b294cb0488d44a4bc6fc6939, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  player: {fileID: 28184874}
 --- !u!1 &568882133
 GameObject:
   m_ObjectHideFlags: 0
@@ -1634,11 +1492,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 568882133}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -37.08049, y: -0.5, z: 0}
+  m_LocalPosition: {x: 21.024761, y: -0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &568882136
 MonoBehaviour:
@@ -1806,11 +1664,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 676515654}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 38.580246, y: -1.61, z: 0}
+  m_LocalPosition: {x: 9.527619, y: -1.61, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &676515657
 MonoBehaviour:
@@ -1855,7 +1713,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &751536331
 GameObject:
@@ -1927,7 +1785,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &787274203
 GameObject:
@@ -1959,7 +1817,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &787274205
 MonoBehaviour:
@@ -2029,7 +1887,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &841324503
 GameObject:
@@ -2197,7 +2055,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3}
       propertyPath: m_RootOrder
-      value: 16
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2480,7 +2338,7 @@ Transform:
   - {fileID: 841324504}
   - {fileID: 1584969321}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1079202364
 GameObject:
@@ -2563,7 +2421,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1079202367
 MonoBehaviour:
@@ -2691,7 +2549,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 33
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1110849468
 GameObject:
@@ -2872,11 +2730,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1115045276}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 50.16049, y: -2.1100001, z: 0}
+  m_LocalPosition: {x: -7.9447613, y: -2.1100001, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1115045279
 MonoBehaviour:
@@ -2924,7 +2782,7 @@ Transform:
   - {fileID: 1346768666}
   - {fileID: 1979334485}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &1167537485
 BoxCollider2D:
@@ -3129,7 +2987,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3}
       propertyPath: m_RootOrder
-      value: 18
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3}
       propertyPath: m_LocalPosition.x
@@ -3424,7 +3282,7 @@ Transform:
   m_Children:
   - {fileID: 1327615879}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1381849287
 MonoBehaviour:
@@ -3672,7 +3530,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1566067912
 GameObject:
@@ -3702,7 +3560,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1567620583
 GameObject:
@@ -3768,7 +3626,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 36
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1584969320
 GameObject:
@@ -3890,7 +3748,7 @@ Transform:
   - {fileID: 1110849471}
   - {fileID: 442489149}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1588872236
 MonoBehaviour:
@@ -4075,7 +3933,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1867567306
 GameObject:
@@ -4155,12 +4013,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1867567306}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 60.915558, y: -1.96, z: -10}
+  m_LocalPosition: {x: -7.9444447, y: -1.66, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 927697135}
   m_Father: {fileID: 0}
-  m_RootOrder: 32
+  m_RootOrder: 31
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1921855235
 GameObject:
@@ -4190,7 +4048,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1972708458
 GameObject:
@@ -9152,7 +9010,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2082496744
 MonoBehaviour:
@@ -9224,7 +9082,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 34
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2089389211
 MonoBehaviour:
@@ -9268,7 +9126,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2140831766
 GameObject:
@@ -9361,15 +9219,15 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.36
+      value: -11.5
       objectReference: {fileID: 0}
     - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.96
+      value: -1.66
       objectReference: {fileID: 0}
     - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
       propertyPath: m_LocalPosition.z
@@ -9422,7 +9280,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1891403814086148855, guid: d806b9f1cc01ac345b486b12ec88394c, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1891403814086148855, guid: d806b9f1cc01ac345b486b12ec88394c, type: 3}
       propertyPath: m_LocalPosition.x
@@ -9671,7 +9529,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3700592915405010629, guid: 725860ad24cfa2a46acd66ef8245968f, type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: 3700592915405010629, guid: 725860ad24cfa2a46acd66ef8245968f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -9747,7 +9605,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3}
       propertyPath: m_RootOrder
-      value: 19
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/乐/ItemController.cs

@@ -14,6 +14,9 @@ public class ItemController : UnitySingleton<ItemController>
 
     void Start()
     {
+        Debug.Log("数组大小"+itemList.Count);
+
+        displayIndex = 0;
         player = FindObjectOfType<Player>();
         Display();
     }
@@ -21,7 +24,7 @@ public class ItemController : UnitySingleton<ItemController>
     // Update is called once per frame
     void Update()
     {
-        
+        Debug.Log("序号"+displayIndex);
     }
     
     //添加物品

Assets/Scripts/乐/Player.cs

@@ -90,7 +90,6 @@ public class Player : PlayerControl
     //UPDATE  
     void Update()
     {
-        TellMapStates();
         //Debug.Log(weapon.name + " " + weapon.GetIsAtk());
 
         //OnInputDetect();
@@ -195,9 +194,6 @@ public class Player : PlayerControl
 
     protected override void OnLeftChange()
     {        
-        //
-        Debug.Log("left");
-        //
         ItemController.Instance.LeftChangeItem();       
     }
 

Assets/Scripts/乐/Tiger.cs

@@ -126,6 +126,7 @@ public class Tiger : MonoBehaviour
                 Freeze();
                 anim.SetTrigger("老虎似了");
                 GetComponent<Collider2D>().enabled = false;
+                UIWord.Instance.TigerUI();
                 Debug.Log("老虎似了");
             }
         }

Assets/Scripts/乐/TransSense.cs

@@ -6,6 +6,7 @@ using UnityEngine.SceneManagement;
 public class TransSense : MonoBehaviour
 {
     public string nextScene;
+    Player player;
     // Start is called before the first frame update
     void Start()
     {
@@ -20,7 +21,8 @@ public class TransSense : MonoBehaviour
  
     private void OnTriggerEnter2D(Collider2D collision)
     {
-        FindObjectOfType<PlayerControl>().playerC.Dispose();
+        player = FindObjectOfType<Player>();
+        player.DisPose();
         SceneManager.LoadSceneAsync(nextScene);
     }
 }

Assets/Scripts/乐/UIWord.cs

@@ -8,6 +8,7 @@ public class UIWord : UnitySingleton<UIWord>
     public GameObject tree;
     public GameObject fire;
     public GameObject stone;
+    public GameObject tiger;
     // Start is called before the first frame update
     void Start()
     {
@@ -29,5 +30,8 @@ public class UIWord : UnitySingleton<UIWord>
     public void StoneUI() {
         stone.SetActive(true);
     }
-
+    public void TigerUI()
+    {
+        tiger.SetActive(true);
+    }
 }

Assets/Scripts/勍/角色/PlayerControl.cs

@@ -9,7 +9,7 @@ using Sirenix.OdinInspector;
 /// </summary>
 public class PlayerControl : MonoBehaviour
 {
-    public PlayerC playerC;
+    private PlayerC playerC;
 
     /// <summary>
     /// 此帧输入方向，-1为左，1为右，0此帧不输入
@@ -22,6 +22,8 @@ public class PlayerControl : MonoBehaviour
 
     protected virtual void Start()
     {
+
+
         playerC = new PlayerC();
         //playerC.Enable();
         playerC.Normal.Enable();
@@ -56,25 +58,7 @@ public class PlayerControl : MonoBehaviour
             Debug.LogError("玩家动画机丢失！");
         }
 
-        //playerC.Dispose();
-    }
        
-    public void TellMapStates(){
-
-        if(playerC.Normal.enabled){
-            Debug.Log("Normal is Active");
-        }
-        else
-        {
-            Debug.Log("Normal is Inactive");
-        }
-        if(playerC.Null.enabled){
-            Debug.Log("Null is Active");
-        }
-        else
-        {
-            Debug.Log("Null is Inactive");
-        }
     }
 
     /// <summary>
@@ -185,4 +169,8 @@ public class PlayerControl : MonoBehaviour
         yield return new WaitForSeconds(time);
         ToMap("Normal");
     }
+
+    public void DisPose() {
+        playerC.Dispose();
+    }
 }

UserSettings/EditorUserSettings.asset

@@ -15,25 +15,25 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
+      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
       flags: 0
     RecentlyUsedScenePath-7:
       value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650