瀏覽代碼

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 5 天之前
父節點
當前提交
ac93a66248
共有 52 個文件被更改,包括 380 次插入455 次删除
  1. 4 0
      Assets/Art/ArtHero/Boss_Tree.prefab
  2. 2 2
      Assets/Art/Character/Guaiwu/TreeBoss/Boss_Tree.playable
  3. 1 1
      Assets/Art/VFX/FXPrefabs/fx boss 9062 zd.prefab
  4. 1 1
      Assets/Art/VFX/FXPrefabs/fx boss 9063 zd.prefab
  5. 1 1
      Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat
  6. 40 0
      Assets/Res/Config/BuffConfig.json
  7. 10 186
      Assets/Res/Config/EventConfig.json
  8. 6 6
      Assets/Res/Config/EventLinkConfig.json
  9. 1 1
      Assets/Res/Config/LanguageChineseConfig.json
  10. 0 0
      Assets/Res/TimeLineAssets/Boss_Tree_TD.txt
  11. 2 2
      Assets/Res/UI/MainPanel/MainPanel.prefab
  12. 2 0
      Assets/Res/UI/ShowItemMoveToTargetPanel.prefab
  13. 1 1
      Assets/Scenes/testCombat.scene
  14. 1 1
      Assets/Scripts/Core/UI/Core/UIManager.cs
  15. 1 1
      Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs
  16. 10 0
      Assets/Scripts/GameLogic/Combat/Buff/b_1026.cs
  17. 3 0
      Assets/Scripts/GameLogic/Combat/Buff/b_1026.cs.meta
  18. 1 1
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs
  19. 1 1
      Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs
  20. 2 2
      Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs
  21. 2 2
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroAi.cs
  22. 9 0
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs
  23. 1 7
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs
  24. 7 1
      Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs
  25. 7 0
      Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs
  26. 5 5
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs
  27. 4 5
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs
  28. 3 4
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3201.cs
  29. 4 5
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3203.cs
  30. 3 6
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3301.cs
  31. 1 11
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3402.cs
  32. 9 8
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs
  33. 15 2
      Assets/Scripts/GameLogic/Combat/Skill/S9061.cs
  34. 2 0
      Assets/Scripts/GameLogic/Combat/Skill/S9062.cs
  35. 22 0
      Assets/Scripts/GameLogic/Combat/Skill/S9063.cs
  36. 5 0
      Assets/Scripts/GameLogic/Combat/Skill/S9064.cs
  37. 5 0
      Assets/Scripts/GameLogic/Combat/Skill/S9071.cs
  38. 5 0
      Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs
  39. 1 0
      Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S9062_FxLogic.cs
  40. 0 7
      Assets/Scripts/GameUI/GameApplction.cs
  41. 4 1
      Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs
  42. 9 4
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs
  43. 1 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs
  44. 1 7
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs
  45. 1 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  46. 4 7
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  47. 1 6
      Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs
  48. 0 0
      Assets/StreamingAssets/assetConfig.txt
  49. 二進制
      Excel2Json/Excel/Buff.xlsx
  50. 二進制
      Excel2Json/Excel/EventConfig.xlsx
  51. 二進制
      Excel2Json/Excel/Language.xlsx
  52. 159 159
      UserSettings/Layouts/default-2022.dwlt

+ 4 - 0
Assets/Art/ArtHero/Boss_Tree.prefab

@@ -2774,6 +2774,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6846769208510080638, guid: d1eb17aa1fc16a14f8f201016226cc68, type: 3}
+      propertyPath: delayTime
+      value: 0.7
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 2 - 2
Assets/Art/Character/Guaiwu/TreeBoss/Boss_Tree.playable

@@ -771,7 +771,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.5
+    m_Start: 0.4
     m_ClipIn: 0
     m_Asset: {fileID: -3916580764650170293}
     m_Duration: 1
@@ -1921,7 +1921,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.5
+    m_Start: 1.1666666666666665
     m_ClipIn: 0
     m_Asset: {fileID: -2249753213640787348}
     m_Duration: 1.5

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx boss 9062 zd.prefab

@@ -5001,7 +5001,7 @@ MonoBehaviour:
   moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
-  hitFxName: 
+  hitFxName: fx boss 9062 tar
   hitAudioName: 
   extraMoveSpeed: 0
   isNotMove: 0

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx boss 9063 zd.prefab

@@ -14745,7 +14745,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.5
+  delayTime: 0.7
   multipleTargetDelayTime: 0.2
   hitFxName: fx boss 9063 hit
   hitAudioName: 

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.072114706
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

+ 40 - 0
Assets/Res/Config/BuffConfig.json

@@ -483,6 +483,46 @@
       "IsControlBuff": 0,
       "IsHideIcon": 0,
       "scriptsName": "b_1024"
