任务：搭建场景3

1.制作场景1玩家交互绳结动画逻辑（1.为玩家操控基类添加触发动作函数 2.制作场景1黄帝动画 3.引入了以前写的播片系统好像不能摸鱼了，明天写播片，下班了喵😿
2022-04-01 23:05:52 +08:00 · 2022-04-01 23:05:52 +08:00 · 4218cd5c99
commit 4218cd5c99
parent a26ce3a31c
25 changed files with 2926 additions and 140 deletions
--- a/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
+++ b/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 81dbcde0f90df4e9ba9ca2794490e57a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
+++ b/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd02c799f3f5c4c83b2fc26c105a3821
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Custom
+++ b/Assets/Plugins/Sirenix/Demos/Custom
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f597f19f656ba56eae4f6a3a7cc528f4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Custom
+++ b/Assets/Plugins/Sirenix/Demos/Custom
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 48e08dc33330d11e9d4a1b246c52e4f6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Editor
+++ b/Assets/Plugins/Sirenix/Demos/Editor
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ed09910c0094cb27be8f3ca264680da3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Demos/Sample
+++ b/Assets/Plugins/Sirenix/Demos/Sample
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cc355dd4cf1e6173beaeb22c2858cbe1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/勍/InteractTest.unity
+++ b/Assets/Scenes/勍/InteractTest.unity
--- a/Assets/Scenes/勍/场景3.unity
+++ b/Assets/Scenes/勍/场景3.unity
--- a/Assets/Scripts/勍/对话框架/AConversation.cs
+++ b/Assets/Scripts/勍/对话框架/AConversation.cs
@ -22,7 +22,7 @@ public class AConversation : MonoBehaviour
    public Transform P1Pos;
    public Transform P2Pos;
    [Header("对话框到说话者中心的偏移量")]
-    public Vector2 offset = new Vector2(1.5f, 1.5f);
+    public Vector2 offset = new Vector2(3.5f, 2.5f);



