修改bug

.run/Attach to Unity Editor.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
+    <option name="allowRunningInParallel" value="false" />
+    <option name="listenPortForConnections" value="true" />
+    <option name="pid" />
+    <option name="projectPathOnTarget" />
+    <option name="selectedOptions">
+      <list />
+    </option>
+    <method v="2" />
+  </configuration>
+</component>

Assets/Res/UI/MainUIPanel.prefab

@@ -1327,7 +1327,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.5948264, b: 0.28743994, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4944,6 +4944,7 @@ GameObject:
   - component: {fileID: 1279285108081358348}
   - component: {fileID: 9085850810200614516}
   - component: {fileID: 3544557126014929307}
+  - component: {fileID: 4538825450821745528}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_battleBoss
@@ -4961,7 +4962,7 @@ RectTransform:
   m_GameObject: {fileID: 7986147013045357034}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.3760215, y: 1.3584535, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9027166607806413225}
@@ -5062,6 +5063,98 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+--- !u!114 &4538825450821745528
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986147013045357034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 1
+  isUpdate: 1
+  currTime: 79.7119
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 1
+    allTargets:
+    - {fileID: 6765399326918870433}
+    - {fileID: 1737129633691571213}
+    TweenAssetInfo: {fileID: 11400000, guid: d59a9c4d5b48504409526aac5f494a32, type: 2}
+    TargetFoldout: 1
+    maxDuration: 1
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
 --- !u!1 &8160896584844719095
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAnimRes/TweenAssetInfoButton_battleBoss.asset

@@ -0,0 +1,192 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoButton_battleBoss
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 1
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 1
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 2
+        TweenLerpType: 1
+        Start: {x: 1, y: 1, z: 1}
+        End: {x: 0, y: 0, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 1.3836447
+            outSlope: 1.3836447
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.07438017
+          - serializedVersion: 3
+            time: 0.50416666
+            value: 1.5
+            inSlope: -0.008333892
+            outSlope: -0.008333892
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -1.3121765
+            outSlope: -1.3121765
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0.09243701
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 1
+            outSlope: 1
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.5
+            value: 1.5
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -1
+            outSlope: -1
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 1
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 1
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+  - Foldout: 1
+    TweenType: 2
+    duration: 1
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 1
+      duration: 1
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 1, g: 1, b: 1, a: 1}
+      endColor: {r: 1, g: 0.4313832, b: 0, a: 1}
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 2.0168066
+          outSlope: 2.0168066
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 0.49583334
+          value: 1
+          inSlope: 0.016667783
+          outSlope: 0.016667783
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 0
+          inSlope: -1.983471
+          outSlope: -1.983471
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4

Assets/Res/UIAnimRes/TweenAssetInfoButton_battleBoss.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W38W5CP+Vy8mWarFCX4EDpb4pwvOulCapdEizqzbnpj+BFKuKfR9I+k=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoHeroUpTxtEft.asset

@@ -135,6 +135,19 @@ MonoBehaviour:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
   - Foldout: 1
     TweenType: 1
     duration: 0.5
@@ -177,3 +190,71 @@ MonoBehaviour:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+  - Foldout: 1
+    TweenType: 2
+    duration: 0.3
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0.3
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0.3
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 1
+      duration: 0.3
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 1, b: 0.16342616, a: 1}
+      endColor: {r: 1, g: 0.7866018, b: 0, a: 1}
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 2
+          outSlope: 2
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4

Assets/Scripts/Core/Audio/AudioBundleInfo.cs

@@ -6,28 +6,35 @@ namespace Core.Audio
 {
     public class AudioBundleInfo : IDisposable
     {
-
         private string _audioClipName;
         public float _volume;
 
+        public AssetHandle _audioClip;
+        
         public AudioBundleInfo(string audioClipName, float volume)
         {
             _audioClipName = audioClipName;
-            _volume=volume;
+            _volume = volume;
         }
 
         public async CTask<AssetHandle> GetAudioClip()
         {
+            if (_audioClip == null)
+            {
+                _audioClip = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<AudioClip>(_audioClipName);
+            }
 
-            AssetHandle _audioClip = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<AudioClip>(_audioClipName);
             return _audioClip;
         }
 
 
-
         public void Dispose()
         {
-
+            if (_audioClip != null)
+            {
+                _audioClip.Release();
+                _audioClip = null;
+            }
         }
     }
 }

