4.2（未合并）

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

Assets/Scenes/乐/Sample1.unity

@@ -194,7 +194,7 @@ GameObject:
   - component: {fileID: 28184873}
   - component: {fileID: 28184872}
   m_Layer: 0
-  m_Name: Player (1)
+  m_Name: Player
   m_TagString: Player
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1463,18 +1463,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 663361286}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 7d14e17aa64f8fe459a7ff19a5360764, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
   m_GameObject: {fileID: 676515654}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 9.527619, y: -1.61, z: 0}
@@ -2173,7 +2161,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 126049849
   m_SortingLayer: 2
-  m_SortingOrder: 3
+  m_SortingOrder: 5
   m_Sprite: {fileID: 1603219427004495315, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
   m_Color: {r: 0.9622642, g: 0.87602353, b: 0.87602353, a: 1}
   m_FlipX: 0
@@ -3968,6 +3956,7 @@ Transform:
   m_LocalScale: {x: 0.9375, y: 1, z: 1}
   m_Children:
   - {fileID: 1819007945}
+  - {fileID: 2140831767}
   m_Father: {fileID: 1007217205}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9483,6 +9472,88 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2140831766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2140831767}
+  - component: {fileID: 2140831768}
+  m_Layer: 0
+  m_Name: '{B7F$JKS~RO{AOZP0)J}O5L'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2140831767
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140831766}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 3.542745, y: 1.8133668, z: 1.0050215}
+  m_LocalScale: {x: 1.0065349, y: 0.9436264, z: 0.9436264}
+  m_Children: []
+  m_Father: {fileID: 1584969321}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2140831768
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140831766}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -1852505165
+  m_SortingLayer: 4
+  m_SortingOrder: 6
+  m_Sprite: {fileID: 21300000, guid: 96606396023d2ef40aa1c29ecea15cef, type: 3}
+  m_Color: {r: 1, g: 0.8930817, b: 0.8930817, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 14.78, y: 9.88}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &5958777469585463160
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/乐/Sample2.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1acd0b27f96c6d4fb666b5883590375
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/乐/ItemController.cs

@@ -41,6 +41,7 @@ public class ItemController : UnitySingleton<ItemController>
     /// </summary>
     public void SetItem()
     {
+        if(itemList[displayIndex]!=null)
         player.weapon = itemList[displayIndex];
 
     }

Assets/Scripts/乐/Player.cs

@@ -26,6 +26,7 @@ public class Player : PlayerControl
     /// <summary>
     /// 手持武器
     /// </summary>  
+    [ReadOnly]
     [Header("手持武器")] [FoldoutGroup("子物体")]
     public Item weapon;
 
@@ -83,7 +84,7 @@ public class Player : PlayerControl
         base.Start();
         m_rigidbody = gameObject.GetComponent<Rigidbody2D>();
         boneAnim = bone.gameObject.GetComponent<Animator>();
-        WeaponInit();
+        //WeaponInit();
     }
 
     //UPDATE  
@@ -196,9 +197,18 @@ public class Player : PlayerControl
     //武器更换相关函数--------------------------------------------------
    public void WeaponInPosition() {
         GameObject chosenOne;
-        chosenOne = GameObject.Find(weapon.name);
+        try
-        if (chosenOne.TryGetComponent<Item>(out Item chosenWeapen))
+        {
-            chosenWeapen.InPosition(weaponTrans,weaponPos);
+            chosenOne = GameObject.Find(weapon.name);
+            if (chosenOne.TryGetComponent<Item>(out Item chosenWeapen))
+                chosenWeapen.InPosition(weaponTrans, weaponPos);
+        }
+        catch (System.Exception e)
+        {
+            e.ToString();
+            Debug.LogError("初始武器未绑定，若本关卡需要武器，请绑定，否则无视此信息" );
+        }
+       
     }
 
     public void WeaponReturn()

Assets/Scripts/乐/Tiger.cs