--- a/Assets/Scripts/勍/播片系统.meta
+++ b/Assets/Scripts/勍/播片系统.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 759f25e63542fe94fa862bb70622f7e1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/勍/播片系统/ACG.cs
+++ b/Assets/Scripts/勍/播片系统/ACG.cs
@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+    //写一个类，代表一个CG，里面保存CG需要的内容
+    public class ACG : MonoBehaviour
+    {
+        [Tooltip("名字，同时也是唯一调用标识，别吐槽我用中文，这里是中国")]
+        public string CGName;
+        [Tooltip("这个CG要显示的东西，据说视频也可以？")]
+        public Texture texture;
+        [Tooltip("这个CG要显示多长时间")]
+        public float time;
+        [Tooltip("CG播放结束时要触发什么事件？")]
+        public Event onEnded;
+
+        public void OnEnded()
+        { 
+            try
+            {
+                onEnded.OnCall();//触发结束事件，不同CG事件不一样，所以用public自己拖
+            }
+            catch(System.Exception e)
+            {
+                Debug.Log("要么是这个CG没有结束事件，要么是你这个结束事件里面出错了。什么错？我咋知道（摆烂\n" +
+                          e.ToString());
+            }
+        }
+    }
+
--- a/Assets/Scripts/勍/播片系统/ACG.cs.meta
+++ b/Assets/Scripts/勍/播片系统/ACG.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d1cc526f2420065428c7ff9dcc3b51ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/勍/播片系统/CGAdministrator.cs
+++ b/Assets/Scripts/勍/播片系统/CGAdministrator.cs
@ -0,0 +1,94 @@
+// using System.Collections;
+// using System.Collections.Generic;
+// using UnityEngine;
+// using UnityEngine.UI;
+// using UnityEditor;
+// using UnityEngine.Video;
+// using UnityEngine.InputSystem;
+
+// public class CGAdministrator : MonoBehaviour
+// {
+//     // Start is called before the first frame update
+//     //CG管理员相关代码
+
+//     private RawImage rawImage;
+//     [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField]
+//     private ACG[] CGs;
+//     private IndexRecoder indexRecoder;
+//     private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在
+//     void Start()
+//     {
+//         rawImage = GetComponent<RawImage>();
+//         indexRecoder = FindObjectOfType<IndexRecoder>();
+//         rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？
+
+//         //好像可以让它自己找到所有CG
+//         CGs = new ACG[transform.childCount];
+//         for(int i = 0; i < transform.childCount; i++)
+//         {
+//             CGs[i] = transform.GetChild(i).GetComponent<ACG>();
+//         }
+//         //
+
+//         //
+//         //CallACG("暂用");
+//         //
+//     }
+
+//     // Update is called once per frame
+//     void Update()
+//     {
+//     }
+
+
+//     //外部呼叫CG用，传入你要调用的CG名
+//     public　void　CallACG(string CGName)
+//     {
+//         //当外面叫了一个CG，传入CG名
+//         foreach(ACG CG in CGs)
+//         {
+//             //找到这个CG
+//             if(CG.CGName.Equals(CGName))
+//             {
+//                 Debug.Log("正在显示CG："+CG.name);
+//                 rawImage.texture = CG.texture;//把CG的内容装载上
+//                 rawImage.CrossFadeAlpha(1,indexRecoder.CGFadeTime,true);//淡入显示CG
+//                 playingCG = CG;
+//                 try
+//                 {
+//                     CG.GetComponent<VideoPlayer>().Play();//开始播放这个CG
+//                     FindObjectOfType<PlayerInput>().SwitchCurrentActionMap("NullMap");//使玩家无法操作
+//                 }
+//                 catch(System.NullReferenceException)
+//                 {
+//                     Debug.Log("播放CG失败，看看赋值对不对");
+//                 }
+//                 Invoke("StopIt",CG.time);
+//             }
+//         }
+//     }
+
+//     //改变标记，使管理员意识到CG该停了
+//     private void StopIt(){rawImage.CrossFadeAlpha(0f,indexRecoder.CGFadeTime,true);//淡出CG
+//                           playingCG.OnEnded();}//告诉这个CG它结束了，然后触发它的结束事件
+
+//     // //制造一个只读的变量，不要动这些
+//     // public class ReadOnlyAttribute : PropertyAttribute{}
+//     // [CustomPropertyDrawer(typeof(ReadOnlyAttribute))]
+//     // public class ReadOnlyDrawer : PropertyDrawer
+//     // {
+//     //     public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+//     //     {
+//     //         return EditorGUI.GetPropertyHeight(property, label, true);
+//     //     }
+
+//     //     public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+//     //     {
+//     //         GUI.enabled = false;
+//     //         EditorGUI.PropertyField(position, property, label, true);
+//     //         GUI.enabled = true;
+//     //     }
+//     // }
+//     // //
+
+// }
--- a/Assets/Scripts/勍/播片系统/CGAdministrator.cs.meta
+++ b/Assets/Scripts/勍/播片系统/CGAdministrator.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7b3954127e8ca6e448e4f5e6d742e054
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/勍/演出/HuangdiAsk.cs
+++ b/Assets/Scripts/勍/演出/HuangdiAsk.cs
@ -11,6 +11,8 @@ public class HuangdiAsk : Stage
    {
        //触发对话：黄帝提需求
        ConversationController.Instance.OnCall("黄帝提需求");
+        //触发黄帝指向左边的动画
+        FindObjectOfType<HuangDi>().Behavior("Point");
        //等待对话结束
        yield return new WaitForSeconds(3f);
        //黄帝手指左方，但是目前没有动画
--- a/Assets/Scripts/勍/演出/HuangdiConfused.cs
+++ b/Assets/Scripts/勍/演出/HuangdiConfused.cs
@ -9,6 +9,8 @@ public class HuangdiConfused : Stage
        Debug.Log("黄帝疑惑");
        //触发对话：黄帝疑惑
        ConversationController.Instance.OnCall("黄帝疑惑");
+        //触发黄帝点头的动画
+        FindObjectOfType<HuangDi>().Behavior("Node");
        //等待对话结束
        yield return new WaitForSeconds(9f);
        //标记黄帝状态为End
--- a/Assets/Scripts/勍/绳结/KnotMediator.cs
+++ b/Assets/Scripts/勍/绳结/KnotMediator.cs
@ -19,7 +19,7 @@ public class KnotMediator : UnitySingleton<KnotMediator>
    /// <summary>
    /// 当前记录的绳结类型
    /// </summary>
-    [Header("当前记录的绳结类型")][SerializeField][ReadOnly][EnumPaging]
+    [Header("当前记录的绳结类型")][SerializeField][EnumPaging]
    private KnotType currentKnotType;

    public void RecordKnotType(KnotType knotType)
--- a/Assets/Scripts/勍/角色/HuangDi.cs
+++ b/Assets/Scripts/勍/角色/HuangDi.cs
@ -11,6 +11,9 @@ public class HuangDi : EntryTrigger
    [SerializeField][EnumPaging]
    private KnotMediator.KnotType neededType = KnotMediator.KnotType.编成麻花的绳结;

+    //自身状态机
+    private Animator animator;
+
    public enum HuangDiState
    {
        None,
@ -19,6 +22,16 @@ public class HuangDi : EntryTrigger
        End
    }

+
+    void Start(){
+        animator = GetComponentInChildren<Animator>();
+        //如果没找到，则报错
+        if (animator == null)
+        {
+            Debug.LogError("没有找到Animator组件");
+        }
+    }
+
    public HuangDiState state = HuangDiState.None;

    public override void OnCall()
@ -51,4 +64,22 @@ public class HuangDi : EntryTrigger
    {
        neededType = type;
    }
+
+    /// <summary>
+    /// 控制黄帝的动画
+    /// </summary>
+    /// <param name="behaviorName">触发的动画名</param>
+    public void Behavior(string behaviorName)
+    {
+        try{
+            //触发动画
+            animator.SetTrigger(behaviorName);
+        }
+        catch(System.Exception e)
+        {
+            e.ToString();
+            Debug.LogError("没有找到触发器" + behaviorName);
+        }
+        
+    }
 }
