修改表，UI逻辑

Assets/Res/Config/HeroModelConfig.json

@@ -15,6 +15,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -38,6 +39,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -61,6 +63,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -84,6 +87,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -104,6 +108,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -124,6 +129,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -144,6 +150,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -164,6 +171,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -184,6 +192,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -204,6 +213,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -224,6 +234,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -244,6 +255,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -264,6 +276,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -284,6 +297,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -304,6 +318,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -324,6 +339,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -344,6 +360,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -364,6 +381,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -384,6 +402,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -404,6 +423,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -424,6 +444,7 @@
       "crit": null,
       "attack": 13,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -447,6 +468,7 @@
       "crit": null,
       "attack": 14,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -472,6 +494,7 @@
       "crit": null,
       "attack": 15,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,

Assets/Res/Config/LanguageChineseConfig.json

@@ -115,6 +115,18 @@
     {
       "ID": 29,
       "txt": "吸血"
+    },
+    {
+      "ID": 30,
+      "txt": "传说"
+    },
+    {
+      "ID": 31,
+      "txt": "史诗"
+    },
+    {
+      "ID": 32,
+      "txt": "精英"
     }
   ]
 }

Assets/Res/UI/HeroDetailPanel.prefab

@@ -455,7 +455,7 @@ GameObject:
   - component: {fileID: 3287270408546687904}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtBasicEquipLv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1861,9 +1861,9 @@ RectTransform:
   - {fileID: 7381803730339431127}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 336.49994, y: -28}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 227, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5254878090505631399
@@ -3200,7 +3200,7 @@ GameObject:
   - component: {fileID: 19514213694833491}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextGrade
+  m_Name: TextRarity
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3711,9 +3711,9 @@ RectTransform:
   - {fileID: 1714301204429487981}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 549.99994, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 175.2, y: 56}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8592391560479041805
@@ -3767,7 +3767,7 @@ GameObject:
   - component: {fileID: 5389224752589133892}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextUpGrade
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5128,7 +5128,7 @@ GameObject:
   - component: {fileID: 5985745952537226085}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtPromote
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8925,7 +8925,7 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: heroGrade
+  - key: heroRarity
     gameObject: {fileID: 19514213694833491}
     isAssetBundle: 0
     isList: 0
@@ -8955,6 +8955,136 @@ MonoBehaviour:
     - gameObject: {fileID: 2983232722897563720}
     - gameObject: {fileID: 7900421520403642917}
     - gameObject: {fileID: 1181932463234986561}
+  - key: txtHP
+    gameObject: {fileID: 598579539906994872}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtATK
+    gameObject: {fileID: 8486385519936893500}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtDEF
+    gameObject: {fileID: 7236757971243620307}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtSHANBI
+    gameObject: {fileID: 1803937540883082637}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtLv
+    gameObject: {fileID: 1188882091358369341}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtExpGain
+    gameObject: {fileID: 4958296180853232177}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtUpgrade
+    gameObject: {fileID: 6108899882536864750}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtPromote
+    gameObject: {fileID: 5985745952537226085}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: heroShards
+    gameObject: {fileID: 5495134090315458649}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtBasicEquipLv
+    gameObject: {fileID: 3287270408546687904}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconCommonEquip
+    gameObject: {fileID: 2875697944268458280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconSpecailEquip
+    gameObject: {fileID: 1302489430543971595}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: lockObj
+    gameObject: {fileID: 3004711444938965894}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
   isAssetBundle: 1
 --- !u!1 &6353668298983276286
 GameObject:
@@ -8969,7 +9099,7 @@ GameObject:
   - component: {fileID: 3838246812056708320}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9333,7 +9463,7 @@ GameObject:
   - component: {fileID: 2298052617001389203}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9477,7 +9607,7 @@ GameObject:
   - component: {fileID: 6108899882536864750}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtUpgrade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12345,7 +12475,7 @@ GameObject:
   - component: {fileID: 5100336500503189401}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextPromote
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -4180,7 +4180,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_l_Green
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: c97475968bf9f4bb39f68456035be5f8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -198,5 +198,52 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -98,6 +98,12 @@ public int attack;
 public int shanbi;
 
 
+		/// <summary>
+		///经验产出
+		/// </summary>
+public long expGain;
+
+
 		/// <summary>
 		///移动速度
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -50,6 +50,12 @@ public float DEFFactor;
 public float SHANBIFactor;
 
 
+		/// <summary>
+		///经验产出倍率
+		/// </summary>
+public float EXPFactor;
+
+
 		/// <summary>
 		///升级所需经验值 （0代表最大等级)
 		/// </summary>

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

@@ -18,13 +18,18 @@ public class CombatHeroInfo
     /// </summary>
     public EncryptionInt shanbi = new EncryptionInt(); 
     
+    /// <summary>
+    /// 经验产出
+    /// </summary>
+    public EncryptionLong expGain = new EncryptionLong();
+    
     public EncryptionFloat attSpeed = new EncryptionFloat();
     public EncryptionFloat crit =new EncryptionFloat();
     public EncryptionFloat critDamage =new EncryptionFloat();
-    public EncryptionFloat dodge = new EncryptionFloat();
+    // public EncryptionFloat dodge = new EncryptionFloat();
 
-    public int level;
-    public int star;
+    public EncryptionInt level;
+    public EncryptionInt star;
     
     public HeroModelConfig modelConfig;
 
@@ -76,13 +81,19 @@ public class CombatHeroInfo
         factor = rarityFactor * starFactor;
     }
 
