4.2（已合并）

合并分支

Assets/CGs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23330c0bcd9d4534fb30c187968d32cc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CGs/cg2.mp4.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 0b064041d7d08df45af2dcadfbddf5d8
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CGs/新建渲染器纹理.renderTexture

@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u65B0\u5EFA\u6E32\u67D3\u5668\u7EB9\u7406"
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 3
+  m_Width: 1920
+  m_Height: 1080
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthFormat: 2
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

Assets/CGs/新建渲染器纹理.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6d9157ca3fda02247bf6b0c548c30450
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/勍/InteractTest.unity

@@ -149,7 +149,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5352854}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -8.47, y: 0.4, z: 0}
+  m_LocalPosition: {x: -8.83, y: 0.4, z: 0}
   m_LocalScale: {x: 1.54, y: 1.54, z: 1.26}
   m_Children: []
   m_Father: {fileID: 288199589}
@@ -246,7 +246,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 15582731}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 7.623, y: 0, z: 0}
+  m_LocalPosition: {x: 7.9469995, y: 0, z: 0}
   m_LocalScale: {x: 0.66, y: 0.66, z: 0.66}
   m_Children: []
   m_Father: {fileID: 2122669497}
@@ -739,7 +739,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 226789349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10}
+  m_LocalPosition: {x: 8.83, y: 0.34000003, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -1889,7 +1889,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 661209885}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 6.7760005, y: 0, z: 0}
+  m_LocalPosition: {x: 7.064, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2122669497}
@@ -2045,7 +2045,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 781772278}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10}
+  m_LocalPosition: {x: 8.83, y: 0.34000003, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 903864635}
@@ -2154,6 +2154,7 @@ MonoBehaviour:
   P1Pos: {fileID: 1800855454}
   P2Pos: {fileID: 29782801}
   offset: {x: 2.5, y: 2.5}
+  end: 0
 --- !u!1 &900617625
 GameObject:
   m_ObjectHideFlags: 0
@@ -3027,7 +3028,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1449312143}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.235, y: 0, z: 0}
+  m_LocalPosition: {x: 4.415, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2122669497}
@@ -3127,6 +3128,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d9222d1d92d354f43bf3ecf3ad5f5e68, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  currentConversation: {fileID: 0}
 --- !u!4 &1473915067
 Transform:
   m_ObjectHideFlags: 0
@@ -3194,6 +3196,7 @@ MonoBehaviour:
   P1Pos: {fileID: 1800855454}
   P2Pos: {fileID: 29782801}
   offset: {x: 2.5, y: 2.5}
+  end: 0
 --- !u!1 &1558198558
 GameObject:
   m_ObjectHideFlags: 0
@@ -3554,6 +3557,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e1b2323b7275ad44c94037be9f2ccec3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_event: {fileID: 0}
+  m_stage: {fileID: 0}
   neededType: 2
   state: 1
 --- !u!212 &1750262985
@@ -3756,7 +3761,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1800855449}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 8.47, y: -1.66, z: 0}
+  m_LocalPosition: {x: 8.83, y: -1.66, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 470232330}
@@ -3988,7 +3993,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1918365588}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.6940001, y: 0, z: 0}
+  m_LocalPosition: {x: 1.766, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2122669497}

Assets/Scripts/勍/事件型工具/EntryTrigger.cs

@@ -8,6 +8,8 @@ using UnityEngine;
 public class EntryTrigger : Event
 {
     private Collider2D m_collider;
+    public Event m_event;
+    public Stage m_stage;
 
     void Start()
     {
@@ -28,4 +30,13 @@ public class EntryTrigger : Event
         //如果玩家进入碰撞盒则触发事件
         if(other.TryGetComponent<Player>(out Player player)) OnCall();
     }
+
+    public override void OnCall()
+    {
+        //如果链接了事件或者演出，则执行
+        if(m_event != null) m_event.OnCall();
+        if(m_stage != null) m_stage.OnCall();
+        //如果二者都为null，则报告
+        if(m_event == null && m_stage == null) Debug.Log(this.GetType() + gameObject.name + "没有链接事件或者演出，你确定吗？");
+    }
 }