--- a/Assets/Scripts/勍/角色/PlayerControl.cs
+++ b/Assets/Scripts/勍/角色/PlayerControl.cs
@ -18,6 +18,8 @@ public class PlayerControl : MonoBehaviour
    protected int inputDir;
    protected PlayerInteract playerInteract;

+    protected Animator animator;
+
    protected virtual void Start()
    {
        playerC = new PlayerC();
@ -47,6 +49,13 @@ public class PlayerControl : MonoBehaviour
        checker.GetComponent<BoxCollider2D>().size = new Vector2(1f, 1f);//设置碰撞盒大小
        checker.transform.localPosition = Vector3.zero;//设置碰撞盒位置

+        //找到动画机
+        animator = GetComponentInChildren<Animator>();
+        if (animator == null)
+        {
+            Debug.LogError("玩家动画机丢失！");
+        }
+
    }

    /// <summary>
@ -122,4 +131,23 @@ public class PlayerControl : MonoBehaviour
        playerC.Normal.Disable();
        playerC.Null.Disable();
    }
+
+
+    /// <summary>
+    /// 触发玩家用触发器触发的动画
+    /// </summary>
+    /// <param name="behaviorName">触发器名</param>
+    public void Behavior(string behaviorName)
+    {
+        try{
+            //触发动画
+            animator.SetTrigger(behaviorName);
+        }
+        catch(System.Exception e)
+        {
+            e.ToString();
+            Debug.LogError("没有找到触发器" + behaviorName);
+        }
+        
+    }
 }
--- a/Assets/动画/huangdi.controller
+++ b/Assets/动画/huangdi.controller
@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-5148448635645685566
+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: Node
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6838413671657620931}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-4101692906760797252
 AnimatorState:
  serializedVersion: 6
@ -10,7 +35,9 @@ AnimatorState:
  m_Name: "\u9EC4\u5E1D\u5F85\u673A"
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -3375428003934504853}
+  - {fileID: -5148448635645685566}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -26,6 +53,75 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-3375428003934504853
+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: Point
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3334851738953319100}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-2853219905132771913
+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: 6838413671657620931}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-1022691711078637238
+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: -4101692906760797252}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.46374893
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8404255
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 1
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@ -34,7 +130,19 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: huangdi
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Point
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: Node
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -58,7 +166,8 @@ AnimatorState:
  m_Name: "\u9EC4\u5E1D\u4F38\u624B"
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -1022691711078637238}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -74,6 +183,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &4535415101878901832
+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: -4101692906760797252}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &6838413671657620931
 AnimatorState:
  serializedVersion: 6
@ -84,7 +215,8 @@ AnimatorState:
  m_Name: "\u9EC4\u5E1D\u70B9\u5934"
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 4535415101878901832}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@ -111,13 +243,13 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -4101692906760797252}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 240, y: 160, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3334851738953319100}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 490, y: 40, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 6838413671657620931}
-    m_Position: {x: 270, y: 130, z: 0}
+    m_Position: {x: 550, y: 190, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
--- a/Assets/动画/黄帝伸手.anim
+++ b/Assets/动画/黄帝伸手.anim
@ -197,6 +197,15 @@ 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: 3
+        value: {x: 0, y: 0, z: -2.739}
+        inSlope: {x: 0, y: 0, 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}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -231,6 +240,15 @@ 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: 2.9833333
+        value: {x: 0, y: 0, z: -91.282}
+        inSlope: {x: 0, y: 0, 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}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -265,6 +283,15 @@ 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: 2.9833333
+        value: {x: 0, y: 0, z: 9.429}
+        inSlope: {x: 0, y: 0, 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}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -299,6 +326,15 @@ 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: 2.9833333
+        value: {x: 0, y: 0, z: 1.819}
+        inSlope: {x: 0, y: 0, 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}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -370,22 +406,6 @@ AnimationClip:
      m_RotationOrder: 4
    path: bone_1/bone_2/bone_3/bone_7/bone_8/bone_9
  m_PositionCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: -0.2019817, y: -0.009896722, z: 0}