@@ -0,0 +1,96 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Tiger : MonoBehaviour
+{
+    Animator anim;
+    Player player;
+    Rigidbody2D rig;
+    public float dis;
+    public float speed;
+    public Vector2 bcakJumpVel;
+    void Start()
+    {
+        rig = GetComponent<Rigidbody2D>();
+       anim = GetComponent<Animator>();
+        player = FindObjectOfType<Player>(); ;
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+        if (Mathf.Abs(player.transform.position.x - transform.position.x) < dis)
+        {
+            anim.SetTrigger("老虎前扑");
+            anim.SetTrigger("老虎冲撞");
+            anim.SetBool("老虎走动", false);
+            
+        }
+    }
+
+    private void FixedUpdate()
+    {
+        if (anim.GetBool("老虎走动"))
+        {
+            rig.velocity = new Vector2(speed, rig.velocity.y);
+        }
+        //else rig.velocity = Vector2.zero;
+    }
+
+    public void Behavior(string behaviorName)
+    {
+        try
+        {
+            //触发动画
+            anim.SetTrigger(behaviorName);
+        }
+        catch (System.Exception e)
+        {
+            e.ToString();
+            Debug.LogError("没有找到触发器" + behaviorName);
+        }
+
+    }
+
+    public void BackJump() {
+        rig.velocity = bcakJumpVel;
+;
+    }
+    public void JudgeForward() {
+        if (Mathf.Abs(player.transform.position.x - transform.position.x) >= dis && !anim.GetBool("老虎走动"))
+        {
+            anim.SetBool("老虎走动", true);
+        }
+        else if (Mathf.Abs(player.transform.position.x - transform.position.x) < dis)
+        {   anim.SetTrigger("老虎冲撞");
+            anim.SetTrigger("老虎前扑");
+            
+           
+            anim.SetBool("老虎走动", false);
+            
+        }
+
+    }
+    //重置所有trigger
+    public void ResetAllTrigger() {
+        rig.velocity = Vector2.zero;
+
+        AnimatorControllerParameter[] aps = anim.parameters;
+        for (int i = 0; i < aps.Length; i++)
+        {
+            AnimatorControllerParameter paramItem = aps[i];
+            if (paramItem.type == AnimatorControllerParameterType.Trigger)
+            {
+                string triggerName = paramItem.name;
+                bool isActive = anim.GetBool(triggerName);
+                if (isActive)
+                {
+                    anim.ResetTrigger(triggerName);
+                }
+            }
+        }
+    }
+}

Assets/Scripts/乐/Tiger.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66fdd61b3fec5904cb0b1920e06b40f3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/动画/laohu.controller

@@ -10,7 +10,8 @@ AnimatorState:
   m_Name: "\u8001\u864E\u5F85\u673A"
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -1761926096109691560}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -37,35 +38,82 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -35485122466041576}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 600, y: 90, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -8061469937883921553}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 340, y: -10, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7132027744515699255}
-    m_Position: {x: 270, y: 130, z: 0}
+    m_Position: {x: 800, y: 370, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -1048039482422033308}
-    m_Position: {x: 305, y: 195, z: 0}
+    m_Position: {x: 780, y: 420, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2032221853258603237}
-    m_Position: {x: 340, y: 260, z: 0}
+    m_Position: {x: 360, y: 390, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2001730767347291713}
-    m_Position: {x: 375, y: 325, z: 0}
+    m_Position: {x: 790, y: 470, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4615150197876246946}
-    m_Position: {x: 410, y: 390, z: 0}
+    m_Position: {x: 360, y: 200, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 30, y: 280, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ExitPosition: {x: 870, y: 110, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -35485122466041576}
+  m_DefaultState: {fileID: -8061469937883921553}
+--- !u!1101 &-2828416572883611680
+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: "\u8001\u864E\u524D\u6251"
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4615150197876246946}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8333333
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-2671436879551253730
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8061469937883921553}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-2032221853258603237
 AnimatorState:
   serializedVersion: 6