Assets/Scripts/勍/对话框架/AConversation.cs

@@ -23,6 +23,7 @@ public class AConversation : MonoBehaviour
     public Transform P2Pos;
     [Header("对话框到说话者中心的偏移量")]
     public Vector2 offset = new Vector2(3.5f, 2.5f);
+    public bool end = false;
 
 
 
@@ -125,6 +126,7 @@ public class AConversation : MonoBehaviour
     /// </summary>
     public virtual void OnEnd()
     {
+        end = true;
         //不在演出中时，恢复玩家的操作权限
         if(!ConversationController.Instance.CheckStage())
             player.ToMap("Normal");

Assets/Scripts/勍/对话框架/ConversationController.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 public class ConversationController : UnitySingleton<ConversationController>
 {
     private AConversation[] conversationList;
+    public AConversation currentConversation;
 
     void Start()
     {
@@ -19,6 +20,7 @@ public class ConversationController : UnitySingleton<ConversationController>
             if (conversation.conversationName == name)
             {
                 Debug.Log("找到对话：" + name);
+                currentConversation = conversation;
                 conversation.OnCall();
                 //改变玩家地图至Null
                 FindObjectOfType<Player>().ToMap("Null");

Assets/Scripts/勍/播片系统/CGAdministrator.cs

@@ -1,94 +1,77 @@
-// using System.Collections;
+using System.Collections;
-// using System.Collections.Generic;
+using System.Collections.Generic;
-// using UnityEngine;
+using UnityEngine;
-// using UnityEngine.UI;
+using UnityEngine.UI;
-// using UnityEditor;
+using UnityEditor;
-// using UnityEngine.Video;
+using UnityEngine.Video;
-// using UnityEngine.InputSystem;
+using UnityEngine.InputSystem;
 
-// public class CGAdministrator : MonoBehaviour
+public class CGAdministrator : UnitySingleton<CGAdministrator>
-// {
+{
-//     // Start is called before the first frame update
+    // Start is called before the first frame update
-//     //CG管理员相关代码
+    //CG管理员相关代码
 
-//     private RawImage rawImage;
+    private RawImage rawImage;
-//     [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField]
+    [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField]
-//     private ACG[] CGs;
+    private ACG[] CGs;
-//     private IndexRecoder indexRecoder;
+    private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在
-//     private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在
+    void Start()
-//     void Start()
+    {
-//     {
+        rawImage = GetComponent<RawImage>();
-//         rawImage = GetComponent<RawImage>();
+        rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？
-//         indexRecoder = FindObjectOfType<IndexRecoder>();
+        //把rawImage的颜色的透明度变为0
-//         rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？
+        //rawImage.color = new Color(rawImage.color.r, rawImage.color.g, rawImage.color.b, 1);
-
+    
-//         //好像可以让它自己找到所有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名
+        //好像可以让它自己找到所有CG
-//     public　void　CallACG(string CGName)
+        CGs = new ACG[transform.childCount];
-//     {
+        for(int i = 0; i < transform.childCount; i++)
-//         //当外面叫了一个CG，传入CG名
+        {
-//         foreach(ACG CG in CGs)
+            CGs[i] = transform.GetChild(i).GetComponent<ACG>();
-//         {
+        }
-//             //找到这个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
+        //CallACG("鸟");
-//                           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)
+    //外部呼叫CG用，传入你要调用的CG名
-//     //     {
+    public　void　CallACG(string CGName)
-//     //         GUI.enabled = false;
+    {
-//     //         EditorGUI.PropertyField(position, property, label, true);
+        //当外面叫了一个CG，传入CG名
-//     //         GUI.enabled = true;
+        foreach(ACG CG in CGs)
-//     //     }
+        {
-//     // }
+            //找到这个CG
-//     // //
+            if(CG.CGName.Equals(CGName))
+            {
+                Debug.Log("正在显示CG："+CG.name);
+                rawImage.texture = CG.texture;//把CG的内容装载上
+                rawImage.CrossFadeAlpha(1,1f,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,1f,true);//淡出CG
+                          playingCG.OnEnded();}//告诉这个CG它结束了，然后触发它的结束事件
+
+    public float GetPlayingCGTime()
+    {
+        return playingCG.time;
+    }
+
+}

Assets/Scripts/勍/演出/FengHuang.cs

@@ -0,0 +1,52 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+
+public class FengHuang : Stage
+{
+    public GameObject yufu;
+    protected override IEnumerator Main()
+    {
+        //呼出CG
+        CGAdministrator.Instance.CallACG("鸟");
+        //等待CG结束
+        yield return new WaitForSeconds(CGAdministrator.Instance.GetPlayingCGTime());
+        //再等待一秒
+        yield return new WaitForSeconds(1);
+        //淡入显示叶片
+        SpriteRenderer leaf = GameObject.Find("树叶").GetComponent<SpriteRenderer>();
+        leaf.DOFade(1, 1);
+        //等待一秒
+        yield return new WaitForSeconds(1);
+        //激活渔夫
+        yufu.SetActive(true);
+        //等待一秒后淡出树叶
+        yield return new WaitForSeconds(1);
+        leaf.DOFade(0, 1);
+        //等待一秒
+        yield return new WaitForSeconds(1);
+        //触发对话“渔夫之指引”
+        ConversationController.Instance.OnCall("渔夫之指引");
+        //等到对话结束
+        yield return new WaitUntil(() => ConversationController.Instance.currentConversation.end);
+        //渐隐渔夫
+        SpriteRenderer[] renderers = yufu.GetComponentsInChildren<SpriteRenderer>();
+        foreach (SpriteRenderer renderer in renderers)
+        {
+            renderer.DOFade(0, 1);
+        }
+        //一秒后删除渔夫
+        yield return new WaitForSeconds(1);
+        Destroy(yufu);
+        //结束
+        yield return base.Main();
+    }
+
+    protected override void OnEnd()
+    {
+        base.OnEnd();
+        //删除自己和父物体
+        Destroy(transform.parent.gameObject);     
+    }
+}

Assets/Scripts/勍/演出/FengHuang.cs.meta

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

Assets/Scripts/勍/演出/Stage.cs

@@ -21,6 +21,7 @@ public class Stage : MonoBehaviour
     [ContextMenu("Play")]
     public void OnCall()
     {
+        Debug.Log("演出" + gameObject.name + "开始");
         //初始化
         Init();
         //开始Main的协程

Assets/Scripts/勍/绳结/KnotMediator.cs

@@ -22,9 +22,20 @@ public class KnotMediator : UnitySingleton<KnotMediator>
     [Header("当前记录的绳结类型")][SerializeField][EnumPaging]
     private KnotType currentKnotType;
 
+    private Player player;
+
+    void Start(){
+        player = FindObjectOfType<Player>();
+    }
+
+
     public void RecordKnotType(KnotType knotType)
     {
         currentKnotType = knotType;
+        //让仓颉做出查看绳结的动作
+        player.StopInputTo(2f);
+        player.Behavior("查看绳结");
+
     }
 
     /// <summary>

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

@@ -150,4 +150,20 @@ public class PlayerControl : MonoBehaviour
         }
         
     }
+
+
+    /// <summary>
+    /// 接下来的time后，都无视输入事件
+    /// </summary>
+    public void StopInputTo(float time)
+    {
+        ToMap("Null");
+        StartCoroutine(RecoverInput(time));
+    }
+
+    private IEnumerator RecoverInput(float time)
+    {
+        yield return new WaitForSeconds(time);
+        ToMap("Normal");
+    }
 }

Assets/动画/cangjie 1.controller

@@ -171,6 +171,7 @@ AnimatorStateMachine:
   - {fileID: -5953479891427718110}
   - {fileID: 5947422655733057457}
   - {fileID: 3330679229323852168}
+  - {fileID: 2419438947098571967}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
@@ -189,7 +190,8 @@ AnimatorState:
   m_Name: "\u4ED3\u9889\u67E5\u770B\u7EF3\u7ED3"
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -3078475898699272913}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -205,6 +207,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-3078475898699272913
+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: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1622693631265719714
 AnimatorState:
   serializedVersion: 6
@@ -246,25 +270,31 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Move
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: "\u4E0E\u706B\u4EA4\u4E92"
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: "\u53D7\u4F24"
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: "\u67E5\u770B\u7EF3\u7ED3"
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -331,6 +361,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &2419438947098571967
+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: "\u67E5\u770B\u7EF3\u7ED3"
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5411793311571772822}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &3330679229323852168
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

Assets/动画/yufu 1.controller

@@ -59,16 +59,16 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -961979011199463194}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 290, y: 30, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7159605451625161076}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 460, y: 100, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 280, y: 190, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}