-    protected void CalAttribute()
+
+    protected void CalBasicAttribute()
     {
         hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
         defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
         attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
-        
-        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor);
+        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor * factor);
+        expGain = (EncryptionLong)(modelConfig.expGain * powerUpConfig.EXPFactor * factor);
+    }
+    
+    protected void CalAttribute()
+    {
+        CalBasicAttribute();
 
         attSpeed = (EncryptionFloat)modelConfig.speed_atk;
         crit = (EncryptionFloat)modelConfig.crit;
@@ -93,11 +104,13 @@ public class CombatHeroInfo
         maxDisTo = maxDis * maxDis;
     }
 
-    protected void SetDataConfig(int id,int level, int star)
+    protected void SetDataConfig(int modelID,int level, int star)
     {
-        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
+        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(modelID);
         powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
         promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
+        this.level = (EncryptionInt)level;
+        this.star = (EncryptionInt)star;
     }
     
     public void InitMonster(int modelID,int level, int star = 1)

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -24,7 +24,7 @@ namespace GameLogic.CombatScenesTool
                 combatHeroInfo.attack.Value = (att);
                 combatHeroInfo.crit.Value = (0);
                 combatHeroInfo.critDamage.Value = (0);
-                combatHeroInfo.dodge.Value = (0);
+                combatHeroInfo.shanbi.Value = (0);
                 combatHeroInfo.maxDis = attDis;
                 combatHeroInfo.maxDisTo = attDis * attDis;
                 combatHeroInfo.skillId = skillId;

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -32,31 +32,51 @@ namespace GameLogic.Hero
                 return _iconZhiYe;
             }
         }
-        
-        //
-        // public int level;
-        // public int star;
-        
-        
+
+        public int modelID;
+
+        /// <summary>
+        /// 是否为上阵英雄
+        /// </summary>
+        public bool isLead;
+
         public void InitHero(AccountFileInfo.HeroData heroData)
         {
+            modelID = heroData.heroModelId;
             SetDataConfig(heroData.heroModelId, 
                 heroData.heroPowerId, 
                 heroData.heroPromoteId);
             CalFactor();
             CalAttribute();
         }
-        
-        // public HeroInfo(AccountFileInfo.HeroData heroData)
-        // {
-        //     modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
-        //     promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
-        //     powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
-        //     
-        //     lv = powerConfig.heroLevel;
-        //     star = promoteConfig.starGrade;
-        // }
 