@@ -76,7 +124,8 @@ AnimatorState:
   m_Name: "\u8001\u864E\u51B2\u649E"
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -2828416572883611680}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -92,6 +141,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-1761926096109691560
+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: "\u8001\u864E\u8D70\u52A8"
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -35485122466041576}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1048039482422033308
 AnimatorState:
   serializedVersion: 6
@@ -126,9 +200,11 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: "\u8001\u864E\u8D70\u52A8"
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 2989367665838181730}
+  - {fileID: 2916365245849406453}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -152,7 +228,25 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: laohu
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: "\u8001\u864E\u8D70\u52A8"
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: "\u8001\u864E\u524D\u6251"
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: "\u8001\u864E\u51B2\u649E"
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -192,6 +286,56 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &2916365245849406453
+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: "\u8001\u864E\u51B2\u649E"
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2032221853258603237}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9166667
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &2989367665838181730
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: "\u8001\u864E\u8D70\u52A8"
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.2
+  m_TransitionOffset: 0.5
+  m_ExitTime: 0.26
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &4615150197876246946
 AnimatorState:
   serializedVersion: 6
@@ -202,7 +346,8 @@ AnimatorState:
   m_Name: "\u8001\u864E\u524D\u6251"
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -2671436879551253730}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/动画/老虎前扑.anim

@@ -948,34 +948,25 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.5
-        value: {x: 4.4505405, y: 5.8598204, z: 0}
+        value: {x: 5, y: 1.5538476, z: 0}
-        inSlope: {x: 0.51720834, y: 9.557404, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0.51720834, y: 9.557404, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.65
-        value: {x: 4.534587, y: 7.7416625, z: 0}
-        inSlope: {x: 0, y: 10.015677, z: 0}
-        outSlope: {x: 0, y: 10.015677, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.9833333
-        value: {x: 3.5484543, y: 10.700731, z: 0}
+        value: {x: 2.9682455, y: 1.5538476, z: 0}
-        inSlope: {x: -5.3013124, y: 9.700323, z: 0}
+        inSlope: {x: -2.1376238, y: 0, z: 0}
-        outSlope: {x: -5.3013124, y: 9.700323, z: 0}
+        outSlope: {x: -2.1376238, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 2.2333333
-        value: {x: 1.4421544, y: 13.400185, z: 0}
+        value: {x: 2.5763478, y: 1.5293503, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -984,7 +975,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 2.5
-        value: {x: 1.761204, y: 12.435793, z: 0}
+        value: {x: 2.9682455, y: 1.5538476, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -2743,16 +2734,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.5
-        value: 4.4505405
+        value: 5
-        inSlope: 0.51720834
-        outSlope: 0.51720834
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.65
-        value: 4.534587
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -2761,16 +2743,16 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.9833333
-        value: 3.5484543
+        value: 2.9682455
-        inSlope: -5.3013124
+        inSlope: -2.1376238
-        outSlope: -5.3013124
+        outSlope: -2.1376238
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 2.2333333
-        value: 1.4421544
+        value: 2.5763478
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -2779,7 +2761,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 2.5
-        value: 1.761204
+        value: 2.9682455
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -2816,34 +2798,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.5
-        value: 5.8598204
+        value: 1.5538476
-        inSlope: 9.557404
+        inSlope: 0
-        outSlope: 9.557404
+        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.65
-        value: 7.7416625
-        inSlope: 10.015677
-        outSlope: 10.015677
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.9833333
-        value: 10.700731
+        value: 1.5538476
-        inSlope: 9.700323
+        inSlope: 0
-        outSlope: 9.700323
+        outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 2.2333333
-        value: 13.400185
+        value: 1.5293503
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -2852,7 +2825,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 2.5
-        value: 12.435793
+        value: 1.5538476
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -2896,15 +2869,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.65
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.9833333
         value: 0
@@ -9608,4 +9572,11 @@ AnimationClip:
     script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 1
+    functionName: BackJump
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0

Assets/动画/老虎待机.anim

@@ -8960,4 +8960,18 @@ AnimationClip:
     script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 0
+    functionName: ResetAllTrigger
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
+  - time: 1.5
+    functionName: JudgeForward
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0

Assets/动画/老虎走动.anim

@@ -1684,45 +1684,9 @@ AnimationClip:
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1
-        value: {x: 2.9268918, y: 1.9856653, z: 0}
-        inSlope: {x: -0.0415464, y: 0.69613266, z: 0}
-        outSlope: {x: -0.0415464, y: 0.69613266, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.3166667
-        value: {x: 2.913216, y: 2.4704223, z: 0}
-        inSlope: {x: -0.10940552, y: 1.1004963, z: 0}
-        outSlope: {x: -0.10940552, y: 1.1004963, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 1.5
-        value: {x: 2.8704095, y: 2.6079843, z: 0}
-        inSlope: {x: -0.13863087, y: 0.46499845, z: 0}
-        outSlope: {x: -0.13863087, y: 0.46499845, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 2.5
-        value: {x: 2.7491696, y: 3.1369557, z: 0}
-        inSlope: {x: -0.14383762, y: 0.8578822, z: 0}
-        outSlope: {x: -0.14383762, y: 0.8578822, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 3
-        value: {x: 2.654653, y: 3.8948076, z: 0}
+        value: {x: 2.9682455, y: 1.5538476, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -2300,13 +2264,6 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 3980913656
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 3198636846
       attribute: 4
@@ -2566,6 +2523,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3980913656
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 377759540
       attribute: 1
@@ -4418,45 +4382,9 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1
-        value: 2.9268918
-        inSlope: -0.0415464
-        outSlope: -0.0415464
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.3166667
-        value: 2.913216
-        inSlope: -0.10940552
-        outSlope: -0.10940552
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.5
-        value: 2.8704095
-        inSlope: -0.13863087
-        outSlope: -0.13863087
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 2.5
-        value: 2.7491696
-        inSlope: -0.14383762
-        outSlope: -0.14383762
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
-        value: 2.654653
+        value: 2.9682455
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -4482,45 +4410,9 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1
-        value: 1.9856653
-        inSlope: 0.69613266
-        outSlope: 0.69613266
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.3166667
-        value: 2.4704223
-        inSlope: 1.1004963
-        outSlope: 1.1004963
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.5
-        value: 2.6079843
-        inSlope: 0.46499845
-        outSlope: 0.46499845
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 2.5
-        value: 3.1369557
-        inSlope: 0.8578822
-        outSlope: 0.8578822
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
-        value: 3.8948076
+        value: 1.5538476
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -4546,42 +4438,6 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.3166667
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 1.5
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 2.5
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
         time: 3
         value: 0

Assets/美术素材/杂项/{B7F$JKS~RO{AOZP0)J}O5L.jpg.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 96606396023d2ef40aa1c29ecea15cef
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Logs/ApiUpdaterCheck.txt

@@ -172,3 +172,23 @@ C# parse time         : -1ms
 candidates check time : -1ms
 console write time    : -1ms
 
+[api-updater (non-obsolete-error-filter)] 2022/4/2 22:58:22 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 808.5839ms
+moved types parse time: 54ms
+candidates parse time : 1ms
+C# parse time         : -1ms
+candidates check time : -1ms
+console write time    : -1ms
+
+[api-updater (non-obsolete-error-filter)] 2022/4/3 1:10:31 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 80.616ms
+moved types parse time: 51ms
+candidates parse time : 1ms
+C# parse time         : -1ms
+candidates check time : -1ms
+console write time    : -1ms
+

UserSettings/EditorUserSettings.asset

@@ -9,28 +9,31 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
+      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
+      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
+      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
+      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650