Assets/Scripts/Core/Audio/AudioManager.cs

@@ -69,6 +69,23 @@ namespace Core.Audio
             await cTaskAwaitBuffer.WaitAll();
         }
 
+        public void RemoveAudio(AudionSettingConfig audionSettingConfig)
+        {
+            for (int i = 0; i < audionSettingConfig.configs.Count; i++)
+            {
+                AudionSettingConfig.AudionConfig audionConfig = audionSettingConfig.configs[i];
+                if (_allAduionBundleInfos.TryGetValue(audionConfig.audionClipName, out AudioBundleInfo abi))
+                {
+                    if (_currPlayAudio.TryGetValue(audionConfig.audionClipName, out AudioSourcePool audioSourcePool))
+                    {
+                        audioSourcePool.Finish();
+                    }
+                    abi.Dispose();
+                    _allAduionBundleInfos.Remove(audionConfig.audionClipName);
+                }
+            }
+        }
+
         public async CTask LoadAudio(AudionSettingConfig.AudionConfig audionConfig)
         {
             await GetAduionBundleInfo(audionConfig.audionClipName, audionConfig.volume);
@@ -224,8 +241,6 @@ namespace Core.Audio
                 _currPlayAudio[audionName] = audioSourcePool;
                 return audioSourcePool;
             }
-
-           
         }
 
         public void Play(string audionName, bool isLoop)

Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -11,7 +11,7 @@ namespace Core.Audio
         private TimerEntity _timerEntity;
 
 
-        private AssetHandle _assetHandle;
+        // private AssetHandle _assetHandle;
         public bool IsPlay;
 
         public System.Action OnFinish;
@@ -36,15 +36,15 @@ namespace Core.Audio
                 return;
             }
 
-            if (_assetHandle != null)
-            {
-                _assetHandle.Release();
-            }
+            // if (_assetHandle != null)
+            // {
+            //     _assetHandle.Release();
+            // }
 
             IsPlay = true;
             _currPlayName = audioName;
-            _assetHandle = audioClip;
-            _audioSource.clip = _assetHandle.AssetObject<AudioClip>();
+            // _assetHandle = audioClip;
+            _audioSource.clip = audioClip.AssetObject<AudioClip>();
             _audioSource.loop = isLoop;
             _audioSource.pitch = speed;
             _audioSource.volume = volume;
@@ -96,10 +96,7 @@ namespace Core.Audio
 
         public void Dispose()
         {
-            if (_assetHandle != null)
-            {
-                _assetHandle.Release();
-            }
+         
         }
     }
 }

Assets/Scripts/Core/Editor/Tween/UITweenControllerInspector.cs

@@ -39,11 +39,23 @@ public class UITweenControllerInspector : Editor
             EditorUtility.SetDirty(_uiTweenController.gameObject);
         }
 
-        if (GUILayout.Button("播放"))
+        if (_uiTweenController.isUpdate)
         {
-            _uiTweenController.StartPlay();
+            if (GUILayout.Button("暂停"))
+            {
+                _uiTweenController.Stop();
+            }
+        }
+        else
+        {
+            if (GUILayout.Button("播放"))
+            {
+                _uiTweenController.StartPlay();
+            }
         }
 
+    
+
         EditorGUILayout.EndHorizontal();
         for (int i = 0; i < _uiTweenController.GrpupInfos.Count; i++)
         {
@@ -95,6 +107,13 @@ public class UITweenControllerInspector : Editor
         EditorGUILayout.EndHorizontal();
         EditorGUILayout.BeginHorizontal();
         _tweenAssetGrpupInfo.isActive = EditorGUILayout.Toggle("是否激活", _tweenAssetGrpupInfo.isActive);
+        _tweenAssetGrpupInfo.isLoop = EditorGUILayout.Toggle("是否循环", _tweenAssetGrpupInfo.isLoop);
+        Color color2 = GUI.color;
+        if (!_tweenAssetGrpupInfo.isActive)
+        {
+            GUI.color = new Color(0.24f, 0.03f, 0.06f);
+        }
+
         _tweenAssetGrpupInfo.animName = EditorGUILayout.TextField("片段名", _tweenAssetGrpupInfo.animName);
         EditorGUILayout.EndHorizontal();
         if (_tweenAssetGrpupInfo.TweenAssetInfo == null)
@@ -168,6 +187,7 @@ public class UITweenControllerInspector : Editor
             EditorUtility.SetDirty(_uiTweenController.gameObject);
             // AssetDatabase.SaveAssets();
         }