-        inSlope: {x: 0, y: 0, 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}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: bone_1
  - curve:
      serializedVersion: 2
      m_Curve:
@ -941,13 +961,6 @@ AnimationClip:
      typeID: 4
      customType: 4
      isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 377759540
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
    - serializedVersion: 2
      path: 3980913656
      attribute: 1
@ -1234,7 +1247,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1.5666667
+    m_StopTime: 3
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -1250,63 +1263,6 @@ AnimationClip:
    m_HeightFromFeet: 0
    m_Mirror: 0
  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -0.2019817
-        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_LocalPosition.x
-    path: bone_1
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -0.009896722
-        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_LocalPosition.y
-    path: bone_1
-    classID: 4
-    script: {fileID: 0}
-  - 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_LocalPosition.z
-    path: bone_1
-    classID: 4
-    script: {fileID: 0}
  - curve:
      serializedVersion: 2
      m_Curve:
@ -2903,6 +2859,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3
+        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
@ -2940,6 +2905,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3
+        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
@ -2977,6 +2951,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3
+        value: -2.739
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -3128,6 +3111,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3165,6 +3157,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3202,6 +3203,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        value: -91.282
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -3353,6 +3363,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3390,6 +3409,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3427,6 +3455,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        value: 9.429
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -3578,6 +3615,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3615,6 +3661,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        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
@ -3652,6 +3707,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 2.9833333
+        value: 1.819
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -4291,7 +4355,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_4
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4301,7 +4365,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_4
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4311,7 +4375,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_4
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4321,7 +4385,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_4/bone_5
+    path: bone_1/bone_2/bone_3/bone_16
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4331,7 +4395,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_4/bone_5
+    path: bone_1/bone_2/bone_3/bone_16
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4341,7 +4405,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_4/bone_5
+    path: bone_1/bone_2/bone_3/bone_16
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4651,7 +4715,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_4
+    path: bone_1/bone_2/bone_3/bone_4/bone_5
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4661,7 +4725,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_4
+    path: bone_1/bone_2/bone_3/bone_4/bone_5
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4671,7 +4735,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_4
+    path: bone_1/bone_2/bone_3/bone_4/bone_5
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4741,7 +4805,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_16
+    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4751,7 +4815,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_16
+    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
    classID: 4
    script: {fileID: 0}
  - curve:
@ -4761,7 +4825,7 @@ AnimationClip:
      m_PostInfinity: 2
      m_RotationOrder: 4
    attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_16
+    path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6
    classID: 4
    script: {fileID: 0}
  m_HasGenericRootTransform: 0
--- a/Assets/美术素材/场景1/问号.png
+++ b/Assets/美术素材/场景1/问号.png
--- a/Assets/美术素材/场景1/问号.png.meta
+++ b/Assets/美术素材/场景1/问号.png.meta
@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 1fe3d52b0444bee4ea17d4d1cfd70a70
+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: 400
+  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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: 
--- a/Logs/ApiUpdaterCheck.txt
+++ b/Logs/ApiUpdaterCheck.txt
@ -162,3 +162,13 @@ C# parse time         : -1ms
 candidates check time : -1ms
 console write time    : -1ms

+[api-updater (non-obsolete-error-filter)] 2022/4/1 23:01:40 : Starting D:/unity/Editor/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)] 
+----------------------------------
+jit/startup time      : 783.3485ms
+moved types parse time: 58ms
+candidates parse time : 1ms
+C# parse time         : -1ms
+candidates check time : -1ms
+console write time    : -1ms
+
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,25 +6,25 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
      flags: 0
    RecentlyUsedScenePath-2:
      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
      flags: 0
    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
      flags: 0
    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
      flags: 0
    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
+      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
      flags: 0
    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
      flags: 0
    RecentlyUsedScenePath-7:
      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0