-        
+        public void Upgrade()
+        {
+            level.Value++;
+            powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+        }
+
+        public void Promote()
+        {
+            star.Value++;
+            promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+        }
+
+        public AccountFileInfo.HeroData ToHeroData()
+        {
+            AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData
+            {
+                heroModelId = modelConfig.ID,
+                heroPowerId = powerUpConfig.ID,
+                heroPromoteId = promoteConfig.ID
+            };
+            return heroData;
+        }
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -32,6 +32,49 @@ public class PlayerManager : Singleton<PlayerManager>
             heroInfo.InitHero(heroData);
             heroListInLead.Add(heroInfo);
         }
+    }
+
+    private int leadHeroIdx = 0;
+
+    /// <summary>
+    /// 快速保存英雄数据
+    /// 反复升级统一英雄时，就不用反复遍历列表了
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    /// <returns>ture=升级的是同一个英雄</returns>
+    private bool QuickSaveHeroData(HeroInfo heroInfo)
+    {
+        var lastHeroData= AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx];
         
+        if (heroInfo.modelID == lastHeroData.heroModelId)
+        {
+            AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx] = heroInfo.ToHeroData();
+            AccountFileInfo.Instance.SavePlayerData();
+            return true;
+        }
+
+        return false;
+    }
+    
+    /// <summary>
+    /// 保存英雄数据
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    public void SaveHeroData(HeroInfo heroInfo)
+    {
+        if (!QuickSaveHeroData(heroInfo))
+        {
+            for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
+            {
+                AccountFileInfo.HeroData heroData = AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i];
+                if (heroData.heroModelId == heroInfo.modelID)
+                {
+                    AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i] = heroInfo.ToHeroData();
+                    //存下来，用于快速查找
+                    leadHeroIdx = i;
+                    return;
+                }
+            }
+        }
     }
 }

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

@@ -1,3 +1,4 @@
+using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
@@ -31,8 +32,32 @@ namespace Fort23.Mono
         public void InitHeroDetailPanel(HeroInfo heroInfo)
         {
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
-            
-            LogTool.Log(heroInfo);
+            heroName.text = LanguageManager.Instance.Text(heroInfo.modelConfig.name);
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+
+            switch (heroInfo.modelConfig.rarity)
+            {
+                case 1:
+                    heroRarity.text = LanguageManager.Instance.Text(32);
+                    break;
+                case 2:
+                    heroRarity.text = LanguageManager.Instance.Text(31);
+                    break;
+                case 3:
+                    heroRarity.text = LanguageManager.Instance.Text(30);
+                    break;
+                default:
+                    LogTool.Error("找不到hero的稀有度:" + heroInfo.modelConfig.ID);
+                    break;
+            }
+
+            txtHP.text = heroInfo.hp.Value.ToString();
+            txtATK.text = heroInfo.attack.Value.ToString();
+            txtDEF.text = heroInfo.defense.Value.ToString();
+            txtSHANBI.text = heroInfo.shanbi.Value.ToString();
+
+            txtLv.text = heroInfo.level.Value.ToString();
+            txtExpGain.text = heroInfo.expGain.Value.ToString();
         }
 
     }

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

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using TMPro;
+
 namespace Fort23.Mono
 {
 	public partial class HeroDetailPanel 
@@ -19,15 +21,15 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
-	  private Text _heroGrade;
-	  public Text heroGrade
+	  private Text _heroRarity;
+	  public Text heroRarity
 	   {
 	   get{
-	      if (_heroGrade == null)
+	      if (_heroRarity == null)
 	       {
-	         _heroGrade  = GetUIUnit<Text>("heroGrade"); 
+	         _heroRarity  = GetUIUnit<Text>("heroRarity"); 
 	       }
-	      return _heroGrade;
+	      return _heroRarity;
 	     }
 	   }
 	  private Text _heroName;
@@ -63,6 +65,149 @@ namespace Fort23.Mono
 	      return _iconZhiYe;
 	     }
 	   }