+        GUI.color=color2;
     }
 
     private void DrawTweenEntity(TweenAssetGrpupInfo _tweenAssetGrpupInfo, TweenEntity tweenEntity, Object ob,

Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs

@@ -9,6 +9,7 @@ namespace Core.UI.UTool.UITween
         [HideInInspector] public bool Foldout;
         public bool isActive;
         public string animName;
+        public bool isLoop;
         public List<Object> allTargets = new List<Object>();
 
         public TweenAssetInfo TweenAssetInfo;
@@ -20,9 +21,6 @@ namespace Core.UI.UTool.UITween
         // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
 
 
-
-
-
         public void StartPlay()
         {
             if (TweenAssetInfo == null)
@@ -71,6 +69,7 @@ namespace Core.UI.UTool.UITween
             {
                 return;
             }
+
             for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
             {
                 TweenAssetInfo.allTweenInfo[i].Prepare();
@@ -86,12 +85,16 @@ namespace Core.UI.UTool.UITween
             {
                 return;
             }
+
+            if (isLoop)
+            {
+                t %= maxDuration;
+            }
+
             for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
             {
                 TweenAssetInfo.allTweenInfo[i].Play(allTargets[i], t, isFallBack);
             }
         }
-
-      
     }
 }

Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -9,7 +9,6 @@ namespace Core.UI.UTool.UITween
     [ExecuteInEditMode]
     public class UITweenController : MonoBehaviour
     {
-        
         public float maxDuration;
         public bool isUpdate;
         [HideInInspector] public float currTime;
@@ -18,7 +17,11 @@ namespace Core.UI.UTool.UITween
 
 
         private BetterList<TweenAssetGrpupInfo> _currPlay = new BetterList<TweenAssetGrpupInfo>();
-       public ParticleSystem.MinMaxGradient MinMaxGradient = new ParticleSystem.MinMaxGradient();
+        public ParticleSystem.MinMaxGradient MinMaxGradient = new ParticleSystem.MinMaxGradient();
+
+
+        private bool isLoop;
+
         private void OnEnable()
         {
             if (Application.isPlaying)
@@ -26,6 +29,7 @@ namespace Core.UI.UTool.UITween
                 StartPlay();
             }
         }
+
         public void Play(string animName)
         {
             _currPlay.Clear();
@@ -39,10 +43,16 @@ namespace Core.UI.UTool.UITween
             }
         }
 