+    },
+    {
+      "ID": 10251,
+      "nameTest": "控制",
+      "decTest": "不能释放功法,功法也不能充能完成",
+      "icon": "icon_b1025",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1025,
+      "overlayCount": 99,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1025"
+    },
+    {
+      "ID": 10261,
+      "nameTest": "大树隐身状态",
+      "decTest": "大树隐身状态",
+      "icon": "icon_b1026",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1026,
+      "overlayCount": 99,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1026"
     }
   ]
 }

+ 10 - 186
Assets/Res/Config/EventConfig.json

@@ -922,182 +922,6 @@
       "EventName": 3077,
       "Description": 3074
     },
-    {
-      "ID": 11,
-      "EventLinksId": [
-        1101,
-        1102,
-        1103,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 12,
-      "EventLinksId": [
-        1201,
-        1202,
-        1203,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 13,
-      "EventLinksId": [
-        1301,
-        1302,
-        1303,
-        1304,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 14,
-      "EventLinksId": [
-        1401,
-        1402,
-        1403,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 15,
-      "EventLinksId": [
-        1501,
-        1502,
-        1503,
-        1504,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
-    {
-      "ID": 16,
-      "EventLinksId": [
-        1601,
-        1602,
-        1603,
-        100,
-        102
-      ],
-      "EventTriggerType": 2,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        -5
-      ],
-      "RefreshProbability": null,
-      "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
-      "EventConditionId": null,
-      "EventCount": null,
-      "EventName": null,
-      "Description": null
-    },
     {
       "ID": 10001,
       "EventLinksId": [
@@ -2296,7 +2120,7 @@
         910101,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2322,7 +2146,7 @@
         910201,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2348,7 +2172,7 @@
         910301,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2374,7 +2198,7 @@
         910401,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2400,7 +2224,7 @@
         910501,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2426,7 +2250,7 @@
         910601,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2452,7 +2276,7 @@
         910701,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2478,7 +2302,7 @@
         910801,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2504,7 +2328,7 @@
         910901,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,
@@ -2530,7 +2354,7 @@
         911001,
         102
       ],
-      "EventTriggerType": 6,
+      "EventTriggerType": 1,
       "EventTag": 5,
       "EventType": 1,
       "Score": 0,

+ 6 - 6
Assets/Res/Config/EventLinkConfig.json

@@ -1106,7 +1106,7 @@
     {
       "ID": 1000201,
       "conciseEventMessage": 2091,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2094,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": null,
@@ -1124,7 +1124,7 @@
     {
       "ID": 1000202,
       "conciseEventMessage": 2091,
-      "EventConditionMessage": null,
+      "EventConditionMessage": 2094,
       "PreShow": null,
       "PreShowPar": null,
       "NPCID": null,
@@ -1143,8 +1143,8 @@
       "ID": 1000203,
       "conciseEventMessage": 2091,
       "EventConditionMessage": 2094,
-      "PreShow": null,
-      "PreShowPar": null,
+      "PreShow": 1,
+      "PreShowPar": 1,
       "NPCID": null,
       "DialogueType": null,
       "EventID": 10002,
@@ -4536,9 +4536,9 @@
         26
       ],
       "optionType": null,
-      "ResultType": 1,
+      "ResultType": 3,
       "ResultOptions": [
-        1002401
+        10024
       ]
     },
     {

+ 1 - 1
Assets/Res/Config/LanguageChineseConfig.json

@@ -8374,7 +8374,7 @@
     },
     {
       "ID": 2094,
-      "txt": "继续飞行一段时间- 继续飞行一段时间{0}/{1}"
+      "txt": "御剑飞行0"
     },
     {
       "ID": 2095,

文件差異過大導致無法顯示
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_Tree_TD.txt


+ 2 - 2
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -110,7 +110,7 @@ RectTransform:
   m_Father: {fileID: 3729966574632931888}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1912,7 +1912,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8620268506487690809
 RectTransform:
   m_ObjectHideFlags: 0

+ 2 - 0
Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -268,6 +268,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -356,6 +357,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 1 - 1
Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -846,7 +846,7 @@ namespace Fort23.Mono
         }
 
         public async CTask HideUIUIPanel<T>(UIDestroyType uiDestroyType = UIDestroyType.DelayDestroy,
-            bool isBreadcrumbBarPanel = false) where T : UIPanel
+            bool isBreadcrumbBarPanel = true) where T : UIPanel
         {
             UIPanel uiPanel = GetComponent<T>();
             if (uiPanel != null)

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -33,7 +33,7 @@ public int EventConditionMessage;
 
 
 		/// <summary>
-		///前置表现 
+		///前置表现 1飞行
 		/// </summary>
 public int PreShow;
 

+ 10 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1026.cs

@@ -0,0 +1,10 @@
+namespace GameLogic.Combat.Buff
+{
+    /// <summary>
+    /// 大树隐身状态
+    /// </summary>
+    public class b_1026: BuffBasic
+    {
+        
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1026.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1376073c915f4b9f8d1b24a78ce3d068
+timeCreated: 1752721500

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -149,7 +149,7 @@ namespace GameLogic.Combat.CombatTool
             StartInjuredEventData startInjuredEventData = StartInjuredEventData.Create();
             startInjuredEventData.HarmReturnInfo = harmReturnInfo;
             CombatEventManager.Instance.Dispatch(CombatEventType.StartInjured, startInjuredEventData);
-
+            att = harmReturnInfo.att;
             if (harmReturnInfo.isInvalid)
             {
                 return harmReturnInfo;

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.CombatType
         protected int _currIndex = 0;
 
 
-        public IHero currBannerHero;
+        public CombatHeroEntity currBannerHero;
         public bool isActiveCombat = false;
 
         protected IUnRegister _unRegister;

+ 2 - 2
Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -31,13 +31,13 @@ public class CombatAIBasic : IDisposable
     /// <summary>
     /// 当前聚焦的目标
     /// </summary>
-    public virtual IHero currFocusTarget
+    public virtual CombatHeroEntity currFocusTarget
     {
         get { return _currFocusTarget; }
         set { _currFocusTarget = value; }
     }
 
-    protected IHero _currFocusTarget;
+    protected CombatHeroEntity _currFocusTarget;
 
 
     private float _t;

+ 2 - 2
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroAi.cs

@@ -25,7 +25,7 @@ namespace GameLogic.Combat.Hero
         /// <summary>
         /// 当前聚焦的目标
         /// </summary>
-        public override IHero currFocusTarget
+        public override CombatHeroEntity currFocusTarget
         {
             get { return _currFocusTarget; }
             set
@@ -141,7 +141,7 @@ namespace GameLogic.Combat.Hero
                     CombatHeroEntity[] allHero =
                         CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
                     IHero minDistanceHero = FindMinDixtance(allHero);
-                    currFocusTarget = minDistanceHero;
+                    currFocusTarget = minDistanceHero as CombatHeroEntity;
                     if (!_combatHeroEntity.IsEnemy && currFocusTarget == null)
                     {
                         currFocusTarget = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero;

+ 9 - 0
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -28,6 +28,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
     public bool isPlayer;
 
     public bool isCreateHeroHp;
+
     public string guidName
     {
         get { return CurrCombatHeroInfo.modelName; }
@@ -319,8 +320,15 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
             return true;
         }
 
+        b_1025 b1025 = BuffControl.GetBuffBasicForType<b_1025>();
+        if (b1025 != null)
+        {
+            return true;
+        }
+
         return false;
     }
+
     /// <summary>
     /// 是否不能添加功法
     /// </summary>
@@ -335,6 +343,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
         return true;
     }
+
     public void HeroHurt(HarmReturnInfo harmReturnInfo)
     {
         if (isDie)

+ 1 - 7
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -42,14 +42,8 @@ namespace GameLogic.Combat.Hero
         /// 大道技能
         /// </summary>
         public SkillBasic taoismSkillBasic;
-        // public float NormalAttSpeedScale;
 
-
-        // public BetterList<SkillSlots>
-        // public BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
-        // public BetterList<SkillBasic> _removeSkillBasic = new BetterList<SkillBasic>();
-
-        // private float _removeTime;
+        
 
         public SkillTurntable SkillTurntable;
 

+ 7 - 1
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -226,8 +226,14 @@ namespace GameLogic.Combat.Hero.Turntable
                     break;
             }
 
-            if (SkillBasic != null && SkillBasic.isActive)
+            if (SkillBasic != null)
             {
+                if (!SkillBasic.IsCanTriggerSkillSlots())
+                {
+                    return;
+                }
+
+                
                 TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
                 triggerSkillSlotsEventData.SkillBasic = SkillBasic;
                 triggerSkillSlotsEventData.SkillSlots = this;

+ 7 - 0
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -1,6 +1,7 @@
 using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.Core;
+using GameLogic.Combat.Buff;
 using GameLogic.Combat.Skill;
 using GameLogic.Hero;
 using GameLogic.Player;
@@ -218,6 +219,12 @@ namespace GameLogic.Combat.Hero.Turntable
                 return;
             }
 
+            b_1025 b1025 = CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1025>();
+            if (b1025 != null)
+            {
+                return;
+            }
+
             // if (skillBasic.wuXingType.HasFlag(WuXingType.Gold))
             // {
             //     int odds = Random.Range(0, 100);

+ 5 - 5
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs

@@ -19,16 +19,16 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             // StraightLineShow straightLineShow = new StraightLineShow();
             // straightLineShow.Init(this);
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target=  CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+         
+            if (target == null)
             {
                 SkillPlayFinish();
                 return;
             }
 
-            target = allHero[0];
-            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+          
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(target, Finish);
 
             SetMagicAttShowBasic(magicAttShowBasic);
         }

+ 4 - 5
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3102.cs

@@ -17,16 +17,15 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             // StraightLineShow straightLineShow = new StraightLineShow();
             // straightLineShow.Init(this);
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target=  CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+            if (target == null)
             {
                 SkillPlayFinish();
                 return;
             }
 
-            target = allHero[0];
-            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+          
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(target, Finish);
 
             SetMagicAttShowBasic(magicAttShowBasic);
         }

+ 3 - 4
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3201.cs

@@ -32,15 +32,14 @@ namespace GameLogic.Combat.Skill.MagicSkill
         // private List<FxAILogicBasic>
         protected override void ProMagicUseSkill()
         {
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target=  CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+            if (target == null)
             {
                 SkillPlayFinish();
                 return;
             }
 
-            target = allHero[0];
+            
 
             Vector3 rootPos = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.dotPos;
             Vector3 targetPos = target.dotPos;

+ 4 - 5
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3203.cs

@@ -20,16 +20,15 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             // StraightLineShow straightLineShow = new StraightLineShow();
             // straightLineShow.Init(this);
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target=  CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+            if (target == null )
             {
                 SkillPlayFinish();
                 return;
             }
 
-            target = allHero[0];
-            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+           
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(target, Finish);
 
             SetMagicAttShowBasic(magicAttShowBasic);
         }

+ 3 - 6
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3301.cs

@@ -24,18 +24,15 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             // StraightLineShow straightLineShow = new StraightLineShow();
             // straightLineShow.Init(this);
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+            if (target == null)
             {
                 SkillPlayFinish();
                 return;
             }
 
 
-            // SkillPlayFinish();
-            target = allHero[0];
-            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(target, Finish);
 
             SetMagicAttShowBasic(magicAttShowBasic);
         }

+ 1 - 11
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3402.cs

@@ -21,17 +21,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             ActivationTimeLineData("sk1_xiaoshi");
             
             SkillPlayFinish();
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
-            {
-                return;
-            }
-
-            for (int i = 0; i < allHero.Length; i++)
-            {
-                
-            }
+         
            
         }
 

+ 9 - 8
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs

@@ -17,21 +17,21 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             // StraightLineShow straightLineShow = new StraightLineShow();
             // straightLineShow.Init(this);
-            CombatHeroEntity[] allHero =
-                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
-            if (allHero == null || allHero.Length <= 0)
+            target = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget;
+            if (target == null)
             {
                 SkillPlayFinish();
                 return;
             }
 
-            target = allHero[0];
-            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(allHero[0], Finish);
+
+            MagicAttShowBasic magicAttShowBasic = InitMagicAttShowBasic(target, Finish);
 
             SetMagicAttShowBasic(magicAttShowBasic);
         }
 
-        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(TimeLineEventLogicBasic timeLineEventLogicBasic)
+        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
+            TimeLineEventLogicBasic timeLineEventLogicBasic)
         {
             ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[1];
             lifetCycleHitPoints[0] = target.GetMainHotPoin<ILifetCycleHitPoint>();
@@ -46,6 +46,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             {
                 return;
             }
+
             HarmReturnInfo harmReturnInfo = CObjectPool.Instance.Fetch<HarmReturnInfo>();
             harmReturnInfo.source = CombatHeroEntity;
             harmReturnInfo.target = target.GetMainHotPoin<CombatHeroHitPoint>();
@@ -54,13 +55,13 @@ namespace GameLogic.Combat.Skill.MagicSkill
             harmReturnInfo.harmType = HarmType.Default;
             harmReturnInfo.triggerData = triggerData;
             target.HeroHurt(harmReturnInfo);
-            
+
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
             ActivationTimeLineData("gongji", currTarget: cBetterList);
             SkillPlayFinish();
 
-         
+
             // CombatCalculateTool.Instance.Harm(CombatHeroEntity, lifetCycleHitPoint as CombatHeroHitPoint, 200, AttType.Normal, triggerData,
             //     HarmType.Default);
         }

+ 15 - 2
Assets/Scripts/GameLogic/Combat/Skill/S9061.cs

@@ -17,6 +17,10 @@ namespace GameLogic.Combat.Skill
         protected float _currTime;
         private bool _isUpdate;
 
+        private BuffBasic _buffBasic;
+
+        private long addDef;
+
         protected override void ProInitSkill()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDie);
@@ -65,7 +69,11 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ActivationTimeLineData("9061");
-            CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().SkillTurntable.isStop = true;
+            BuffInfo buffInfo = BuffInfo.GetBuffInfo(10261, -1, 1);
+            _buffBasic = CombatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            long defense = CombatHeroEntity.MaxCombatHeroInfo.defense.Value;
+            addDef = CombatCalculateTool.Instance.GetVlaueRatioForLong(defense, effectValue[0]);
+            CombatHeroEntity.CurrCombatHeroInfo.defense += addDef;
         }
 
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
@@ -99,7 +107,12 @@ namespace GameLogic.Combat.Skill
             if (_currTime >= effectValue[1])
             {
                 _isUpdate = false;
-                CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().SkillTurntable.isStop = false;
+                CombatHeroEntity.CurrCombatHeroInfo.defense -= addDef;
+                if (_buffBasic != null)
+                {
+                    _buffBasic.DelectBuff();
+                }
+                // CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().SkillTurntable.isStop = false;
             }
         }
     }

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9062.cs

@@ -3,6 +3,7 @@ using Common.Utility.CombatEvent;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -85,6 +86,7 @@ namespace GameLogic.Combat.Skill
             }
         }
 
+        
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)

+ 22 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9063.cs

@@ -30,6 +30,28 @@ namespace GameLogic.Combat.Skill
             }
         }
 
+        public override bool IsCanTriggerSkillSlots() 
+        {
+            b_1026 b1026=  CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1026>();
+            if (b1026 != null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public override bool IsCanUse()
+        {
+            b_1026 b1026=  CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1026>();
+            if (b1026 != null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)

+ 5 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9064.cs

@@ -92,6 +92,11 @@ namespace GameLogic.Combat.Skill
             _chanRaoLoop = null;
         }
 
+        protected override void ProDispose()
+        {
+            Finish();
+        }
+
         protected override void ProCombatUpdate(float time)
         {
             if (!_isUpdate)

+ 5 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9071.cs

@@ -30,6 +30,11 @@ namespace GameLogic.Combat.Skill
             }
         }
 
+        public override bool IsCanUse()
+        {
+            return !CombatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().SkillTurntable.isStop;
+        }
+
         protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)

+ 5 - 0
Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -321,6 +321,11 @@ namespace GameLogic.Combat.Skill
             return true;
         }
 
+        public virtual bool IsCanTriggerSkillSlots()
+        {
+            return isActive;
+        }
+
 
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroHitPoint target, long att, AttType attType,
             TriggerData triggerData,ISkillFeatures skillFeatures, HarmType harmType = HarmType.Null)

+ 1 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S9062_FxLogic.cs

@@ -38,6 +38,7 @@ public class S9062_FxLogic : FxAILogicBasic
     {
         _currTime += time * _addTime;
         Vector3 pos = moveBezierPath.CalculatePoint(_currTime);
+        _currPos=pos;
         moveTarget.transform.position = pos;
         if (_currTime >=1)
         {

+ 0 - 7
Assets/Scripts/GameUI/GameApplction.cs

@@ -118,13 +118,6 @@ public class GameApplction : IGameStart
 
         EventSystemManager.Instance.CustomInit();
         PlayerManager.Instance.Init();
-        // SkillConfig[] skillConfigs= ConfigComponent.Instance.GetAll<SkillConfig>();
-        // for (int i = 0; i < skillConfigs.Length; i++)
-        // {
-        //     SkillInfo skillInfo = new SkillInfo(skillConfigs[i].ID, 1);
-        //     skillInfo.index = -1;
-        //     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
-        // }
         await ShowItemMoveToTargetPanel.OpenShowItemMoveToTargetPanel();
         PlayerManager.Instance.AddSentimentData(1);
         foreach (var playerDataAllSkillData in AccountFileInfo.Instance.playerData.AllSkillDatas)

+ 4 - 1
Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs

@@ -33,7 +33,10 @@ namespace Fort23.Mono
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-            // UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+
+            if (eventList.isCompleted)
+                return;
+
             EventSystemManager.Instance.TriggerEvent(eventList);
         }
 

+ 9 - 4
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -191,13 +191,17 @@ namespace Fort23.Mono
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
 
+            if (shengShiEventWidgetType2.eventList.isCompleted)
+            {
+                return;
+            }
+
             isTriggerEvent = true;
-            //this.GObjectPoolInterface.SetActive(false);
-            // EventSystemManager.Instance.isOpenUi = false;
+          
 
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                //this.GObjectPoolInterface.SetActive(true);
+             
                 isTriggerEvent = false;
                 UpdateContent();
             });