Assets/动画/仓颉查看绳结.anim

@@ -163,6 +163,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: 1.5166667
+        value: {x: 0, y: 0, z: -32.842}
+        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
@@ -204,6 +213,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: 1.5166667
+        value: {x: 0, y: 0, z: -148.609}
+        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
@@ -229,6 +247,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: 1.5166667
+        value: {x: 0, y: 0, z: 122.539}
+        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
@@ -254,6 +281,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: 1.5166667
+        value: {x: 0, y: 0, z: 31.891}
+        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
@@ -295,6 +331,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: 1.5166667
+        value: {x: 0, y: 0, z: 136.511}
+        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
@@ -320,6 +365,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: 1.5166667
+        value: {x: 0, y: 0, z: 87.25}
+        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
@@ -1258,7 +1312,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 1.5166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -2720,6 +2774,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -2748,6 +2811,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -2776,6 +2848,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: -32.842
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3089,6 +3170,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3117,6 +3207,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3145,6 +3244,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: -148.609
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3287,6 +3395,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3315,6 +3432,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3343,6 +3469,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: 122.539
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3485,6 +3620,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3513,6 +3657,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3541,6 +3694,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: 31.891
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -3854,6 +4016,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3882,6 +4053,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -3910,6 +4090,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: 136.511
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -4052,6 +4241,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -4080,6 +4278,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        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
@@ -4108,6 +4315,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5166667
+        value: 87.25
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -4591,7 +4807,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3
+    path: bone_1/bone_2/bone_3/bone_8
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4601,7 +4817,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3
+    path: bone_1/bone_2/bone_3/bone_8
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4611,7 +4827,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3
+    path: bone_1/bone_2/bone_3/bone_8
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4681,7 +4897,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
+    path: bone_1/bone_2/bone_3/bone_5/bone_6
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4691,7 +4907,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
+    path: bone_1/bone_2/bone_3/bone_5/bone_6
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4701,7 +4917,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
+    path: bone_1/bone_2/bone_3/bone_5/bone_6
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4711,7 +4927,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_8
+    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4721,7 +4937,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_8
+    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4731,7 +4947,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_8
+    path: bone_1/bone_2/bone_3/bone_5/bone_6/bone_7
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4771,7 +4987,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_5
+    path: bone_1/bone_2/bone_3
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4781,7 +4997,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_5
+    path: bone_1/bone_2/bone_3
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4791,7 +5007,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_5
+    path: bone_1/bone_2/bone_3
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4801,7 +5017,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: bone_1/bone_2/bone_3/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_5
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4811,7 +5027,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: bone_1/bone_2/bone_3/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_5
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -4821,7 +5037,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: bone_1/bone_2/bone_3/bone_5/bone_6
+    path: bone_1/bone_2/bone_3/bone_5
     classID: 4
     script: {fileID: 0}
   - curve:

Assets/美术素材/场景3/貔貅.png.meta

@@ -46,7 +46,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 300
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -75,6 +75,54 @@ TextureImporter:
     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: []

Logs/ApiUpdaterCheck.txt

@@ -172,21 +172,11 @@ 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)] 2022/4/2 21:10:15 : Starting D:/unity/Editor/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
 [api-updater (non-obsolete-error-filter)] 
 ----------------------------------
-jit/startup time      : 808.5839ms
+jit/startup time      : 250.8009ms
-moved types parse time: 54ms
+moved types parse time: 50ms
-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

ProjectSettings/ProjectSettings.asset

@@ -576,6 +576,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
     1: ODIN_INSPECTOR;ODIN_INSPECTOR_3
+    7: ODIN_INSPECTOR;ODIN_INSPECTOR_3
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: {}

UserSettings/EditorUserSettings.asset

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