+        public void Stop()
+        {
+            isUpdate = false;
+        }
+
         public void StartPlay()
         {
             maxDuration = 0;
             _currPlay.Clear();
+            isLoop = false;
             for (int i = 0; i < GrpupInfos.Count; i++)
             {
                 TweenAssetGrpupInfo tweenAssetGrpupInfo = GrpupInfos[i];
@@ -54,6 +64,11 @@ namespace Core.UI.UTool.UITween
                         maxDuration = tweenAssetGrpupInfo.maxDuration;
                     }
 
+                    if (tweenAssetGrpupInfo.isLoop)
+                    {
+                        isLoop = true;
+                    }
+
                     tweenAssetGrpupInfo.StartPlay();
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
@@ -112,7 +127,8 @@ namespace Core.UI.UTool.UITween
             {
                 _currPlay[i].PlayTween(currTime, false);
             }
-            if (currTime >= maxDuration)
+
+            if (!isLoop&&currTime >= maxDuration)
             {
                 isUpdate = false;
             }

Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs

@@ -6,6 +6,7 @@ using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
+using WeChatWASM;
 
 namespace GameLogic.Combat.CombatType
 {
@@ -53,6 +54,13 @@ namespace GameLogic.Combat.CombatType
 
         protected void FindNextConfig()
         {
+#if UNITY_WEIXINMINIGAME&&!UNITY_EDITOR
+            WX.TriggerGC();
+#else
+           
+#endif
+            System.GC.Collect();
+           
             allWinNodeCount++;
             isActiveCombat = false;
             if (_currIndex >= _combatScenesConfig.allNodeConfig.Length)

Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -146,13 +146,22 @@ public class CombatAIBasic : IDisposable
         stateControl.AddState(CombatHeroStateType.Resurrection, new CombatResurrectionState(_combatHeroEntity));
     }
 
-    public void ChangeState(string name, IStateEnterData iStateEnterData = null,bool isQiangZhi=false)
+    public void ChangeState(string name, IStateEnterData iStateEnterData = null, bool isQiangZhi = false)
     {
-        stateControl.ChangeState(name, iStateEnterData,isQiangZhi);
+        stateControl.ChangeState(name, iStateEnterData, isQiangZhi);
     }
 
     public void Update(float t)
     {
+        if (CombatController.currActiveCombat.isStopAi)
+        {
+            if (stateControl.CurrStateName.Equals(CombatHeroStateType.move))
+            {
+                stateControl.ChangeState(CombatHeroStateType.idle);
+            }
+            return;
+        }
+
         for (int i = 0; i < _areaList.Count; i++)
         {
             if (!_areaList[i].activeSelf)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -173,10 +173,10 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
 
     public void Update(float t)
     {
-        if (!CombatController.currActiveCombat.isStopAi)
-        {
+        // if (!CombatController.currActiveCombat.isStopAi)
+        // {
             CombatAIBasic.Update(t);
-        }
+        // }
 
         CombatHeroSkillControl.Update(t);
         combatHeroTimeLineControl.Update(t);

Assets/Scripts/GameUI/UI/HeroHpWidget.cs

@@ -115,6 +115,7 @@ namespace Fort23.Mono
             bg.anchoredPosition = new Vector2(-size / 2, 0);
             hp.rectTransform.anchoredPosition = new Vector2(-size / 2, 0);
             UpdateHp();
+            Update();
         }
 
         private void Update()

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -151,12 +151,14 @@ namespace Fort23.Mono
 
             LevelBattleCombatType levelBattleCombatType =
                 CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            
             float bl = (levelBattleCombatType.exp * 1.0f) / levelBattleCombatType.CurrMaxExp;
             exp.value = bl;
             TextExp.text = levelBattleCombatType.exp + "/" + levelBattleCombatType.CurrMaxExp;
             if (levelBattleCombatType.exp >= levelBattleCombatType.CurrMaxExp) // 到达目标值，开始打boss
             {
-                if (AccountFileInfo.Instance.playerData.isAllHeroDie)
+                
+                if (!levelBattleCombatType.isBossCombat&&AccountFileInfo.Instance.playerData.isAllHeroDie)
                 {
                     Button_battleBoss.gameObject.SetActive(true);
                 }

Packages/manifest.json

@@ -19,6 +19,7 @@
     "com.unity.ide.rider": "3.0.31",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
+    "com.unity.memoryprofiler": "1.1.1",
     "com.unity.purchasing": "4.11.0",
     "com.unity.render-pipelines.universal": "14.0.11",
     "com.unity.test-framework": "1.1.33",

Packages/packages-lock.json

@@ -211,6 +211,13 @@
       "dependencies": {},
       "url": "https://packages.tuanjie.cn"
     },
+    "com.unity.editorcoroutines": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.tuanjie.cn"
+    },
     "com.unity.entities": {
       "version": "1.0.16",
       "depth": 0,
@@ -295,6 +302,15 @@
       "dependencies": {},
       "url": "https://packages.tuanjie.cn"
     },
+    "com.unity.memoryprofiler": {
+      "version": "1.1.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.editorcoroutines": "1.0.0"
+      },
+      "url": "https://packages.tuanjie.cn"
+    },
     "com.unity.nuget.mono-cecil": {
       "version": "1.11.4",
       "depth": 1,

ProjectSettings/ProjectSettings.asset

@@ -821,7 +821,7 @@ PlayerSettings:
     -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s TOTAL_MEMORY=256MB -s EXPORTED_RUNTIME_METHODS=''["ccall","cwrap","stackTrace","addRunDependency","removeRunDependency","FS_createPath","FS_createDataFile","stackTrace","writeStackCookie","checkStackCookie","lengthBytesUTF8","stringToUTF8"]''
     --profiling-funcs '
   weixinMiniGameModulesDirectory: 
-  weixinMiniGameTemplate: PATH:D:\unityProject\XY001\Library\PackageCache\com.qq.weixin.minigame@65b7e86611\WebGLTemplates\WXTemplate2022TJ
+  weixinMiniGameTemplate: APPLICATION:Default
   weixinMiniGameAnalyzeBuildSize: 0
   weixinMiniGameUseEmbeddedResources: 0
   weixinMiniGameCompressionFormat: 2

UserSettings/Layouts/default-2022.dwlt

@@ -17,9 +17,9 @@ MonoBehaviour:
     x: 0
     y: 43
     width: 2560
-    height: 1357
+    height: 1349
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Inspector
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -39,15 +39,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1404
+    x: 1783
     y: 0
-    width: 482
-    height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 22}
+    width: 285
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &3
@@ -65,15 +65,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 827
+    x: 1143
     y: 0
-    width: 577
-    height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 21}
+    width: 640
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &4
@@ -92,14 +92,14 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 870
-    width: 627
-    height: 437
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+    y: 865
+    width: 609
+    height: 434
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
@@ -123,7 +123,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 2560
-    height: 1357
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -176,11 +176,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 2560
-    height: 1307
+    height: 1299
   m_MinSize: {x: 600, y: 100}
   m_MaxSize: {x: 48576, y: 16192}
   vertical: 0
-  controlID: 211
+  controlID: 195
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -198,7 +198,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337
+    y: 1329
     width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -222,8 +222,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 627
-    height: 1307
+    width: 609
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
@@ -244,15 +244,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 627
+    x: 609
     y: 0
-    width: 100
-    height: 1307
+    width: 271
+    height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
@@ -270,15 +270,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 727
+    x: 880
     y: 0
-    width: 100
-    height: 1307
+    width: 263
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &12
@@ -296,15 +296,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1886
+    x: 2068
     y: 0
-    width: 674
-    height: 1307
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+    width: 492
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &13
@@ -317,68 +317,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: TransitionLibraryWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 627
-    height: 870
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 609
+    height: 865
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 16}
   - {fileID: 15}
   - {fileID: 14}
