Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/Art/HeroTimeLine/Hero01.playable

@@ -381,7 +381,7 @@ MonoBehaviour:
   isNotRotate: 0
   isFollowRootTarget: 0
   isAttSpeed: 0
-  isLoop: 1
+  isLoop: 0
   loopAlone: 0
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0

Assets/Art/VFX/FXPrefabs/fx_hero01_dg_bo.prefab

@@ -26,7 +26,7 @@ Transform:
   m_GameObject: {fileID: 2833738854470651349}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.27}
+  m_LocalPosition: {x: 0, y: 0, z: 0.764}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:

Assets/Res/TimeLineAssets/Guaiwu02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xn5Jtnn7AnvEo4DuvUfQAr00ZYzVHoLLzkZmmwGnu0RAOWyI8AGmlZM=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DigasX+pBS8Pmrq8WY7dHYX30hbMsqOaV3NaCP75RLVIEdv6S9tFg1M=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CSsX5iykV3oXJE74R65qeBfaDEYq2IxV/Pt+Y9ELM9+UgdixSpWeyBs=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/MainUIPanel.prefab

@@ -4474,6 +4474,24 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: fx_ui_coin
+    gameObject: {fileID: 279761164283339340}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: fx_ui_exp
+    gameObject: {fileID: 8853248987449609378}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -5861,6 +5879,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 175316671113568741, guid: 7f5a9c9a7b322614fbce15a45e076f45, type: 3}
   m_PrefabInstance: {fileID: 2452642478988529376}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8853248987449609378 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6400888696406557250, guid: 7f5a9c9a7b322614fbce15a45e076f45, type: 3}
+  m_PrefabInstance: {fileID: 2452642478988529376}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8921375891265068935
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5965,6 +5988,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7125274397353084997, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8660124463567240651, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
       propertyPath: m_Name
       value: fx_ui_coin
@@ -5978,6 +6005,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+--- !u!1 &279761164283339340 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8660124463567240651, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+  m_PrefabInstance: {fileID: 8921375891265068935}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &3872687123469740126 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5652462218939348953, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}

Assets/Scripts/Core/UI/UTool/ImageMove.cs

@@ -14,12 +14,15 @@ public class ImageMove
     public ACurve currAcur;
     public float yanChi;
     private float currTime;
+
     public float speed;
+
     // public float showSizeSpeed;
     public bool isShowSize = true;
 
     public Vector3 moveTargetPos;
     public Vector3 moveStartPos;
+    public System.Action finishCallBack;
 
     public bool Update()
     {
@@ -66,7 +69,7 @@ public class ImageMove
         }
 
 
-        transform.anchoredPosition = currAcur.EvaluateForVector2(ms,ms);
+        transform.anchoredPosition = currAcur.EvaluateForVector2(ms, ms);
         float s = currTime;
         if (SizeCurve != null)
         {
@@ -79,6 +82,7 @@ public class ImageMove
 
         {
             currAcur.CurveInfos = null;
+            finishCallBack?.Invoke();
         }
 
         return false;

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

@@ -6,6 +6,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Combat.CombatTool;
 using GameLogic.CombatScenesTool;
 using GameLogic.Hero;
@@ -139,6 +140,7 @@ namespace GameLogic.Combat.CombatType
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
 
 
+            BagController.Instance.AddCoin(5);
             List<string> allEquip = new List<string>();
             for (int i = 0; i < 3; i++)
             {
@@ -161,6 +163,7 @@ namespace GameLogic.Combat.CombatType
             EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
 
             exp += 5;
+            BagController.Instance.AddHeroExp(10);
             CombatItemShowEventData expItemShow = CombatItemShowEventData.Create();
             expItemShow.count = Random.Range(3, 5);
             expItemShow.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
@@ -301,11 +304,11 @@ namespace GameLogic.Combat.CombatType
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             _currNodeWavesIndex++;
-            _currNodeWavesIndex %= _currWavesConfig.monsterGroupConfigId.Length;
-            int miniCount = _currWavesConfig.miniMonsterCount[_currNodeWavesIndex];
+           int nodeIndex= _currNodeWavesIndex % _currWavesConfig.monsterGroupConfigId.Length;
+            int miniCount = _currWavesConfig.miniMonsterCount[nodeIndex];
             MonsterGroupConfig monsterGroupConfig =
                 ConfigComponent.Instance.Get<MonsterGroupConfig>(
-                    _currWavesConfig.monsterGroupConfigId[_currNodeWavesIndex]);
+                    _currWavesConfig.monsterGroupConfigId[nodeIndex]);
             // count = 500;
             for (int i = 0; i < miniCount; i++)
             {
@@ -315,7 +318,7 @@ namespace GameLogic.Combat.CombatType
                 CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, index);
             }
 
