解决1.关卡进度一直是1/8，没有跟新2. 再来一局后，鼠标没有消失3.整合的游戏有更新4.鸟速度调整

Assets/DuckHunter/Scripts/GameManager.cs

@@ -206,7 +206,12 @@ namespace DuckHunter
             }
 
             duckConfig.type = _ductTypeList[0]; _ductTypeList.RemoveAt(0);
-            duckConfig.flySpeed = BaseFlySpeed * (1 + (level - 1) * 0.05f);
+
+
+            //duckConfig.flySpeed = BaseFlySpeed * (1 + (level - 1) * 0.05f);
+            //2023-7-21修改：所有关卡统一用之前第80关的速度
+            duckConfig.flySpeed = BaseFlySpeed * (1 + (80 - 1) * 0.05f);
+
             if (duckConfig.type == 1) duckConfig.flySpeed *= 1f;
             else if (duckConfig.type == 2) duckConfig.flySpeed *= 1.2f;
             else if (duckConfig.type == 3) duckConfig.flySpeed *= 1.5f;

Assets/WildAttack/Animation/Animators/ice_anim.controller

@@ -27,6 +27,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-8573195426062036831
+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: isAlive
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8946757228731582407}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8125
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-8171093950911625308
 AnimatorStateMachine:
   serializedVersion: 6
@@ -66,7 +91,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 4201431904937560579}
+  - {fileID: -8573195426062036831}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -135,7 +160,7 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1101 &3655383581137612095
+--- !u!1101 &626576330641242674
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -143,11 +168,11 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 1
+  - m_ConditionMode: 2
     m_ConditionEvent: isAlive
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -6034286169716286797}
+  m_DstState: {fileID: -8946757228731582407}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
@@ -155,12 +180,12 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.91847825
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &4201431904937560579
+--- !u!1101 &3655383581137612095
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,19 +193,19 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 2
+  - m_ConditionMode: 1
     m_ConditionEvent: isAlive
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -8946757228731582407}
+  m_DstState: {fileID: -6034286169716286797}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0.0027634029
-  m_ExitTime: 0.0069085653
-  m_HasExitTime: 0
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.91847825
+  m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -197,6 +222,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 3655383581137612095}
+  - {fileID: 626576330641242674}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/WildAttack/Scripts/StageProperty/Turret.cs

@@ -35,15 +35,15 @@ namespace WildAttack
             if (cdLimit > 0)
             {
                 cdLimit -= Time.deltaTime;
+            }
+            if (!allowRotate)
+            {
                 paocheTrans.localRotation = Quaternion.Lerp(paocheTrans.localRotation, Quaternion.Euler(Vector3.zero), 10 * Time.deltaTime);
 
             }
             else
             {
-                if (allowRotate)
-                {
-                    paocheTrans.rotation = Quaternion.Slerp(paocheTrans.rotation, Quaternion.LookRotation(new Vector3(EnemyManager.GetInstance().enemyList[currEnemyIndex].transform.position.x - paocheTrans.position.x, 0, EnemyManager.GetInstance().enemyList[currEnemyIndex].transform.position.z - paocheTrans.position.z)), 5.0f * Time.deltaTime);
-                }
+                paocheTrans.rotation = Quaternion.Slerp(paocheTrans.rotation, Quaternion.LookRotation(new Vector3(EnemyManager.GetInstance().enemyList[currEnemyIndex].transform.position.x - paocheTrans.position.x, 0, EnemyManager.GetInstance().enemyList[currEnemyIndex].transform.position.z - paocheTrans.position.z)), 5.0f * Time.deltaTime);
             }
             anim.SetBool("isAlive", cdLimit <= 0);
         }
@@ -65,6 +65,7 @@ namespace WildAttack
 
                 allowRotate = true;
                 StartCoroutine(ShootEnemys(EnemyManager.GetInstance().enemyList));
+                cdLimit = propData.cd;
 
                 // 根据敌人数量生成回旋镖
             }
@@ -88,7 +89,6 @@ namespace WildAttack
                 dart.GetComponent<Dart>().Init(propData, currEnemyIndex);
                 yield return new WaitForSeconds(0.8f);
             }
-            cdLimit = propData.cd;
             allowRotate = false;
         }
 
@@ -100,4 +100,4 @@ namespace WildAttack
         }
         #endregion
     }
-}
+}

Assets/WildAttack/Scripts/UI/GameOverPanel.cs

@@ -27,9 +27,17 @@ namespace WildAttack
         // Start is called before the first frame update
         void Start()
         {
-            SimulateMouseController.ins?.AddOpenLocker("NotGame");
             RegisterEvent();
         }
+
+        void OnEnable()
+        {
+            SimulateMouseController.ins?.AddOpenLocker(this);
+        }
+        void OnDisable()
+        {
+            SimulateMouseController.ins?.RemoveOpenLocker(this);
+        }
         #endregion
 
         #region ButtonClickEvent

Assets/WildAttack/Scripts/UI/MainPanel.cs

@@ -84,14 +84,14 @@ namespace WildAttack
         }
 
         // Update is called once per frame
-        //void Update()
-        //{
-        //    UpdateProcess();
-        //    //更新显示陀螺仪校准文本
-        //    UpdateCalibrateGyrText();
-        //    //更新显示地磁计校准文本
-        //    UpdateCalibrateMagText();
-        //}
+        void Update()
+        {
+            UpdateProcess();
+            ////更新显示陀螺仪校准文本
+            //UpdateCalibrateGyrText();
+            ////更新显示地磁计校准文本
+            //UpdateCalibrateMagText();
+        }
         #endregion
 
         #region ButtonClickEvent
@@ -349,14 +349,15 @@ namespace WildAttack
         //        text.text = $"<color=blue>自动校准中</color>({tip})";
         //    }
         //}
-        ///// <summary>
-        ///// 进度文字更新
-        ///// </summary>
-        //public void UpdateProcess()
-        //{
-        //    if (ProcessManager.GetInstance().CurrLevel <= 0) return;
-        //    _textProcess.text = $"{(ProcessManager.GetInstance().CurrLevel > ProcessModule.GetInstance().processDataDic.Count ? ProcessModule.GetInstance().processDataDic.Count : ProcessManager.GetInstance().CurrLevel)}/{ProcessModule.GetInstance().processDataDic.Count}";
-        //}
+
+        /// <summary>
+        /// 进度文字更新
+        /// </summary>
+        public void UpdateProcess()
+        {
+            if (ProcessManager.GetInstance().CurrLevel <= 0) return;
+            _textProcess.text = $"{(ProcessManager.GetInstance().CurrLevel > ProcessModule.GetInstance().processDataDic.Count ? ProcessModule.GetInstance().processDataDic.Count : ProcessManager.GetInstance().CurrLevel)}/{ProcessModule.GetInstance().processDataDic.Count}";
+        }
 
         public void SetProcessInfoActive(bool active)
         {