-  m_Selected: 2
-  m_LastSelected: 2
+  m_Selected: 1
+  m_LastSelected: 1
 --- !u!114 &14
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Timeline
-    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 73
-    width: 626
-    height: 849
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_Preferences:
-    editType: 0
-    timeReferenceMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_SequenceHierarchy: {fileID: 0}
-  m_SequencePath:
-    m_SelectionRoot: 0
-    m_SubElements: []
---- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -400,8 +356,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 1188
-    height: 641
+    width: 608
+    height: 844
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -508,7 +464,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &16
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -646,7 +602,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &17
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -667,9 +623,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 943
-    width: 626
-    height: 416
+    y: 938
+    width: 608
+    height: 413
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -680,7 +636,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &18
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -700,10 +656,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 627
+    x: 609
     y: 73
-    width: 98
-    height: 1286
+    width: 269
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -717,23 +673,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: e2a60000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 66faffff
+      m_ExpandedIDs: 926ffeffa06ffeffc2f8ffff7aac0000aaac0000beac0000caac0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: PanelBG
-        m_OriginalName: PanelBG
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 77068
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 10}
       m_SearchString: 
@@ -743,7 +699,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &19
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -763,10 +719,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1886
+    x: 2068
     y: 73
-    width: 673
-    height: 1286
+    width: 491
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -784,13 +740,13 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 545
+  m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &20
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -810,10 +766,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 727
+    x: 880
     y: 73
-    width: 98
-    height: 1286
+    width: 261
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -835,7 +791,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI
+    - Packages/com.unity.render-pipelines.core
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -843,16 +799,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI
+  - Packages/com.unity.render-pipelines.core
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
+  m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: c0c90000
-    m_LastClickedID: 51648
-    m_ExpandedIDs: 000000007ca300007ea3000080a3000082a3000084a3000086a3000088a300008aa300008ca300008ea3000090a3000092a3000094a3000096a3000098a300009aa300009ca300009ea30000a0a30000a2a30000a4a30000a8a30000aaa30000aca30000aea30000b0a3000010a6000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 360}
+    m_SelectedIDs: 84b10000
+    m_LastClickedID: 45444
+    m_ExpandedIDs: 00000000baad0000bcad0000bead0000c0ad0000c2ad0000c4ad0000c6ad0000c8ad0000caad0000ccad0000cead0000d0ad0000d2ad0000d4ad0000d6ad0000d8ad0000daad0000dcad0000dead0000e0ad0000e2ad0000e4ad0000e6ad0000e8ad0000eaad0000ecad0000eead0000f0ad0000f2ad0000f4ad0000f6ad0000f8ad0000faad0000fcad0000fead000000ae000002ae000004ae000006ae000008ae00000aae00000cae00000eae000010ae000012ae000014ae00001aae00001cae00001eae000020ae000022ae000024ae000026ae000028ae00002aae00002cae00002eae000030ae000032ae000034ae000036ae00008eb0000094b0000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -880,7 +836,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000007ca300007ea3000080a3000082a3000084a3000086a3000088a300008aa300008ca300008ea3000090a3000092a3000094a3000096a3000098a300009aa300009ca300009ea30000a0a30000a2a30000a4a30000a6a30000a8a30000aaa30000aca30000aea30000b0a30000
+    m_ExpandedIDs: 00000000b8ad0000baad0000bcad0000bead0000c0ad0000c2ad0000c4ad0000c6ad0000c8ad0000caad0000ccad0000cead0000d0ad0000d2ad0000d4ad0000d6ad0000d8ad0000daad0000dcad0000dead0000e0ad0000e2ad0000e4ad0000e6ad0000e8ad0000eaad0000ecad0000eead0000f0ad0000f2ad0000f4ad0000f6ad0000f8ad0000faad0000fcad0000fead000000ae000002ae000004ae000006ae000008ae00000aae00000cae00000eae000010ae000012ae000014ae000016ae000018ae00001aae00001cae00001eae000020ae000022ae000024ae000026ae000028ae00002aae00002cae00002eae000030ae000032ae000034ae000036ae0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -907,19 +863,19 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a3000024350100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: HeroDetailPanel
-      m_OriginalName: HeroDetailPanel
+      m_Name: HeroUpTxtEft
+      m_OriginalName: HeroUpTxtEft
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 42722
+      m_UserData: 25642
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -935,8 +891,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 50
---- !u!114 &21
+  m_DirectoriesAreaWidth: 160
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -956,10 +912,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 827
+    x: 1143
     y: 73
-    width: 575
-    height: 1286
+    width: 638
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1012,29 +968,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 575
-      height: 1265
-    m_Scale: {x: 0.76666665, y: 0.76666665}
-    m_Translation: {x: 287.5, y: 632.5}
+      width: 638
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 319, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -375
-      y: -825
-      width: 750
-      height: 1650
+      x: -412.13684
+      y: -812
+      width: 824.2737
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.76666665
-  m_LastWindowPixelSize: {x: 575, y: 1286}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 638, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &22
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1054,10 +1010,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1404
+    x: 1783
     y: 73
-    width: 480
-    height: 1286
+    width: 283
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1072,9 +1028,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -174, y: -26}
+      snapOffset: {x: 0, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 2
       id: Tool Settings
       index: 0
       layout: 1
@@ -1150,9 +1106,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -111, y: 25}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 1
+      snapCorner: 0
       id: Orientation
       index: 0
       layout: 4
@@ -1424,14 +1380,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 375, y: 812, z: 0}
+    m_Target: {x: 331.95618, y: 575.0768, z: -3.1029794}
     speed: 2
-    m_Value: {x: 375, y: 812, z: 0}
+    m_Value: {x: 331.95618, y: 575.0768, z: -3.1029794}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1477,17 +1433,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.2959024, y: -0.15921102, z: 0.05009006, w: 0.9405246}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0.29590213, y: -0.15921088, z: 0.05009001, w: 0.9405237}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 894.40985
+    m_Target: 381.0088
     speed: 2
-    m_Value: 894.40985
+    m_Value: 381.0088
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -1503,7 +1459,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.2959024, y: -0.15921102, z: 0.05009006, w: 0.9405246}
+  m_LastSceneViewRotation: {x: -0.028795317, y: 0.025754577, z: -0.00096015766, w: -0.99937713}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: