紧急加修Bug，目前切换场景不会再出现操控问题

2022-04-06 19:26:35 +08:00 · 2022-04-06 19:26:35 +08:00 · 2d2d1aa827
commit 2d2d1aa827
parent e03afcd33c
11 changed files with 54 additions and 8005 deletions
--- a/Assets/Scenes/乐/Sample1.unity
+++ b/Assets/Scenes/乐/Sample1.unity
@ -262,7 +262,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 96574217}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 14.431048, y: -1.2, z: 0}
+  m_LocalPosition: {x: 13.49604, y: -1.2, z: 0}
  m_LocalScale: {x: 0.8524737, y: 1.1058197, z: 0.9215932}
  m_Children: []
  m_Father: {fileID: 0}
@ -666,6 +666,7 @@ MonoBehaviour:
  tree: {fileID: 1402772894}
  fire: {fileID: 1172569488}
  stone: {fileID: 521191130}
+  tiger: {fileID: 0}
 --- !u!1 &332443496
 GameObject:
  m_ObjectHideFlags: 0
@ -1122,7 +1123,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 447569230}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.9447613, y: -1.1173111, z: -10}
+  m_LocalPosition: {x: -12.6198, y: -1.1200354, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -1492,7 +1493,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 568882133}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 21.024761, y: -0.5, z: 0}
+  m_LocalPosition: {x: 25.699799, y: -0.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -1664,7 +1665,7 @@ Transform:
  m_PrefabAsset: {fileID: 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}
+  m_LocalPosition: {x: 7.1901, y: -1.61, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -2730,7 +2731,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1115045276}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.9447613, y: -2.1100001, z: 0}
+  m_LocalPosition: {x: -12.6198, y: -2.1100001, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -4013,7 +4014,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1867567306}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.9444447, y: -1.66, z: -10}
+  m_LocalPosition: {x: -15.864445, y: -2.82, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 927697135}
@ -9223,11 +9224,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -11.5
+      value: -19.42
      objectReference: {fileID: 0}
    - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.66
+      value: -2.82
      objectReference: {fileID: 0}
    - target: {fileID: 1020564151765312503, guid: db1a0d64e04264d4e840e4424bbf4488, type: 3}
      propertyPath: m_LocalPosition.z
--- a/Assets/Scenes/勍/InteractTest.unity
+++ b/Assets/Scenes/勍/InteractTest.unity
--- a/Assets/Scenes/勍/InteractTest.unity.meta
+++ b/Assets/Scenes/勍/InteractTest.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9d2abd5208f4caf4fb48d255afe4a1c8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/勍/场景3.unity
+++ b/Assets/Scenes/勍/场景3.unity
--- a/Assets/Scenes/勍/场景3.unity.meta
+++ b/Assets/Scenes/勍/场景3.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c66f1b9fc41abcc458c6343187572b43
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/勍/演出/FengHuang.cs
+++ b/Assets/Scripts/勍/演出/FengHuang.cs
@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using DG.Tweening;
+using UnityEngine.SceneManagement;

 public class FengHuang : Stage
 {
@ -39,6 +40,12 @@ public class FengHuang : Stage
        //一秒后删除渔夫
        yield return new WaitForSeconds(1);
        Destroy(yufu);
+        //等待3秒
+        yield return new WaitForSeconds(3);
+        //切换场景至sample1
+        player.DisPose();
+        Destroy(player);
+        SceneManager.LoadScene("Sample1");
        //结束
        yield return base.Main();
    }
--- a/Assets/Scripts/勍/演出/HuangdiConfused.cs
+++ b/Assets/Scripts/勍/演出/HuangdiConfused.cs
@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;

 public class HuangdiConfused : Stage
 {
@ -15,6 +16,12 @@ public class HuangdiConfused : Stage
        yield return new WaitForSeconds(9f);
        //标记黄帝状态为End
        FindObjectOfType<HuangDi>().state = HuangDi.HuangDiState.End;
+        // player.DisPose();
+        // Destroy(player);
+        //等待3秒
+        yield return new WaitForSeconds(3f);
+        //切换场景至造字台
+        SceneManager.LoadScene("造字台");
        //结束
        yield return base.Main();
    }
--- a/Assets/Scripts/勍/角色/PlayerControl.cs
+++ b/Assets/Scripts/勍/角色/PlayerControl.cs
@ -9,7 +9,7 @@ using Sirenix.OdinInspector;
 /// </summary>
 public class PlayerControl : MonoBehaviour
 {
-    private PlayerC playerC;
+    protected PlayerC playerC;

    /// <summary>
    /// 此帧输入方向，-1为左，1为右，0此帧不输入
@ -26,7 +26,6 @@ public class PlayerControl : MonoBehaviour

        playerC = new PlayerC();
        //playerC.Enable();
-        playerC.Normal.Enable();
        //为事件订阅方法
        //为移动操作订阅方法
        playerC.Normal.Move.performed += ctx => OnMove(ctx);
@ -41,6 +40,8 @@ public class PlayerControl : MonoBehaviour
        playerC.Normal.LeftChange.performed += ctx => OnLeftChange();
        //为右切换操作订阅方法
        playerC.Normal.RightChange.performed += ctx => OnRightChange();
+        playerC.Normal.Enable();
+       


        //给玩家物体添加子物体：互动侦察器
@ -172,5 +173,6 @@ public class PlayerControl : MonoBehaviour

    public void DisPose() {
        playerC.Dispose();
+        playerC = null;
    }
 }
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -5,9 +5,15 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: "Assets/Scenes/\u52A8\u753B\u5C55\u793A.unity"
    guid: 2cda990e2423bbf4892e6590ba056729
+  - enabled: 1
+    path: "Assets/Scenes/\u52CD/\u9EC4\u5E1D.unity"
+    guid: 9d2abd5208f4caf4fb48d255afe4a1c8
+  - enabled: 1
+    path: "Assets/Scenes/\u52CD/\u9020\u5B57\u53F0.unity"
+    guid: c66f1b9fc41abcc458c6343187572b43
  - enabled: 1
    path: "Assets/Scenes/\u4E50/Sample1.unity"
    guid: ee694e09c439ff94d836d965bd1d96de
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@ -4,7 +4,7 @@
 UnityConnectSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
  m_TestMode: 0
  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,34 +6,34 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
      flags: 0
    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
+      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
      flags: 0
    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
-      flags: 0
-    RecentlyUsedScenePath-7:
      value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
      flags: 0
-    RecentlyUsedScenePath-8:
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
+      flags: 0
+    RecentlyUsedScenePath-5:
      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
      flags: 0
+    RecentlyUsedScenePath-6:
+      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036cdafbfb5891caecadebc7a8c6cd7df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036cdafbfb5891f1c8adfecd633c133af6f9
+      flags: 0
    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357f67083debf42d
+      value: 22424703114646680e0b0227036cdafbfb5891f1c8adfecd633c133af6f9
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650