+	  private TextMeshProUGUI _txtHP;
+	  public TextMeshProUGUI txtHP
+	   {
+	   get{
+	      if (_txtHP == null)
+	       {
+	         _txtHP  = GetUIUnit<TextMeshProUGUI>("txtHP"); 
+	       }
+	      return _txtHP;
+	     }
+	   }
+	  private TextMeshProUGUI _txtATK;
+	  public TextMeshProUGUI txtATK
+	   {
+	   get{
+	      if (_txtATK == null)
+	       {
+	         _txtATK  = GetUIUnit<TextMeshProUGUI>("txtATK"); 
+	       }
+	      return _txtATK;
+	     }
+	   }
+	  private TextMeshProUGUI _txtDEF;
+	  public TextMeshProUGUI txtDEF
+	   {
+	   get{
+	      if (_txtDEF == null)
+	       {
+	         _txtDEF  = GetUIUnit<TextMeshProUGUI>("txtDEF"); 
+	       }
+	      return _txtDEF;
+	     }
+	   }
+	  private TextMeshProUGUI _txtSHANBI;
+	  public TextMeshProUGUI txtSHANBI
+	   {
+	   get{
+	      if (_txtSHANBI == null)
+	       {
+	         _txtSHANBI  = GetUIUnit<TextMeshProUGUI>("txtSHANBI"); 
+	       }
+	      return _txtSHANBI;
+	     }
+	   }
+	  private TextMeshProUGUI _txtLv;
+	  public TextMeshProUGUI txtLv
+	   {
+	   get{
+	      if (_txtLv == null)
+	       {
+	         _txtLv  = GetUIUnit<TextMeshProUGUI>("txtLv"); 
+	       }
+	      return _txtLv;
+	     }
+	   }
+	  private TextMeshProUGUI _txtExpGain;
+	  public TextMeshProUGUI txtExpGain
+	   {
+	   get{
+	      if (_txtExpGain == null)
+	       {
+	         _txtExpGain  = GetUIUnit<TextMeshProUGUI>("txtExpGain"); 
+	       }
+	      return _txtExpGain;
+	     }
+	   }
+	  private TextMeshProUGUI _txtUpgrade;
+	  public TextMeshProUGUI txtUpgrade
+	   {
+	   get{
+	      if (_txtUpgrade == null)
+	       {
+	         _txtUpgrade  = GetUIUnit<TextMeshProUGUI>("txtUpgrade"); 
+	       }
+	      return _txtUpgrade;
+	     }
+	   }
+	  private TextMeshProUGUI _txtPromote;
+	  public TextMeshProUGUI txtPromote
+	   {
+	   get{
+	      if (_txtPromote == null)
+	       {
+	         _txtPromote  = GetUIUnit<TextMeshProUGUI>("txtPromote"); 
+	       }
+	      return _txtPromote;
+	     }
+	   }
+	  private MyImage _heroShards;
+	  public MyImage heroShards
+	   {
+	   get{
+	      if (_heroShards == null)
+	       {
+	         _heroShards  = GetUIUnit<MyImage>("heroShards"); 
+	       }
+	      return _heroShards;
+	     }
+	   }
+	  private TextMeshProUGUI _txtBasicEquipLv;
+	  public TextMeshProUGUI txtBasicEquipLv
+	   {
+	   get{
+	      if (_txtBasicEquipLv == null)
+	       {
+	         _txtBasicEquipLv  = GetUIUnit<TextMeshProUGUI>("txtBasicEquipLv"); 
+	       }
+	      return _txtBasicEquipLv;
+	     }
+	   }
+	  private MyImage _iconCommonEquip;
+	  public MyImage iconCommonEquip
+	   {
+	   get{
+	      if (_iconCommonEquip == null)
+	       {
+	         _iconCommonEquip  = GetUIUnit<MyImage>("iconCommonEquip"); 
+	       }
+	      return _iconCommonEquip;
+	     }
+	   }
+	  private MyImage _iconSpecailEquip;
+	  public MyImage iconSpecailEquip
+	   {
+	   get{
+	      if (_iconSpecailEquip == null)
+	       {
+	         _iconSpecailEquip  = GetUIUnit<MyImage>("iconSpecailEquip"); 
+	       }
+	      return _iconSpecailEquip;
+	     }
+	   }
+	  private GameObject _lockObj;
+	  public GameObject lockObj
+	   {
+	   get{
+	      if (_lockObj == null)
+	       {
+	         _lockObj  = GetUIUnit<GameObject>("lockObj"); 
+	       }
+	      return _lockObj;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    public static class HeroUITools
+    {
+        /// <summary>
+        /// 根据星级，显示不同的数量的星星和样子
+        /// </summary>
+        /// <param name="stars"></param>
+        /// <param name="starGrade"></param>
+        public static void SetStarShow(List<object> stars, int starGrade)
+        {
+            // 最大星级展示个数（6星，只显示一颗星星，换颜色）
+            int maxShowStar = 5;
+
+            // 计算 当前星级 应该用什么星星的表现
+            int group = (starGrade - 1) / maxShowStar;
+            
+            int i = 1;
+            foreach (GameObject star in stars)
+            {
+                SetStarImg(group, star);
+                // 根据星级显示星星
+                if (starGrade >= i)
+                {
+                    star.SetActive(true);
+                }
+                else
+                {
+                    star.SetActive(false);
+                }
+                i++;
+            }
+        }
+        
+        private static void SetStarImg(int group, GameObject starObj)
+        {
+            MyImage image = starObj.GetComponent<MyImage>();
+            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+            switch (group)
+            {
+                case 0: // n = 1~5
+                    image.icon_name = "GradeIcon_Star_s_Yellow";
+                    break;
+                case 1: // n = 6~10
+                    image.icon_name = "GradeIcon_Star_s_Premium";    
+                    break;
+                default: // 其他情况
+                    image.icon_name = "GradeIcon_Star_s_Yellow";
+                    break;
+            }
+        }
+        
+    }
+}

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5540bab530cf4f1cbd86c91d8c0c2d02
+timeCreated: 1732690520

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

@@ -55,55 +55,54 @@ namespace Fort23.Mono
         /// <param name="heroInfo"></param>
         public void InitHero(HeroInfo heroInfo)
         {
-            // GetComponent<RectTransform>().anchorMin = new Vector2(0.5f, 0.5f);
-            // GetComponent<RectTransform>().anchorMax = new Vector2(0.5f, 0.5f);
             this.heroInfo = heroInfo;
             lv.text = heroInfo.level.ToString();
             
+            
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+            
             // 最大星级展示个数（6星，只显示一颗星星，换颜色）
-            int maxShowStar = 5;
-
-            // 计算 当前星级 应该用什么星星的表现
-            int group = (heroInfo.star - 1) / maxShowStar;
-
-
-
-            int i = 1;
-            foreach (GameObject star in stars)
-            {
-                // Image image = star.GetComponent<Image>();
-
-                SetStarImg(group, star);
-                
-                if (heroInfo.star >= i)
-                {
-                    star.SetActive(true);
-                }
-                else
-                {
-                    star.SetActive(false);
-                }
-                i++;
-            }
+            // int maxShowStar = 5;
+            //
+            // // 计算 当前星级 应该用什么星星的表现
+            // int group = (heroInfo.star - 1) / maxShowStar;
+            //
+            // int i = 1;
+            // foreach (GameObject star in stars)
+            // {
+            //     // Image image = star.GetComponent<Image>();
+            //
+            //     SetStarImg(group, star);
+            //     
+            //     if (heroInfo.star >= i)
+            //     {
+            //         star.SetActive(true);
+            //     }
+            //     else
+            //     {
+            //         star.SetActive(false);
+            //     }
+            //     i++;
+            // }
         }
 
-        private void SetStarImg(int group, GameObject starObj)
-        {
-            Image image = starObj.GetComponent<Image>();
-            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
-            switch (group)
-            {
-                case 0: // n = 1~5
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-                case 1: // n = 6~10
-                    image.name = "GradeIcon_Star_s_Premium";    
-                    break;
-                default: // 其他情况
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-            }
-        }
+        // private void SetStarImg(int group, GameObject starObj)
+        // {
+        //     Image image = starObj.GetComponent<Image>();
+        //     // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+        //     switch (group)
+        //     {
+        //         case 0: // n = 1~5
+        //             image.name = "GradeIcon_Star_s_Yellow";
+        //             break;
+        //         case 1: // n = 6~10
+        //             image.name = "GradeIcon_Star_s_Premium";    
+        //             break;
+        //         default: // 其他情况
+        //             image.name = "GradeIcon_Star_s_Yellow";
+        //             break;
+        //     }
+        // }
 
     }
 }

UserSettings/EditorUserSettings.asset

@@ -33,10 +33,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,54 @@
 %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: -284
+    y: -1312
+    width: 478
+    height: 1032
+  m_ShowMode: 0
+  m_Title: Simulator
+  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}
+  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: 578
+    y: 298
+    width: 641
+    height: 603
+  m_ShowMode: 0
+  m_Title: Build Settings
+  m_RootView: {fileID: 7}
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +62,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 9
-    y: 51
-    width: 2543
-    height: 1341
+    x: 112
+    y: 66
+    width: 1546
+    height: 971
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 875, y: 321}
+  m_RootView: {fileID: 8}
+  m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
---- !u!114 &2
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,18 +87,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 630
+    x: 0
     y: 0
-    width: 315
-    height: 650
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 478
+    height: 1032
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,20 +111,70 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 2}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
-    height: 650
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
+    width: 478
+    height: 1032
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 1376
+  controlID: 218186
   draggingID: 0
---- !u!114 &4
+--- !u!114 &6
+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: BuildPlayerWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 641
+    height: 603
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 18}
+  m_Panes:
+  - {fileID: 18}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &7
+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: 6}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 641
+    height: 603
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 215509
+  draggingID: 0
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,22 +187,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
-  - {fileID: 7}
-  - {fileID: 6}
+  - {fileID: 9}
+  - {fileID: 11}
+  - {fileID: 10}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2543
-    height: 1341
+    width: 1546
+    height: 971
   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 &5
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -121,12 +219,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2543
+    width: 1546
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &6
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,12 +240,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1321
-    width: 2543
+    y: 951
+    width: 1546
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -160,22 +258,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 11}
   - {fileID: 12}
-  - {fileID: 13}
+  - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2543
-    height: 1291
-  m_MinSize: {x: 500, y: 100}
-  m_MaxSize: {x: 40480, y: 16192}
+    width: 1546
+    height: 921
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 326
+  controlID: 198560
   draggingID: 0
---- !u!114 &8
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,20 +286,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 10}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
-    height: 1291
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 466.5
+    height: 921
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 1375
+  controlID: 198561
   draggingID: 0
---- !u!114 &9
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -218,16 +316,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 630
-    height: 650
+    width: 466.5
+    height: 366
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,17 +341,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 650
-    width: 945
-    height: 641
+    y: 366
+    width: 466.5
+    height: 555
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,18 +366,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 945
+    x: 466.5
     y: 0
-    width: 506
-    height: 1291
+    width: 266
+    height: 921
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -294,18 +392,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1451
+    x: 732.5
     y: 0
     width: 379
-    height: 1291
+    height: 921
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,18 +418,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1830
+    x: 1111.5
     y: 0
-    width: 713
-    height: 1291
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+    width: 434.5
+    height: 921
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -340,21 +438,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 640, y: 580}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Simulator
-    m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Build Settings
+    m_Image: {fileID: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 639
-    y: 81
-    width: 313
-    height: 629
+    x: 578
+    y: 298
+    width: 641
+    height: 582
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -365,39 +463,29 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_SerializedViewNames:
-  - UnityEditor.GameView
-  m_SerializedViewValues:
-  - /Users/lcn/0Fort23Projects/XY001/Library/PlayModeViewStates/d60d5cdcd558546949e78131da8dbfc9
-  m_PlayModeViewName: Device Simulator
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
-  m_TargetSize: {x: 1125, y: 2436}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 2
-  m_UseMipMap: 0
-  m_SimulatorState:
-    controlPanelVisible: 0
-    controlPanelWidth: 0
-    controlPanelFoldoutKeys:
-    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
-    controlPanelFoldoutValues: 00
-    pluginNames:
-    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
-    pluginStates:
-    - '{}'
-    scale: 23
-    fitToScreenEnabled: 1
-    rotationDegree: 0
-    highlightSafeAreaEnabled: 0
-    friendlyName: Apple iPhone XS
-    screenIndex: 0
-    networkReachability: 1
-    systemLanguage: 10
---- !u!114 &15
+  m_TreeViewState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 0
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -413,14 +501,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 9
-    y: 81
-    width: 629
-    height: 629
+    x: 112
+    y: 96
+    width: 465.5
+    height: 345
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -792,9 +880,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Target: {x: -0.3829853, y: -0.030267246, z: -0.022057882}
     speed: 2
-    m_Value: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Value: {x: -0.3829853, y: -0.030267246, z: -0.022057882}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -830,13 +918,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:
@@ -844,9 +932,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.4470903
+    m_Target: 2.9594293
     speed: 2
-    m_Value: 1.4470903
+    m_Value: 2.9594293
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -866,14 +954,14 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.15547842, y: 0.59475, z: -0.11858795, w: -0.77976775}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -889,14 +977,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 9
-    y: 731
-    width: 944
-    height: 620
+    x: 112
+    y: 462
+    width: 465.5
+    height: 534
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -907,7 +995,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -923,14 +1011,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 954
-    y: 81
-    width: 504
-    height: 1270
+    x: 578.5
+    y: 96
+    width: 264
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -944,9 +1032,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 30940100
-      m_LastClickedID: 103472
-      m_ExpandedIDs: 4229fdff7c2bfdff822bfdff8a2bfdff902bfdffb22bfdffc02bfdffd87cfdffe67cfdffca80fdff7c90fdffa491fdff5696fdffcaa2fdfff2a3fdffa4a8fdff7cb8fdffa4b9fdff60befdff0ecbfdff36ccfdff2cd1fdff80e0fdffa8e1fdff6ae6fdff46f3fdff6ef4fdff6af9fdff5408feff7c09feff420efeffb21afeffda1bfeffd220feffe48bfeff0c8dfeffca91feff469efeff6e9ffeff30a4feffa0b0feffc8b1feffc0b6feff60dcfffff4ffffffea9001003094010036940100
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: f619f1ff9838f1ffa638f1ff344af1ff304bf1ff9a74f3ffa874f3ffa87cf3ff787ef3ffa27ef3ffcc7ef3fff67ef3fffc7ef3ffaa7ff3ffac7ff3ff7480f3ffdab2f3ff4cb3f3ff64b3f3ff68b3f3ff84b3f3ffb8b6f3ffc6b6f3ff24bef3fff4bef3ffb8dbf3ffc6dbf3ffdee6f3ff30e7f3ff32eaf3ff34eaf3ff3e19f5ff9c23f5ffee23f5ff7024f5ff8424f5ff9425f5ff4626f5fff026f5ff6e2af5ff7c2af5ffea2ff5ff98c3f5ffeac3f5ffeec6f5ff90f8f5ff94f8f5ffa2f8f5ffd613f7ffdc13f7ffe013f7ff5214f7ff6a14f7ff6e14f7ff8c14f7ff8439f7ff8839f7ff9639f7ff2887f7ff4087f7ff4487f7ff6287f7ff08d3f7ff0cd3f7ff1ad3f7fffad5f7ff94e4f7fface4f7ffb0e4f7ff3cecf7ff4aecf7ff4cecf7ffdc35f8fff435f8fff835f8ff1636f8ff025df8ff065df8ff145df8fff45ff8ff1464f8ff2264f8ff6473f8ff5423f9ff463ff9ff2040f9ff2840f9ffea40f9ff0841f9ff0c41f9ff1a41f9ffb0f8f9ffb60bfaff9c30fbff6a43fbfffc9ffbff0aa0fbff84aafbff78aefbff20bdfbff0e32feff9694feffbc94feffc094feffc894fefff894feff7c95feff8495feff6296feff6c96feff8896feffa496feffbe96fefff696feff2a97feff3297feff5097feff6097feff3499feff5e99feff8899feffb299feffbc99feff2a9afeff409afeff449afeff749afeff769afeff829afefff29cfeff749efeff96a1feff4ad9feff7ad9feff82d9feffdee5feffcce6feffd0e6feff54e7feff58e7feff5ee7feff62e7feff66e7feff78e7feff84e7feffa8e8feffc0e8feffc4e8feffe0e8fefff4e8fefff6e8feff02e9feff04e9feff40c3ffff46f7ffffa0f7ffffb4faffffc2faffffc4faffff0ee20100baee01004ef40100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -962,7 +1050,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 15}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -970,7 +1058,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: d52fa66f7ca074a00968d8c52b6fc68f
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -986,14 +1074,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1460
-    y: 81
+    x: 844.5
+    y: 96
     width: 377
-    height: 1270
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1015,7 +1103,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res
+    - Assets/Res/UIAtlas
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1023,32 +1111,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res
+  - Assets/Res/UIAtlas
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
+  m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: ded90000
-    m_LastClickedID: 55774
-    m_ExpandedIDs: 00000000b6d90000ecd90000f0d90000f05f0100f25f010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 48}
+    m_SelectedIDs: e2ea0000
+    m_LastClickedID: 60130
+    m_ExpandedIDs: 0000000000b3000002b3000004b3000006b3000008b300000cb300000eb3000010b3000012b3000014b3000016b300002cb3000034b3000056b3000060b3000066e8000068e800006ae800004ce9000086ed000088fb00009a820100b0820100b682010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: icon
+      m_OriginalName: icon
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 64390
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 16}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1060,7 +1148,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b6d90000b8d90000
+    m_ExpandedIDs: 0000000000b3000002b3000004b3000006b3000008b300000cb300000eb3000010b3000012b3000014b3000016b300004cb3000060b3000066e8000068e800006ae8000086ed000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1088,23 +1176,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d50000
+    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d5000052fb00003aa1000086a000006ca1000076a100000807010028a100007ca1000062a1000078a1000068a100003ca100006ea100002aa100002ea1000090a000006c1001008aa000003ea1000038a1000092a000008ea0000082a1000086a1000074a100004407010026070100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: MoBan
-      m_OriginalName: MoBan
+      m_Name: all
+      m_OriginalName: all
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 736
+      m_UserData: 120760
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 16}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1115,8 +1203,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 184
---- !u!114 &19
+  m_DirectoriesAreaWidth: 207
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1132,14 +1220,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1839
-    y: 81
-    width: 712
-    height: 1270
+    x: 1223.5
+    y: 96
+    width: 433.5
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1153,7 +1241,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 484
+    m_CachedPref: 225
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -1163,3 +1251,69 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
+--- !u!114 &24
+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: 13974, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Simulator
+    m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -284
+    y: -1312
+    width: 478
+    height: 1011
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames:
+  - UnityEditor.GameView
+  m_SerializedViewValues:
+  - /Users/lcn/0Fort23Projects/XY001/Library/PlayModeViewStates/fcb172f76445941df86237e2028b0cb2
+  m_PlayModeViewName: Device Simulator
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
+  m_TargetSize: {x: 1284, y: 2778}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 2
+  m_UseMipMap: 0
+  m_SimulatorState:
+    controlPanelVisible: 0
+    controlPanelWidth: 0
+    controlPanelFoldoutKeys:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    controlPanelFoldoutValues: 00
+    pluginNames:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    pluginStates:
+    - '{}'
+    scale: 32
+    fitToScreenEnabled: 0
+    rotationDegree: 0
+    highlightSafeAreaEnabled: 0
+    friendlyName: Apple iPhone 13 Pro Max
+    screenIndex: 0
+    networkReachability: 1
+    systemLanguage: 10