@@ -208,7 +212,8 @@ namespace Fort23.Mono
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
 
-            if (shengShiEventWidgetType2.isComplete)
+            //条件完成 任务没有完成 是最后一步就直接开始任务
+            if (shengShiEventWidgetType2.isComplete && !shengShiEventWidgetType2.eventList.isCompleted)
             {
                 if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 || shengShiEventWidgetType2.evenkConfig.ResultType == 3)
                 {

+ 1 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -91,6 +91,7 @@ namespace Fort23.Mono
             count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
             Slider_Count.maxValue = count;
             Slider_Count.minValue = 1;
+            Slider_Count.value = count;
 
             List<float> probabilities = UtilTools.CalculateProbabilities(divineSenseConfig.QualityBonusChance.ToList());
 

+ 1 - 7
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -68,7 +68,7 @@ namespace Fort23.Mono
 
         private void UpdateZuiZhongEvent(IEventData e)
         {
-            // if(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+          
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
 
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
@@ -141,12 +141,6 @@ namespace Fort23.Mono
                     {
                         Text_Go.text = "完成";
                     }
-                    // else
-                    // {
-                    //     Text_Go.text = "前往";
-                    // }
-                    
-                    
                 }
                 else
                 {

+ 1 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -191,7 +191,7 @@ namespace Fort23.Mono
             PlayerManager.Instance.myHero.heroData.exp += allexp;
             PlayerManager.Instance.myHero.heroData.exp -= failXw;
             PlayerManager.Instance.myHero.heroData.upTime = TimeHelper.ClientNow();
-            PlayerManager.Instance.myHero.heroData.isCombat = false;
+            // PlayerManager.Instance.myHero.heroData.isCombat = false;
             AccountFileInfo.Instance.SavePlayerData();
         }
 

+ 4 - 7
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -84,7 +84,7 @@ namespace Fort23.Mono
 
         private void ChagneShenshiBtnActive()
         {
-            Btn_Event.gameObject.SetActive(AccountFileInfo.Instance.playerData.eventList.Count > 0);
+            // Btn_Event.gameObject.SetActive(event > 0);
         }
 
         protected override void DelEvent()
@@ -154,7 +154,7 @@ namespace Fort23.Mono
             CameraSelect.value = 0.2f;
 
 
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             Text_Jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
@@ -191,16 +191,14 @@ namespace Fort23.Mono
 
         private void ShengShiOnClick(IEventData e)
         {
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text =EventSystemManager.Instance.GetShenShiCount().ToString();
             ChagneShenshiBtnActive();
             CreatShengShiEvent();
         }
 
         public async void CreatShengShiEvent()
         {
-            // AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            // if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
-            //     eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
+        
             foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
             {
                 UIManager.Instance.DormancyGComponent(shengShiConditionWidget);
@@ -218,7 +216,6 @@ namespace Fort23.Mono
                 }
 
                 shengShiEventWidget.InitShengShiEventWidget(eventList);
-                // EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
 
                 AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 

+ 1 - 6
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs

@@ -3,10 +3,6 @@ using CombatLibrary.CombatLibrary.CombatCore.Utility;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.CombatType;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.UITool;
@@ -23,7 +19,7 @@ namespace Fort23.Mono
         public static async CTask<ShowItemMoveToTargetPanel> OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Bottom,
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Loading,
                     isFocus: false);
             return showItemMoveToTargetPanel;
         }
@@ -32,7 +28,6 @@ namespace Fort23.Mono
         {
             await base.Show();
             Ui.sizeDelta = transform.sizeDelta;
-            // Combat.sizeDelta =  transform.sizeDelta;
         }
 
 

文件差異過大導致無法顯示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


二進制
Excel2Json/Excel/Buff.xlsx


二進制
Excel2Json/Excel/EventConfig.xlsx


二進制
Excel2Json/Excel/Language.xlsx


+ 159 - 159
UserSettings/Layouts/default-2022.dwlt

@@ -15,11 +15,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u573A\u666F"
+  m_Title: Timeline
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
@@ -44,8 +44,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0002
-    height: 1012.0001
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0002
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.0001
-    width: 1920.0002
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -116,12 +116,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0002
-    height: 962.0001
+    width: 2560
+    height: 1299
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 41
+  controlID: 349
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -140,8 +140,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 411.50003
-    height: 962.0001
+    width: 556
+    height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
@@ -166,14 +166,14 @@ MonoBehaviour:
   - {fileID: 9}
   m_Position:
     serializedVersion: 2
-    x: 411.50003
+    x: 556
     y: 0
-    width: 735.0001
-    height: 962.0001
+    width: 973
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 42
+  controlID: 53
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -185,24 +185,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: TransitionLibraryWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 735.0001
-    height: 478.50003
-  m_MinSize: {x: 202, y: 221}
+    width: 973
+    height: 645
+  m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 16}
   - {fileID: 17}
   - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 2
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -219,9 +219,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 478.50003
-    width: 735.0001
-    height: 483.5001
+    y: 645
+    width: 973
+    height: 654
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
@@ -246,10 +246,10 @@ MonoBehaviour:
   - {fileID: 12}
   m_Position:
     serializedVersion: 2
-    x: 1146.5001
+    x: 1529
     y: 0
-    width: 346
-    height: 962.0001
+    width: 557
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
@@ -272,10 +272,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 346
-    height: 461.00003
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 557
+    height: 671
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -297,9 +297,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 461.00003
-    width: 346
-    height: 501.0001
+    y: 671
+    width: 557
+    height: 628
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 20}
@@ -322,12 +322,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1492.5001
+    x: 2086
     y: 0
-    width: 427.50012
-    height: 962.0001
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 474
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -663,15 +663,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 410.50003
-    height: 941.0001
+    y: 73
+    width: 555
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -703,10 +703,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -724,23 +724,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 410.50003
-      height: 920.0001
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 205.25002, y: 460.00006}
+      width: 555
+      height: 1257
+    m_Scale: {x: 0.74, y: 0.74}
+    m_Translation: {x: 277.5, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -205.25002
-      y: -460.00006
-      width: 410.50003
-      height: 920.0001
+      x: -375
+      y: -849.32434
+      width: 750
+      height: 1698.6487
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 821, y: 1882.0001}
+  m_defaultScale: 0.74
+  m_LastWindowPixelSize: {x: 555, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -761,15 +761,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 411.50006
-    y: 62.000008
-    width: 733.0001
-    height: 457.50003
+    x: 556
+    y: 73
+    width: 971
+    height: 625
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -824,7 +824,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -876,7 +876,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -902,7 +902,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -915,7 +915,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -967,7 +967,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -980,7 +980,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -993,7 +993,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -1004,8 +1004,8 @@ MonoBehaviour:
       containerId: Floating
       floating: 1
       collapsed: 0
-      displayed: 1
-      snapOffset: {x: -245.5, y: -199.00003}
+      displayed: 0
+      snapOffset: {x: -317.14288, y: -199.42859}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Scene View/Particles
@@ -1123,7 +1123,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: -200.00003, y: -254}
-      snapOffsetDelta: {x: -0.000030517578, y: 0}
+      snapOffsetDelta: {x: 0.000030517578, y: 0}
       snapCorner: 3
       id: Hot Reload
       index: 11
@@ -1145,7 +1145,7 @@ MonoBehaviour:
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -1154,9 +1154,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.28195477, y: 20.921106, z: 1.7175417}
+    m_Target: {x: 0.7830182, y: 19.149546, z: 46.595665}
     speed: 2
-    m_Value: {x: 0.28195477, y: 20.921106, z: 1.7175417}
+    m_Value: {x: 0.7830182, y: 19.149546, z: 46.595665}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1165,7 +1165,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1202,13 +1202,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.16762814, y: 0.30886728, z: -0.056818742, w: -0.93456316}
+    m_Target: {x: 0.25877947, y: -0.19685788, z: 0.05319247, w: 0.9443755}
     speed: 2
-    m_Value: {x: -0.16761684, y: 0.30884647, z: -0.056814916, w: -0.9345002}
+    m_Value: {x: 0.25872844, y: -0.19681908, z: 0.053181984, w: 0.94418937}
   m_Size:
-    m_Target: 4.505407
+    m_Target: 3.9619937
     speed: 2
-    m_Value: 4.505407
+    m_Value: 3.9619937
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1255,10 +1255,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 476.57144
-    y: 66.85715
-    width: 831.71436
-    height: 529.2857
+    x: 556
+    y: 73
+    width: 971
+    height: 624
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1269,61 +1269,61 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  _SourceObject: {fileID: 11400000, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
+  _SourceObject: {fileID: 11400000, guid: 3846b55db7644b04e821a1fe0642c448, type: 2}
   _Data:
     _Transitions:
-    - {fileID: -7748444450535500976, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
-    - {fileID: 349248511799751437, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
-    - {fileID: 8837376256722196412, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
-    - {fileID: -4433459079263971295, guid: 866e079dfb7a50c4b970e0c8119ac1a5, type: 2}
+    - {fileID: 4021309058370282774, guid: 3846b55db7644b04e821a1fe0642c448, type: 2}
+    - {fileID: 4519173684108659331, guid: 3846b55db7644b04e821a1fe0642c448, type: 2}
+    - {fileID: -4395643098620063407, guid: 3846b55db7644b04e821a1fe0642c448, type: 2}
+    - {fileID: -2404245060994794738, guid: 3846b55db7644b04e821a1fe0642c448, type: 2}
     _Modifiers:
     - _From: 0
       _To: 0
       _Fade: 0
-    - _From: 0
-      _To: 1
+    - _From: 1
+      _To: 0
       _Fade: 0
-    - _From: 0
-      _To: 2
+    - _From: 2
+      _To: 0
       _Fade: 0
     - _From: 0
-      _To: 3
+      _To: 1
       _Fade: 0
     - _From: 1
-      _To: 0
+      _To: 1
       _Fade: 0
-    - _From: 1
+    - _From: 2
       _To: 1
       _Fade: 0
-    - _From: 1
+    - _From: 0
       _To: 2
       _Fade: 0
     - _From: 1
-      _To: 3
-      _Fade: 0
-    - _From: 2
-      _To: 0
+      _To: 2
       _Fade: 0
     - _From: 2
-      _To: 1
+      _To: 2
       _Fade: 0
-    - _From: 2
+    - _From: 3
       _To: 2
       _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
     - _From: 2
       _To: 3
       _Fade: 0
-    - _From: 3
-      _To: 0
+    - _From: 1
+      _To: 3
       _Fade: 0
-    - _From: 3
-      _To: 1
+    - _From: 0
+      _To: 3
       _Fade: 0
     - _From: 3
-      _To: 2
+      _To: 1
       _Fade: 0
     - _From: 3
-      _To: 3
+      _To: 0
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
@@ -1360,15 +1360,15 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u65F6\u95F4\u8F74"
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 411.50006
-    y: 540.50006
-    width: 733.0001
-    height: 462.5001
+    x: 556
+    y: 718
+    width: 971
+    height: 633
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1383,10 +1383,10 @@ MonoBehaviour:
     editType: 0
     timeReferenceMode: 0
   m_LockTracker:
-    m_IsLocked: 1
+    m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: -10592
+    m_SelectionRoot: 0
     m_SubElements: []
 --- !u!114 &19
 MonoBehaviour:
@@ -1403,15 +1403,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1146.5001
-    y: 62.000008
-    width: 344
-    height: 440.00003
+    x: 1529
+    y: 73
+    width: 555
+    height: 650
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1424,10 +1424,10 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 549}
-      m_SelectedIDs: 120dfaff
-      m_LastClickedID: -389870
-      m_ExpandedIDs: 100dfaffc8a7feff08a8feff0e20ffff78aaffffa8aaffff94acffffacc4ffff8ad6ffffacd6ffffc8e1ffff44e3ffff10e4ffffcae7ffff7efaffff66c2000066c3000030c4000080c4000054c600008ec70000c2ca00003acb0000b0d60000
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 0ad9ffff
+      m_LastClickedID: -9974
+      m_ExpandedIDs: 566ff8ff766ff8ff8674f8ff8e74f8ff688bf8ff6e8bf8ff4ce6ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1466,15 +1466,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1146.5001
-    y: 523.00006
-    width: 344
-    height: 480.0001
+    x: 1529
+    y: 744
+    width: 555
+    height: 607
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1496,7 +1496,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Character/Guaiwu
+    - Assets/Art/ArtHero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1504,16 +1504,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Character/Guaiwu
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 88.394806}
-    m_SelectedIDs: 6c670100
-    m_LastClickedID: 92012
-    m_ExpandedIDs: 000000001e690000386701003a6701003c6701003e67010040670100426701004467010046670100486701004a6701004c6701004e67010050670100526701005467010056670100586701005a6701005c6701005e67010060670100626701006467010066670100686701006a6701006c6701009868010082a2010000ca9a3b
+    scrollPos: {x: 0, y: 143}
+    m_SelectedIDs: c8030100
+    m_LastClickedID: 66504
+    m_ExpandedIDs: 00000000ac030100ae030100b0030100b2030100b4030100b6030100b8030100ba030100bc030100be030100c0030100c2030100c4030100c6030100c8030100ca030100cc030100ce030100d0030100d2030100d4030100d6030100d8030100da030100dc030100de030100e0030100e2030100e4030100e60301009e040100de040100e6040100f4920100f69201004252020000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1541,7 +1541,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000001e690000386701003a6701003c6701003e67010040670100426701004467010046670100486701004a6701004c6701004e67010050670100526701005467010056670100586701005a6701005c6701005e67010060670100626701006467010066670100686701006a6701006c670100
+    m_ExpandedIDs: 00000000ac030100ae030100b0030100b2030100b4030100b6030100b8030100ba030100bc030100be030100c0030100c2030100c4030100c6030100c8030100ca030100cc030100ce030100d0030100d2030100d4030100d6030100d8030100da030100dc030100de030100e0030100e2030100e4030100e6030100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1569,21 +1569,21 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d101003889030074a2010000a9010004a901000ea9010012a901001aa901002ca9010032a60100b8ad0100f4ad0100
+    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Boss_BeiHaiGui
+      m_OriginalName: Boss_BeiHaiGui
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 68124
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
@@ -1612,15 +1612,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1492.5001
-    y: 62.000008
-    width: 426.50012
-    height: 941.0001
+    x: 2086
+    y: 73
+    width: 473
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1634,7 +1634,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 269.00006
+    m_CachedPref: 225
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1

部分文件因文件數量過多而無法顯示