-            int eliteCount = _currWavesConfig.eliteMonsterCount[_currNodeWavesIndex];
+            int eliteCount = _currWavesConfig.eliteMonsterCount[nodeIndex];
             for (int i = 0; i < eliteCount; i++)
             {
                 int index = i;
@@ -362,7 +365,7 @@ namespace GameLogic.Combat.CombatType
                 return;
             }
 
-            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length)
+            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length-1)
             {
                 _currTime += 0.016f;
                 if (_currTime > _currWavesConfig.wavesDelay)

Assets/Scripts/GameLogic/Combat/Skill/S10001.cs

@@ -13,6 +13,7 @@ namespace GameLogic.Combat.Skill
     {
         protected float _harm;
 
+        // protected 
         protected override void ProInitSkill()
         {
             _harm = 400;
@@ -36,6 +37,7 @@ namespace GameLogic.Combat.Skill
         {
             ActivationTimeLineData("sk1");
         }
+
         protected void Sk1_fasheTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData)
@@ -45,33 +47,37 @@ namespace GameLogic.Combat.Skill
             HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
                 v, AttType.Skill, triggerData);
         }
+
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData)
         {
             if (targetEntity.combatHeroEntity == CombatHeroEntity)
             {
+                Vector3 forward = new Vector3(0, 0, 1);
+                Vector3 eulerAngles = CombatHeroEntity.combatHeroGameObject.transform.eulerAngles;
+                Vector3 zdPos = CombatHeroEntity.GetSpecialDotInfo("zdpos").GetWorlPos();
                 for (int i = 0; i < 4; i++)
                 {
-                    Vector3 forward = CombatHeroEntity.combatHeroGameObject.transform.forward;
-                    Quaternion quaternion = Quaternion.AngleAxis(i * 90, Vector3.up);
+                    eulerAngles.y = i * 90;
+                    // Quaternion quaternion = Quaternion.AngleAxis(i * 90, Vector3.up);
                     // quaternion = quaternion + CombatHeroEntity.combatHeroGameObject.transform.rotation;
                     // Vector3 newAngle = new Vector3(eulerAngles.x, eulerAngles.y + i * 15+180, eulerAngles.z);
                     // Quaternion quaternion = Quaternion.Euler(newAngle);
-                    forward = quaternion * forward;
-                    Vector3 targetPos = CombatHeroEntity.combatHeroGameObject.transform.position + forward;
+                    Quaternion quaternion = Quaternion.Euler(eulerAngles);
+                    Vector3 newForward = quaternion * forward;
+                    Vector3 targetPos = zdPos + newForward;
                     ActivationTimeLineData("sk1_fashe", null, new Vector3[] { targetPos });
                 }
             }
             else
             {
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
                     _harm);
                 HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
                     v, AttType.Skill, triggerData);
             }
-
-           
         }
     }
 }

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -175,6 +175,28 @@ namespace Fort23.Mono
 	      return _txtHeroExp;
 	     }
 	   }
+	  private GameObject _fx_ui_coin;
+	  public GameObject fx_ui_coin
+	   {
+	   get{
+	      if (_fx_ui_coin == null)
+	       {
+	         _fx_ui_coin  = GetUIUnit<GameObject>("fx_ui_coin"); 
+	       }
+	      return _fx_ui_coin;
+	     }
+	   }
+	  private GameObject _fx_ui_exp;
+	  public GameObject fx_ui_exp
+	   {
+	   get{
+	      if (_fx_ui_exp == null)
+	       {
+	         _fx_ui_exp  = GetUIUnit<GameObject>("fx_ui_exp"); 
+	       }
+	      return _fx_ui_exp;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -3,6 +3,7 @@ using CombatLibrary.CombatLibrary.CombatCore.Utility;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using Fort23.UTool;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.UITool;
@@ -17,7 +18,8 @@ namespace Fort23.Mono
         public static async CTask OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle, isFocus: false);
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle,
+                    isFocus: false);
         }
 
         public static async void OpenShowItemMoveToTargetPanel(Vector2 startPos, Vector2 target,
@@ -79,17 +81,53 @@ namespace Fort23.Mono
         {
             Vector2 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
             CombatItemShowEventData combatItemShowEventData = iEventData as CombatItemShowEventData;
-            if (combatItemShowEventData.isExp)
+            bool isExp = combatItemShowEventData.isExp;
+            if (isExp)
             {
                 MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
                 Vector3 pos = mainUIPanel.expPoint.position;
                 target = transform.worldToLocalMatrix * pos;
             }
+
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
                 combatItemShowEventData.startPos_WorldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             Vector3 startPos = transform.worldToLocalMatrix * p2;
-            ShowPanel(startPos, target, combatItemShowEventData.count, combatItemShowEventData.showName);
+            ShowPanel(startPos, target, combatItemShowEventData.count, combatItemShowEventData.showName, delegate
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                if (mainUIPanel == null)
+                {
+                    return;
+                }
+
+                if (isExp)
+                {
+                    if (mainUIPanel != null)
+                    {
+                        ParticleSystemPool particleSystemPool =
+                            GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_exp,
+                                "fx_ui_exp");
+                        particleSystemPool.transform.SetParent(mainUIPanel.expPoint.transform);
+                        particleSystemPool.transform.localPosition = Vector3.zero;
+                        particleSystemPool.transform.localScale = Vector3.one;
+                        // particleSystemPool.transform.
+                    }
+                }
+                else
+                {
+                    if (mainUIPanel != null)
+                    {
+                        ParticleSystemPool particleSystemPool =
+                            GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_coin,
+                                "fx_ui_coin");
+                        particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
+                        particleSystemPool.transform.localPosition = Vector3.zero;
+                        particleSystemPool.transform.localScale = Vector3.one;
+                        // particleSystemPool.transform.
+                    }
+                }
+            });
         }
 
         protected void RenderUpdateCallBack()
@@ -111,7 +149,7 @@ namespace Fort23.Mono
             }
         }
 
-        public void AddACurve(Vector2 startPos, Vector2 target, string itemConfig)
+        public void AddACurve(Vector2 startPos, Vector2 target, string itemConfig, System.Action finishCallBack)
         {
             ACurve aCurve = new ACurve();
             CurveInfo curveInfo = new CurveInfo();
@@ -144,6 +182,7 @@ namespace Fort23.Mono
             aCurve.CurveInfos.Add(curveInfo2);
             aCurve.CurveType = CurveType.BSL;
             ImageMove currImageMove = new ImageMove();
+            currImageMove.finishCallBack = finishCallBack;
             currImageMove.SizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSize;
             currImageMove.moveSpeed = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSpped;
             // currImageMove.ShowSizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_showSize;
@@ -154,11 +193,8 @@ namespace Fort23.Mono
             gameObjectPool.own.SetActive(false);
             gameObjectPool.own.transform.localScale = Vector3.zero;
             currImageMove.GameObjectPool = gameObjectPool;
-            MyImage myImage= gameObjectPool.own.GetComponent<MyImage>();
-            myImage.onSpriteAlter= delegate
-            {
-                myImage.SetNativeSize();
-            };
+            MyImage myImage = gameObjectPool.own.GetComponent<MyImage>();
+            myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
             myImage.icon_name = itemConfig;
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
             // currImageMove.transform.sizeDelta = new Vector2(35, 35);
@@ -168,11 +204,11 @@ namespace Fort23.Mono
             currImageMove.yanChi = Random.Range(0, 0.5f);
             currImageMove.speed = AnimationCurveManager.Instance.AnimationCurveLibrary.uiMoveSpeed;
             currImageMove.currAcur = aCurve;
-
             allImageMove.Add(currImageMove);
         }
 
-        public void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName)
+        public void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName,
+            System.Action finishCallBack = null)
         {
             if (target.x == -5000)
             {
@@ -181,7 +217,7 @@ namespace Fort23.Mono
 
             for (int i = 0; i < count; i++)
             {
-                AddACurve(startPos, target, showName);
+                AddACurve(startPos, target, showName, finishCallBack);
             }
         }
     }

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Inspector
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -42,9 +42,9 @@ MonoBehaviour:
     x: 954
     y: 0
     width: 480
-    height: 1067
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+    height: 842
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -70,11 +70,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1434
-    height: 1067
+    height: 842
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 163
+  controlID: 23
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -173,7 +173,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 231
+  controlID: 21
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 162
+  controlID: 22
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -219,9 +219,9 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 954
-    height: 1067
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 842
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -246,11 +246,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1067
+    y: 842
     width: 1434
-    height: 232
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    height: 457
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -273,10 +273,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1434
     y: 0
-    width: 192
+    width: 289
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -297,9 +297,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1626
+    x: 1723
     y: 0
-    width: 466
+    width: 417
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -323,9 +323,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2092
+    x: 2140
     y: 0
-    width: 468
+    width: 420
     height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
@@ -1429,7 +1429,7 @@ MonoBehaviour:
     x: 954
     y: 73
     width: 478
-    height: 1046
+    height: 821
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1485,22 +1485,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 478
-      height: 1025
-    m_Scale: {x: 0.63115764, y: 0.63115764}
-    m_Translation: {x: 239.00002, y: 512.5}
+      height: 800
+    m_Scale: {x: 0.49261084, y: 0.49261084}
+    m_Translation: {x: 239, y: 400}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -378.66928
+      x: -485.16998
       y: -812
-      width: 757.33856
+      width: 970.33997
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.63115764
-  m_LastWindowPixelSize: {x: 478, y: 1046}
+  m_defaultScale: 0.49261084
+  m_LastWindowPixelSize: {x: 478, y: 821}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1599,7 +1599,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 953
-    height: 1046
+    height: 821
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1835,9 +1835,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: -231, y: -197}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: Scene View/Particles
       index: 8
       layout: 4
@@ -1966,14 +1966,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: 0, y: 0, z: 0}
+    m_Target: {x: 223.30373, y: 1014.85455, z: 6.1725926}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: 223.30373, y: 1014.85455, z: 6.1725926}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -2001,17 +2001,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -2019,17 +2019,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 12.124355
+    m_Target: 725.98914
     speed: 2
-    m_Value: 12.124355
+    m_Value: 725.98914
   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
@@ -2045,7 +2045,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.011797218, y: 0.96445465, z: -0.043731313, w: -0.26038843}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -2073,9 +2073,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 1140
+    y: 915
     width: 1433
-    height: 211
+    height: 436
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2108,7 +2108,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1434
     y: 73
-    width: 190
+    width: 287
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2125,7 +2125,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: cec2ffffb2fafffff69f0000
+      m_ExpandedIDs: 1a2cfcff7c7dfcffa08bfdffc4faffffbe9f0000e49f0000f09f0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -2141,7 +2141,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -2169,9 +2169,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1626
+    x: 1723
     y: 73
-    width: 464
+    width: 415
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2194,7 +2194,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameStart
+    - Assets/Scripts/GameUI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2202,16 +2202,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameStart
+  - Assets/Scripts/GameUI
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: a2d20000
-    m_LastClickedID: 53922
-    m_ExpandedIDs: 0000000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a0000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 422}
+    m_SelectedIDs: 7aa20000
+    m_LastClickedID: 41594
+    m_ExpandedIDs: 0000000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a0000054a2000070a2000074a200007aa200007ca2000080a2000026d300003cd300004cdd000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2239,7 +2239,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000090a0000092a0000094a0000096a0000098a000009aa000009ca000009ea00000a0a00000a2a00000a4a00000a6a00000a8a00000aaa00000aca00000aea00000b0a00000b2a00000b4a00000b6a00000
+    m_ExpandedIDs: 0000000050a0000052a0000054a0000056a0000058a000005aa000005ca000005ea0000060a0000062a0000064a0000066a0000068a000006aa000006ca000006ea0000070a0000072a0000074a00000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2270,18 +2270,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d500006c960000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: HeroDetailPanel
+      m_OriginalName: HeroDetailPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 20732
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
@@ -2315,9 +2315,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2092
+    x: 2140
     y: 73
-    width: 467
+    width: 419
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0