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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Res/UI/SpecificProfessionEquipmentPanel.prefab

@@ -203,7 +203,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2794770272681099308
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3191,8 +3191,8 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
-  - key: title
-    gameObject: {fileID: 8010972938947094933}
+  - key: zyTitle
+    gameObject: {fileID: 5467978613374042178}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -3201,7 +3201,7 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
-  - key: bg
+  - key: colorBg
     gameObject: {fileID: 418935367691406417}
     isAssetBundle: 0
     isList: 0
@@ -3211,6 +3211,26 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: miniTitle
+    gameObject: {fileID: 6504731158651364930}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 345039711155953141}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: zyBg
+    gameObject: {fileID: 4887070157619235640}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 345039711155953141}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!114 &3602538398910660699
 MonoBehaviour:
@@ -3224,7 +3244,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxDuration: 0.2
+  maxDuration: 1
   isUpdate: 0
   currTime: 0.2
   GrpupInfos:
@@ -3237,7 +3257,7 @@ MonoBehaviour:
     - {fileID: 539445254930693763}
     TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
     TargetFoldout: 1
-    maxDuration: 0.2
+    maxDuration: 1
     isUpdate: 1
     currTime: 0
   MinMaxGradient:
@@ -3304,6 +3324,7 @@ MonoBehaviour:
       m_NumAlphaKeys: 2
     m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
     m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &4398584149693849749
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -143,18 +143,19 @@ namespace GameLogic.Equipment
 
         /// <summary>
         /// 一键穿职业装备
-        /// 把对应职业，对应部位的，最好的装备找出来
+        /// 把对应职业，对应部位的，最好的装备找出来 牵肠挂肚
         /// </summary>
         /// <param name="zy"></param>
         /// <returns>true = 有装备变动 </returns>
         public bool EquipZyEqs(int zy)
         {
+            bool changed = false;
             if (zyEqDic.TryGetValue(zy, out var bwDic))
             {
                 foreach (KeyValuePair<int, List<ItemInfo>> keyValuePair in bwDic)
                 {
                     ItemInfo bestBwEq = null;
-                    //遍历完成后，可以把这个部位最好的装备找到
+                    //遍历完成后，可以把这个部位最好的装备找到 称谓 安慰 琐碎 栩栩如生 浮想联翩 囫囵吞枣
                     foreach (ItemInfo bwItem in keyValuePair.Value)
                     {
                         // bwItem.eqInfo.isEquip = false;
@@ -174,7 +175,12 @@ namespace GameLogic.Equipment
 
                     if (bestBwEq != null)
                     {
-                        return AddToCurEquip(bestBwEq);
+                        bool b = AddToCurEquip(bestBwEq);
+
+                        if (!changed)
+                        {
+                            changed = b;     
+                        }
                         // bestBwEq.eqInfo.isEquip = true;
                         // if (equipZyEqDic.TryGetValue(zy, out var eqList))
                         // {
@@ -217,7 +223,7 @@ namespace GameLogic.Equipment
                 }
             }
             
-            return false;
+            return changed;
         }
 
 

Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -93,6 +93,12 @@ namespace GameLogic.Equipment
             level = basicEquipConfig.lv;
             // guid = GlobalParam.GenerateGUID();
             myItemInfo.guid = itemConfig.ID.ToString() + basicEquipConfig.lv + quality;
+            
+            LogTool.Log("装备职业:"+ basicEquipConfig.profession +
+                        "-装备位置:" + basicEquipConfig.Type + 
+                        "-装备品质:" + quality +
+                        "-装备等级:" + basicEquipConfig.lv);
+            //凯旋 诸葛 某个 津津有味 厌烦 繁琐 述说 
             CalAtt();
         }
 

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanel.cs

@@ -81,16 +81,16 @@ namespace Fort23.Mono
             switch (zy)
             {
                 case 1:
-                    HeroUITools.UpdateZyEqIcon(1, zsEqs, size:0.9f);
+                    HeroUITools.UpdateZyEqIcon(1, zsEqs );
                     break;
                 case 2:
-                    HeroUITools.UpdateZyEqIcon(2, fsEqs, size:0.9f);
+                    HeroUITools.UpdateZyEqIcon(2, fsEqs);
                     break;
                 case 3:
-                    HeroUITools.UpdateZyEqIcon(3, msEqs, size:0.9f);
+                    HeroUITools.UpdateZyEqIcon(3, msEqs);
                     break;
                 case 4:
-                    HeroUITools.UpdateZyEqIcon(4, yxEqs, size:0.9f);
+                    HeroUITools.UpdateZyEqIcon(4, yxEqs);
                     break;
             }
         }

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Core.Language;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -28,6 +29,8 @@ namespace Fort23.Mono
         private bool isClickOnce = false;
         public int curZy;
         
+        //流光溢彩 别出心裁 千篇一律 呕心沥血 
+        
         private void OnclickOnce()
         {
             isClickOnce = PlayerManager.Instance.eqController.EquipZyEqs(curZy);
@@ -63,9 +66,47 @@ namespace Fort23.Mono
         {
             isClickOnce = false;
             curZy = zy;
+            SetZyInfo();
             HeroUITools.UpdateZyEqIcon(zy, eqs, poolName:"eq2");
         }
 
-        
+        private void SetZyInfo()
+        {
+            switch (curZy)
+            { //  
+                case 1:
+                    SetZyTxt(97);
+                    zyBg.icon_name = "bg_warrior";
+                    break;
+                case 2:
+                    SetZyTxt(98);
+                    zyBg.icon_name = "bg_priest";
+                    break;
+                case 3:
+                    SetZyTxt(99);
+                    zyBg.icon_name = "bg_Mage";
+                    break;
+                case 4:
+                    SetZyTxt(100);
+                    zyBg.icon_name = "bg_Archer";
+                    break;
+                default:
+                    break;
+            }
+
+            SetZyBg(curZy);
+        }
+
+        private void SetZyTxt(int languageId)
+        {
+            zyTitle.text = LanguageManager.Instance.Text(languageId);
+            miniTitle.text = LanguageManager.Instance.Text(languageId);
+        }
+
+        private void SetZyBg(int zy)
+        {
+            
+           
+        }
     }
 }

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanelData.cs

@@ -96,26 +96,48 @@ namespace Fort23.Mono
 	      return _txtZyName;
 	     }
 	   }
-	  private GameObject _title;
-	  public GameObject title
+	  private Text _zyTitle;
+	  public Text zyTitle
 	   {
 	   get{
-	      if (_title == null)
+	      if (_zyTitle == null)
 	       {
-	         _title  = GetUIUnit<GameObject>("title"); 
+	         _zyTitle  = GetUIUnit<Text>("zyTitle"); 
 	       }
-	      return _title;
+	      return _zyTitle;
 	     }
 	   }
-	  private MyImage _bg;
-	  public MyImage bg
+	  private MyImage _colorBg;
+	  public MyImage colorBg
 	   {
 	   get{
-	      if (_bg == null)
+	      if (_colorBg == null)
 	       {
-	         _bg  = GetUIUnit<MyImage>("bg"); 
+	         _colorBg  = GetUIUnit<MyImage>("colorBg"); 
 	       }
-	      return _bg;
+	      return _colorBg;
+	     }
+	   }
+	  private Text _miniTitle;
+	  public Text miniTitle
+	   {
+	   get{
+	      if (_miniTitle == null)
+	       {
+	         _miniTitle  = GetUIUnit<Text>("miniTitle"); 
+	       }
+	      return _miniTitle;
+	     }
+	   }
+	  private MyImage _zyBg;
+	  public MyImage zyBg
+	   {
+	   get{
+	      if (_zyBg == null)
+	       {
+	         _zyBg  = GetUIUnit<MyImage>("zyBg"); 
+	       }
+	      return _zyBg;
 	     }
 	   }
 	  #endregion 自定义数据结束 

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

UserSettings/Layouts/default-2022.dwlt

@@ -1,30 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
-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: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 2118.4
-    y: 83.200005
-    width: 821.60004
-    height: 1024.8
-  m_ShowMode: 0
-  m_Title: "\u6E38\u620F"
-  m_RootView: {fileID: 5}
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,16 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 34.4
-    width: 2048
-    height: 1079.2001
+    y: 43
+    width: 1920
+    height: 989
   m_ShowMode: 4
-  m_Title: "\u573A\u666F"
-  m_RootView: {fileID: 6}
+  m_Title: Inspector
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &3
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -58,74 +34,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1244.8
+    x: 0
     y: 0
-    width: 446.3999
-    height: 1029.2001
-  m_MinSize: {x: 277, y: 71}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 697
+    height: 939
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
+  - {fileID: 13}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
-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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 821.60004
-    height: 1024.8
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 16}
-  m_Panes:
-  - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &5
-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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 821.60004
-    height: 1024.8
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 15226
-  draggingID: 0
---- !u!114 &6
+  m_LastSelected: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,22 +64,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 4}
+  - {fileID: 5}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2048
-    height: 1079.2001
+    width: 1920
+    height: 989
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &7
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,12 +96,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2048
+    width: 1920
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 
---- !u!114 &8
+  m_LastLoadedLayoutName: layout-gspc
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,22 +114,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 10}
-  - {fileID: 3}
-  - {fileID: 11}
+  - {fileID: 2}
+  - {fileID: 7}
+  - {fileID: 8}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2048
-    height: 1029.2001
+    width: 1920
+    height: 939
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 41
+  controlID: 252
   draggingID: 0
---- !u!114 &9
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,12 +145,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1059.2001
-    width: 2048
+    y: 969
+    width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &10
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,18 +165,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 799.2
+    x: 697
     y: 0
-    width: 445.60004
-    height: 1029.2001
+    width: 256
+    height: 939
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -265,18 +191,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1691.2
+    x: 953
     y: 0
-    width: 356.80005
-    height: 1029.2001
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 15}
+    width: 516
+    height: 939
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -291,18 +217,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1469
     y: 0
-    width: 799.2
-    height: 1029.2001
-  m_MinSize: {x: 201, y: 221}
+    width: 451
+    height: 939
+  m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -317,15 +243,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
+    m_Text: Hierarchy
     m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 799.2
-    y: 64.8
-    width: 443.60004
-    height: 1008.2001
+    x: 697
+    y: 73
+    width: 254
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -339,25 +265,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: a2120600
-      m_LastClickedID: 397986
-      m_ExpandedIDs: de89f6ff028bf6ff228bf6ff308bf6ffae51f7ffb651f7ff6e95f7ff7695f7ff0499f7ff5499f7ff5c99f7ff809af7ffa09af7ffae9af7ffbec4f8ff20cff8ff341bf9ffc41bf9ff721cf9ff2e48f9ff5248f9ff6248f9ff6848f9ff9e4af9ff444bf9ff3685f9ff3a85f9ff4c85f9ffbc85f9ffc085f9ff5e9ff9ff8416faff9416faff9816faff0817faff0c17faffa628faff3629faffe429faff9265faffa065faff6a71faffbe80faffc280faff3e0bfbffce0bfbff7c0cfbff3811fbff38bbfbffc8bbfbff76bcfbff2802fcff5402fcff7602fcff7a02fcff9c02fcffa002fcffc202fcffc602fcffe802fcffec02fcfff002fcfff802fcff0e03fcff6c03fcff9003fcffa003fcffa403fcffb003fcffe003fcff0e04fcff1604fcff1a04fcff201dfcff241dfcff581dfcff5e1dfcff941ffcff2c20fcffd221fcffb23bfcff5c3cfcff623cfcff94fefcff3c00fdffcc00fdff5a01fdff6c01fdff7c01fdff1e65fdff3667fdff6669fdff7e6bfdff846bfdffba6dfdff526efdff2e95fdff3295fdff8298fdff8c98fdff9298fdffd4d2fdff4217feff5017feff0422feff7822feff9c22feffac22feff0c17ffff80c0ffff96d6000030de00005ee10000e0e1000064e2000018e400001ee4000032e40000c07c0100b4840100b68a0100b8d501002ae20100ace20100eae40100b4040400e0c9040084cd040096e004003ae40400a2950500f0990500f49905007a120600aa120600be120600ca120600
+      m_SelectedIDs: f853f8ff
+      m_LastClickedID: 0
+      m_ExpandedIDs: ea66f6ff8884f8ffbc84f8ffae86f8ffe488f8ff8c89f8ff1ab7f8ff28b7f8ff40c9f8ffe0d0f8ff14d1f8ff06d3f8ff3cd5f8ffe4d5f8ffc404f9ffd204f9ff7207f9ff4824f9ff9825f9ffae25f9ff4826f9ffc429f9ffd229f9ff143df9ff3293f9ffd2ccf9ffe0ccf9ff6ccef9ffbccff9ffd2cff9ff6cd0f9ff52e1f9ff76e1f9ff86e1f9ff8ce1f9ffc2e3f9ff68e4f9ff06f0f9ff9cf0f9ff8a3efaffb058faffbe5bfafff25bfafff85bfaff2e5efaffd65efaff5e8cfaff6c8cfaff0c8ffaff9e1efcff0420fcff9e20fcffd022fcffde22fcff982efcffcc2efcffd22efcff0831fcffae31fcffdc40fcff6294fcff0cc5fcff1ac5fcff5ac9fcffc2c9fcfff6c9fcfffcc9fcff32ccfcffd8ccfcffb4e4fcffead6fdff32d9fdff66d9fdff58dbfdff8eddfdff36defdff080efeff160efeffb810feff4244ffffb444ffff2645ffff9845ffff0446fffff04bfffffe4bffff4071ffffa871ffffcc71ffffdc71ffffe271ffff1874ffffbe74ffff667dffff84faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Fill
-        m_OriginalName: Fill
+        m_Name: WidgetItem (2)
+        m_OriginalName: WidgetItem (2)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 397986
+        m_UserData: -412852
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 10}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -365,7 +291,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 6c4a27a7b73d0d045b413d43470df1ea
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -380,15 +306,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: 1244.8
-    y: 64.8
-    width: 444.3999
-    height: 1008.2001
+    x: 1469
+    y: 73
+    width: 450
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -402,7 +328,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 190.40002
+    m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -412,7 +338,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &15
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -427,15 +353,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
+    m_Text: Project
     m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1691.2001
-    y: 64.8
-    width: 355.80005
-    height: 1008.2001
+    x: 953
+    y: 73
+    width: 514
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -457,7 +383,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI
+    - Assets/Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -467,14 +393,14 @@ MonoBehaviour:
   m_LastFolders:
   - Assets/Res/UI
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY001\XY001
+  m_LastProjectPath: E:\workspaces\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 4611.8}
-    m_SelectedIDs: 3c530100
-    m_LastClickedID: 86844
-    m_ExpandedIDs: 00000000d0520100d2520100d4520100d6520100d8520100da520100dc520100de520100e0520100e2520100e4520100e6520100e8520100ea520100ec520100ee520100f0520100f2520100f4520100f6520100f8520100fa520100fc520100fe52010000530100025301000453010006530100085301000a5301000c5301000e53010010530100125301001453010016530100185301001a5301001c5301001e53010020530100225301002453010026530100285301002a5301002c5301002e53010030530100325301003453010036530100385301003a5301003c5301003e53010040530100425301004453010046530100485301004a5301004c5301004e53010050530100525301005453010056530100585301005a5301005c5301005e5301006053010062530100645301006653010068530100fa53010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 274}
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 0000000054a5000056a5000058a500005aa500005ca500005ea5000060a5000062a5000064a5000066a5000068a500006aa5000056a7000060a7000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -502,7 +428,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d0520100d2520100d4520100d6520100d8520100da520100dc520100de520100e0520100e2520100e4520100e6520100e8520100ea520100ec520100ee520100f0520100f2520100f4520100f6520100f8520100fa520100fc520100fe52010000530100025301000453010006530100085301000a5301000c5301000e53010010530100125301001453010016530100185301001a5301001c5301001e53010020530100225301002453010026530100285301002a5301002c5301002e53010030530100325301003453010036530100385301003a5301003c5301003e53010040530100425301004453010046530100485301004a5301004c5301004e53010050530100525301005453010056530100585301005a5301005c5301005e5301006053010062530100645301006653010068530100
+    m_ExpandedIDs: 0000000054a5000056a5000058a500005aa500005ca500005ea5000060a5000062a5000064a5000066a5000068a500006aa5000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -530,23 +456,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: f0ee0000e0b4000046950400f034010050950400d0ef0000
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: WidgetItem
-      m_OriginalName: WidgetItem
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 49634
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 8}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -557,8 +483,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 240.80006
---- !u!114 &16
+  m_DirectoriesAreaWidth: 317.66666
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -573,15 +499,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
+    m_Text: Game
     m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2118.4
-    y: 83.200005
-    width: 821.60004
-    height: 1003.80005
+    x: 0
+    y: 72.66667
+    width: 929.6667
+    height: 1278.3334
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -613,10 +539,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -300
-    m_HBaseRangeMax: 300
-    m_VBaseRangeMin: -649.60004
-    m_VBaseRangeMax: 649.60004
+    m_HBaseRangeMin: -250
+    m_HBaseRangeMax: 250
+    m_VBaseRangeMin: -541.3334
+    m_VBaseRangeMax: 541.3334
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -625,7 +551,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -634,29 +560,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 821.60004
-      height: 982.80005
-    m_Scale: {x: 0.7564655, y: 0.7564655}
-    m_Translation: {x: 410.80002, y: 491.40002}
+      width: 929.6667
+      height: 1257.3334
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 464.83334, y: 628.6667}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -543.0519
-      y: -649.60004
-      width: 1086.1038
-      height: 1299.2001
+      x: -464.83334
+      y: -628.6667
+      width: 929.6667
+      height: 1257.3334
     m_MinimalGUI: 1
-  m_defaultScale: 0.7564655
-  m_LastWindowPixelSize: {x: 1027, y: 1254.75}
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1394.5, y: 1917.5}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &17
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -671,15 +597,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
+    m_Text: Scene
     m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 64.8
-    width: 798.2
-    height: 1008.2001
+    y: 73
+    width: 696
+    height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -694,7 +620,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -154.40002, y: -26.400024}
+      snapOffset: {x: -174, y: -26.666626}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -720,7 +646,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 24.8}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-scene-view-toolbar
@@ -746,7 +672,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 24.8}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -979,10 +905,10 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 0
-      snapOffset: {x: -209.6, y: -195.20001}
-      snapOffsetDelta: {x: 0.000030517578, y: 0}
-      snapCorner: 3
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
       id: AINavigationOverlay
       index: 9
       layout: 4
@@ -1027,19 +953,6 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 1
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
-      index: 13
-      layout: 4
-      size: {x: 0, y: 0}
-      sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 2fdbece9cf8e9b545b2c8df2e4fcdd2a
   m_Gizmos: 1
@@ -1051,9 +964,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 355.83545, y: 140.1939, z: -0.1422622}
+    m_Target: {x: 0.70711786, y: -2.3056736, z: -0.038998086}
     speed: 2
-    m_Value: {x: 349.3016, y: 132.10826, z: -0.30528224}
+    m_Value: {x: 0.70711786, y: -2.3056736, z: -0.038998086}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1089,13 +1002,13 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     zGrid:
       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}
-    m_ShowGrid: 1
+    m_ShowGrid: 0
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
@@ -1103,9 +1016,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 345.96317
+    m_Target: 4.445125
     speed: 2
-    m_Value: 362.2651
+    m_Value: 4.445125
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1125,7 +1038,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08937059, y: 0.9031861, z: -0.2296688, w: -0.35145518}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: