lzx 9 часов назад
Родитель
Сommit
bfd66047cf
42 измененных файлов с 2048 добавлено и 933 удалено
  1. 588 588
      Assets/Res/Config/LanguageChineseConfig.json
  2. 70 0
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  3. 70 0
      Assets/Res/UI/BoxPanel/BoxPanel.prefab
  4. 70 0
      Assets/Res/UI/BoxPanel/GachaPanel.prefab
  5. 98 0
      Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab
  6. 70 0
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab
  7. 14 0
      Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab
  8. 58 2
      Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab
  9. 14 0
      Assets/Res/UI/DivineSence/DivineSenceItemWidget.prefab
  10. 112 0
      Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab
  11. 14 0
      Assets/Res/UI/DivineSence/EventTipsPanel.prefab
  12. 14 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab
  13. 28 0
      Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab
  14. 14 0
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  15. 42 0
      Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab
  16. 98 0
      Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab
  17. 28 0
      Assets/Res/UI/MainPanel/MainPanel.prefab
  18. 56 0
      Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab
  19. 70 0
      Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab
  20. 154 0
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  21. 42 0
      Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab
  22. 28 0
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  23. 112 0
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  24. 28 0
      Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab
  25. 1 1
      Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat
  26. 4 4
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs
  27. 2 1
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs
  28. 6 7
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs
  29. 3 1
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs
  30. 4 2
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs
  31. 3 2
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceLevelPreviewPanel.cs
  32. 3 3
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs
  33. 14 12
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs
  34. 19 10
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs
  35. 3 3
      Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs
  36. 14 7
      Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs
  37. 11 4
      Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs
  38. 9 8
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs
  39. 1 1
      Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs
  40. 2 2
      Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs
  41. BIN
      Excel2Json/Excel/Language.xlsx
  42. 57 275
      UserSettings/Layouts/default-2022.dwlt

Разница между файлами не показана из-за своего большого размера
+ 588 - 588
Assets/Res/Config/LanguageChineseConfig.json


+ 70 - 0
Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -317,6 +317,7 @@ GameObject:
   - component: {fileID: 3845805147842114099}
   - component: {fileID: 3274072020448486571}
   - component: {fileID: 3326347593227472543}
+  - component: {fileID: 8873959656822706880}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -386,6 +387,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6D1E\u5E9C"
+--- !u!114 &8873959656822706880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 701047435480110982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10167
 --- !u!1 &1058212698097100470
 GameObject:
   m_ObjectHideFlags: 0
@@ -620,6 +634,7 @@ GameObject:
   - component: {fileID: 4454644270139638089}
   - component: {fileID: 6468258095934692119}
   - component: {fileID: 7376607911237243140}
+  - component: {fileID: 7114587401958330929}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -689,6 +704,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5546\u5E97"
+--- !u!114 &7114587401958330929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1223964728012805292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10168
 --- !u!1 &1274245267068317966
 GameObject:
   m_ObjectHideFlags: 0
@@ -835,6 +863,7 @@ GameObject:
   - component: {fileID: 8052324487370643166}
   - component: {fileID: 5311815257834640554}
   - component: {fileID: 6972843921874825402}
+  - component: {fileID: 6994518953004696016}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -904,6 +933,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5"
+--- !u!114 &6994518953004696016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324857811795273833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10166
 --- !u!1 &1693697974241859946
 GameObject:
   m_ObjectHideFlags: 0
@@ -1462,6 +1504,7 @@ GameObject:
   - component: {fileID: 9118942833055612608}
   - component: {fileID: 2151591527671032415}
   - component: {fileID: 1491700778139819005}
+  - component: {fileID: 5005952006266296929}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1546,6 +1589,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.12941177, g: 0.4666667, b: 0.52156866, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &5005952006266296929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2477149122243983751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10164
 --- !u!1 &2634108884773401188
 GameObject:
   m_ObjectHideFlags: 0
@@ -3799,6 +3855,7 @@ GameObject:
   - component: {fileID: 834936776012228567}
   - component: {fileID: 997768621759475326}
   - component: {fileID: 5328025960864367153}
+  - component: {fileID: 7965609398211261346}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3868,6 +3925,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u89D2"
+--- !u!114 &7965609398211261346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6989890744348440139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10165
 --- !u!1 &8685831570883163436
 GameObject:
   m_ObjectHideFlags: 0

+ 70 - 0
Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -457,6 +457,7 @@ GameObject:
   - component: {fileID: 6752924059724541901}
   - component: {fileID: 2312756988428737885}
   - component: {fileID: 6912678622546442018}
+  - component: {fileID: 8981157537908112092}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -541,6 +542,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8981157537908112092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2545179559456748712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10181
 --- !u!1 &2832511953393709571
 GameObject:
   m_ObjectHideFlags: 0
@@ -795,6 +809,7 @@ GameObject:
   - component: {fileID: 7369070498500758347}
   - component: {fileID: 8313633874709827031}
   - component: {fileID: 7002168581208769732}
+  - component: {fileID: 5341232851300417637}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -864,6 +879,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "100\u6B21\u63A2\u5B9D\u5FC5\u5B9A\u83B7\u5F97\u9C9C\u54C1\u5B9D\u7269"
+--- !u!114 &5341232851300417637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2972985852202581853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10182
 --- !u!1 &3194501373201481477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1066,6 +1094,7 @@ GameObject:
   - component: {fileID: 6146448491995913950}
   - component: {fileID: 1165528826405602289}
   - component: {fileID: 7533858798716897096}
+  - component: {fileID: 3218150167887862838}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1150,6 +1179,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3218150167887862838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4898064796458299979}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10184
 --- !u!1 &4923044900321880700
 GameObject:
   m_ObjectHideFlags: 0
@@ -1347,6 +1389,7 @@ GameObject:
   - component: {fileID: 70910345278346324}
   - component: {fileID: 495549792939547536}
   - component: {fileID: 2300996724624505353}
+  - component: {fileID: 8341268561275804903}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -1431,6 +1474,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8341268561275804903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5523729796495235583}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10180
 --- !u!1 &5798365189845951622
 GameObject:
   m_ObjectHideFlags: 0
@@ -2166,6 +2222,7 @@ GameObject:
   - component: {fileID: 497667885178128358}
   - component: {fileID: 5008264443368327798}
   - component: {fileID: 4526228201366745338}
+  - component: {fileID: 904110818260172587}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2250,6 +2307,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &904110818260172587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7127849299946910399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10183
 --- !u!1 &7228162602162805773
 GameObject:
   m_ObjectHideFlags: 0

+ 70 - 0
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -515,6 +515,7 @@ GameObject:
   - component: {fileID: 7796969034276455814}
   - component: {fileID: 1685256847371958153}
   - component: {fileID: 3579563483478307139}
+  - component: {fileID: 8823835133171120684}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -599,6 +600,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.86666673, g: 0.5058824, b: 0.14117648, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8823835133171120684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 694216056308444776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10192
 --- !u!1 &909511257581152396
 GameObject:
   m_ObjectHideFlags: 0
@@ -917,6 +931,7 @@ GameObject:
   - component: {fileID: 3376946172870237539}
   - component: {fileID: 120338278017709567}
   - component: {fileID: 9127811789630958149}
+  - component: {fileID: 1545215545510873660}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -986,6 +1001,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "200\u62BD\u6311\u6218\u5DF2\u5B8C\u6210"
+--- !u!114 &1545215545510873660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1793374024918004430}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10259
 --- !u!1 &1932630478545625976
 GameObject:
   m_ObjectHideFlags: 0
@@ -1807,6 +1835,7 @@ GameObject:
   - component: {fileID: 4894137871019489262}
   - component: {fileID: 5751402451290122237}
   - component: {fileID: 4415097656486370284}
+  - component: {fileID: 8509887296616184999}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1876,6 +1905,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &8509887296616184999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4892589196280848047}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262
 --- !u!1 &5280978390038405183
 GameObject:
   m_ObjectHideFlags: 0
@@ -2674,6 +2716,7 @@ GameObject:
   - component: {fileID: 6103133270796787680}
   - component: {fileID: 9174172303824925929}
   - component: {fileID: 4377398059297220351}
+  - component: {fileID: 1102008301683451296}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (2)
@@ -2743,6 +2786,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9886\u53D62-4\u500D\u7FFB\u500D\u5956\u52B1"
+--- !u!114 &1102008301683451296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8531779723099794274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10193
 --- !u!1 &8770593840222513098
 GameObject:
   m_ObjectHideFlags: 0
@@ -2843,6 +2899,7 @@ GameObject:
   - component: {fileID: 1453335509118501595}
   - component: {fileID: 5439913488260530315}
   - component: {fileID: 3027166848902125876}
+  - component: {fileID: 1624114806214101848}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -2912,6 +2969,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "100\u6B21\u63A2\u5B9D\u5FC5\u5B9A\u83B7\u5F97\u9C9C\u54C1\u5B9D\u7269"
+--- !u!114 &1624114806214101848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8815570151867001862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10182
 --- !u!1 &8961401051079870463
 GameObject:
   m_ObjectHideFlags: 0

+ 98 - 0
Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -246,6 +246,7 @@ GameObject:
   - component: {fileID: 3834812936624691349}
   - component: {fileID: 593285393034570064}
   - component: {fileID: 7209608839195132910}
+  - component: {fileID: 3186297236251683901}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (3)
@@ -315,6 +316,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5B8C\u6210\u6B21\u6570"
+--- !u!114 &3186297236251683901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673520390365364380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10188
 --- !u!1 &1811260603699865972
 GameObject:
   m_ObjectHideFlags: 0
@@ -696,6 +710,7 @@ GameObject:
   - component: {fileID: 3758813775204660129}
   - component: {fileID: 4803806791851739352}
   - component: {fileID: 3374620118655784798}
+  - component: {fileID: 3822665200114326682}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (2)
@@ -765,6 +780,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u5956\u52B1"
+--- !u!114 &3822665200114326682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726946618110334721}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10187
 --- !u!1 &2751109958425029971
 GameObject:
   m_ObjectHideFlags: 0
@@ -1053,6 +1081,7 @@ GameObject:
   - component: {fileID: 7237139809221645204}
   - component: {fileID: 8259251194257241138}
   - component: {fileID: 3998889105098686268}
+  - component: {fileID: 2262867269727710824}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1122,6 +1151,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u603B\u79EF\u5206\u5956\u52B1"
+--- !u!114 &2262867269727710824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4550440237619649473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10190
 --- !u!1 &4607014433633812362
 GameObject:
   m_ObjectHideFlags: 0
@@ -1413,6 +1455,7 @@ GameObject:
   - component: {fileID: 3050252600027618270}
   - component: {fileID: 6195597745949149028}
   - component: {fileID: 990153844699681966}
+  - component: {fileID: 5220332990210850460}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (4)
@@ -1482,6 +1525,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u6C47\u603B"
+--- !u!114 &5220332990210850460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5721303365524040708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10189
 --- !u!1 &5789812120163190839
 GameObject:
   m_ObjectHideFlags: 0
@@ -1660,6 +1716,7 @@ GameObject:
   - component: {fileID: 5424655315515069699}
   - component: {fileID: 8805799467788941862}
   - component: {fileID: 8240048422361482980}
+  - component: {fileID: 1865176108619071008}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1729,6 +1786,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!114 &1865176108619071008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5954846971050357279}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10186
 --- !u!1 &6025665801865041190
 GameObject:
   m_ObjectHideFlags: 0
@@ -1740,6 +1810,7 @@ GameObject:
   - component: {fileID: 486793005699165421}
   - component: {fileID: 9176188176770809839}
   - component: {fileID: 8188005894248303015}
+  - component: {fileID: 7357609503517022463}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1809,6 +1880,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!114 &7357609503517022463
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6025665801865041190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10186
 --- !u!1 &6027121454098449183
 GameObject:
   m_ObjectHideFlags: 0
@@ -2250,6 +2334,7 @@ GameObject:
   - component: {fileID: 5039672387026751436}
   - component: {fileID: 7966530394382647399}
   - component: {fileID: 5462732324185025076}
+  - component: {fileID: 4959511961338959571}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2334,6 +2419,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6313726, g: 0.3254902, b: 0.06666667, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &4959511961338959571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7506350864910962600}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10185
 --- !u!1 &7617855394433935135
 GameObject:
   m_ObjectHideFlags: 0

+ 70 - 0
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -449,6 +449,7 @@ GameObject:
   - component: {fileID: 1526515506040239878}
   - component: {fileID: 9181876341202037186}
   - component: {fileID: 1659429409413804256}
+  - component: {fileID: 5277193031132899660}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -533,6 +534,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.38823533, g: 0.45098042, b: 0.3529412, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &5277193031132899660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1245667844451503244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10154
 --- !u!1 &1737360981415971026
 GameObject:
   m_ObjectHideFlags: 0
@@ -1057,6 +1071,7 @@ GameObject:
   - component: {fileID: 9037408276187403176}
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
+  - component: {fileID: 7009910568533120546}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1126,6 +1141,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4ED9\u9014\u4E8B\u4EF6"
+--- !u!114 &7009910568533120546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10151
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0
@@ -1226,6 +1254,7 @@ GameObject:
   - component: {fileID: 8060720440738292912}
   - component: {fileID: 4500106972101745355}
   - component: {fileID: 6327424440615269228}
+  - component: {fileID: 5345833806277290276}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Tips
@@ -1295,6 +1324,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6682\u65E0\u9053\u53CB\u4E8B\u4EF6"
+--- !u!114 &5345833806277290276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310031400641785489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10155
 --- !u!1 &4367645368508741333
 GameObject:
   m_ObjectHideFlags: 0
@@ -2217,6 +2259,7 @@ GameObject:
   - component: {fileID: 3138869795302671254}
   - component: {fileID: 8062631463110613129}
   - component: {fileID: 5677648083755106341}
+  - component: {fileID: 1293472729870226935}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -2286,6 +2329,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4ED9\u9014\u65E5\u5FD7"
+--- !u!114 &1293472729870226935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7546300630243016523}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10152
 --- !u!1 &7587375694572286685
 GameObject:
   m_ObjectHideFlags: 0
@@ -2397,6 +2453,7 @@ GameObject:
   - component: {fileID: 4976295221266540732}
   - component: {fileID: 5349980305419514505}
   - component: {fileID: 7303487924201986757}
+  - component: {fileID: 965679024968818397}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ShenShi
@@ -2594,6 +2651,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &965679024968818397
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10153
 --- !u!1 &7754186531390172540
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -2886,6 +2886,7 @@ GameObject:
   - component: {fileID: 5450735266542739631}
   - component: {fileID: 6371802646384107119}
   - component: {fileID: 603735249505551289}
+  - component: {fileID: 3153705677345930592}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3015,6 +3016,19 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &3153705677345930592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4662147658589944582}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10252
 --- !u!1 &4708204802070258293
 GameObject:
   m_ObjectHideFlags: 0

+ 58 - 2
Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab

@@ -345,6 +345,7 @@ GameObject:
   - component: {fileID: 2708046515207152597}
   - component: {fileID: 1851182301441702079}
   - component: {fileID: 4734895600006074142}
+  - component: {fileID: 3894974997294283614}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -414,6 +415,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u7B26\u9009\u62E9"
+--- !u!114 &3894974997294283614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1866119032993322482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10254
 --- !u!1 &2661625032725589361
 GameObject:
   m_ObjectHideFlags: 0
@@ -1017,8 +1031,29 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4902878083619623246}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!1 &291729150310018555 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 6273587929810223113}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4902878083619623246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291729150310018555}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10256
 --- !u!114 &1778556041660004066 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
@@ -1149,7 +1184,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7899468096981879552}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
 --- !u!114 &1342822691304209320 stripped
 MonoBehaviour:
@@ -1173,6 +1211,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &3552570020725593143 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7084566262572104133}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7899468096981879552
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552570020725593143}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10255
 --- !u!224 &7857197774275572282 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}

+ 14 - 0
Assets/Res/UI/DivineSence/DivineSenceItemWidget.prefab

@@ -435,6 +435,7 @@ GameObject:
   - component: {fileID: 4442685365038033268}
   - component: {fileID: 6109028314290466192}
   - component: {fileID: 6822509983602381932}
+  - component: {fileID: 4660116328016628093}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -519,6 +520,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.5764706, g: 0.21176472, b: 0.20784315, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &4660116328016628093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8931825399018571475}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10257
 --- !u!1001 &2288303650482207532
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 112 - 0
Assets/Res/UI/DivineSence/DivineSenceLevelPreviewPanel.prefab

@@ -437,6 +437,7 @@ GameObject:
   - component: {fileID: 1953295275531088506}
   - component: {fileID: 6823089077047512013}
   - component: {fileID: 8570854921528429784}
+  - component: {fileID: 2384221320201441023}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -506,6 +507,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u51E1\u7F18"
+--- !u!114 &2384221320201441023
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1357882188952523013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10245
 --- !u!1 &1534618107640290712
 GameObject:
   m_ObjectHideFlags: 0
@@ -677,6 +691,7 @@ GameObject:
   - component: {fileID: 6490261525193129931}
   - component: {fileID: 6112732395038842149}
   - component: {fileID: 9065674820633882200}
+  - component: {fileID: 4271942760454626302}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -746,6 +761,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7075\u7F18"
+--- !u!114 &4271942760454626302
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1703113548507252815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10248
 --- !u!1 &1895069949315936185
 GameObject:
   m_ObjectHideFlags: 0
@@ -963,6 +991,7 @@ GameObject:
   - component: {fileID: 8567904690125214996}
   - component: {fileID: 1918684433069406871}
   - component: {fileID: 8929737306050891042}
+  - component: {fileID: 8447115123207622703}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -1032,6 +1061,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7384\u7F18"
+--- !u!114 &8447115123207622703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2120699421538322482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10249
 --- !u!1 &2360723107977484743
 GameObject:
   m_ObjectHideFlags: 0
@@ -1372,6 +1414,7 @@ GameObject:
   - component: {fileID: 8437062692557471587}
   - component: {fileID: 5509379017443693015}
   - component: {fileID: 4017975598700128642}
+  - component: {fileID: 2956392820949068890}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1441,6 +1484,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u7B49\u7EA7"
+--- !u!114 &2956392820949068890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3567353608385730091}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10241
 --- !u!1 &3857225550868910347
 GameObject:
   m_ObjectHideFlags: 0
@@ -1452,6 +1508,7 @@ GameObject:
   - component: {fileID: 5841087033254732091}
   - component: {fileID: 2213101297011153779}
   - component: {fileID: 6395369110927611976}
+  - component: {fileID: 1964761767403918018}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1521,6 +1578,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1.13
   m_Text: "\u795E\u8BC6\u89C4\u5219\u4ECB\u7ECD:\r\n\u795E\u8BC6\u63A2\u7D22\u53EF\u83B7\u5F97\u5404\u79CD\u4E8B\u4EF6\uFF0C\u4E8B\u4EF6\u6709\u4E0D\u540C\u7684\u54C1\u8D28\uFF0C\u54C1\u8D28\u8D8A\u9AD8\u5956\u52B1\u8D8A\u4E30\u5BCC\u3002\u4E00\u6B21\u795E\u8BC6\u63A2\u7D22\u6D88\u8017100\u70B9\u795E\u8BC6\u503C\u3002\n\u8FD8\u53EF\u4EE5\u901A\u8FC7\u8F85\u52A9\u795E\u7B26\uFF0C\u63D0\u9AD8\u4E8B\u4EF6\u54C1\u8D28\u6216\u63A2\u7D22\u7279\u5B9A\u4E8B\u4EF6\u3002"
+--- !u!114 &1964761767403918018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3857225550868910347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10242
 --- !u!1 &4079336015890028538
 GameObject:
   m_ObjectHideFlags: 0
@@ -1532,6 +1602,7 @@ GameObject:
   - component: {fileID: 1720309446663711232}
   - component: {fileID: 3406395008300554457}
   - component: {fileID: 714834916712075324}
+  - component: {fileID: 1074665847757349129}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -1601,6 +1672,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5947\u7F18"
+--- !u!114 &1074665847757349129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4079336015890028538}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10247
 --- !u!1 &4173284969590541697
 GameObject:
   m_ObjectHideFlags: 0
@@ -2010,6 +2094,7 @@ GameObject:
   - component: {fileID: 8972922283024183016}
   - component: {fileID: 1865015847960453317}
   - component: {fileID: 3548068244182032158}
+  - component: {fileID: 268102595690917675}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -2079,6 +2164,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5723\u7F18"
+--- !u!114 &268102595690917675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4912977973384151251}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10250
 --- !u!1 &5211702035266187922
 GameObject:
   m_ObjectHideFlags: 0
@@ -2969,6 +3067,7 @@ GameObject:
   - component: {fileID: 1467045573459450599}
   - component: {fileID: 5454917617072517021}
   - component: {fileID: 2690234165981548269}
+  - component: {fileID: 5975292112327363555}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3038,6 +3137,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5F02\u7F18"
+--- !u!114 &5975292112327363555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7693868869523510241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10246
 --- !u!1 &8208926563230717497
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -745,6 +745,7 @@ GameObject:
   - component: {fileID: 2618842243334602427}
   - component: {fileID: 6140569329782375919}
   - component: {fileID: 8062343385206969078}
+  - component: {fileID: 2524634468106264735}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -814,6 +815,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u25C6"
+--- !u!114 &2524634468106264735
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5014351108332961964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10258
 --- !u!1 &6433875597589258302
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -2191,6 +2191,7 @@ GameObject:
   - component: {fileID: 1132527634272378842}
   - component: {fileID: 6867107770330957799}
   - component: {fileID: 521768857768353200}
+  - component: {fileID: 2772177743011391143}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2260,6 +2261,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8FFD\u8E2A\u4E2D"
+--- !u!114 &2772177743011391143
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10159
 --- !u!1 &8193172811373753691
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -414,6 +414,7 @@ GameObject:
   - component: {fileID: 2175574356500699342}
   - component: {fileID: 3162022149235310311}
   - component: {fileID: 6213336244467756100}
+  - component: {fileID: 692530347648927001}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -498,6 +499,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &692530347648927001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10223
 --- !u!1 &3427245093439295002
 GameObject:
   m_ObjectHideFlags: 0
@@ -510,6 +524,7 @@ GameObject:
   - component: {fileID: 8188347619997027446}
   - component: {fileID: 4210667942956718264}
   - component: {fileID: 5712423932741483040}
+  - component: {fileID: 7551574326622614794}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -594,6 +609,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7551574326622614794
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10224
 --- !u!1 &6015582386914595975
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -3549,6 +3549,7 @@ GameObject:
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8911828159305465162}
   - component: {fileID: 1321197118262069093}
+  - component: {fileID: 8766603438186958323}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3633,6 +3634,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.1137255, g: 0.23137257, b: 0.20000002, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &8766603438186958323
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7368366197341708070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10267
 --- !u!1 &7809232107031970724
 GameObject:
   m_ObjectHideFlags: 0

+ 42 - 0
Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -1027,6 +1027,7 @@ GameObject:
   - component: {fileID: 5059099144490991677}
   - component: {fileID: 4658788957982810149}
   - component: {fileID: 6265222927004857925}
+  - component: {fileID: 5168416859472596651}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1096,6 +1097,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6CD5\u5B9D"
+--- !u!114 &5168416859472596651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683972799645630233}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10196
 --- !u!1 &2818405479463266363
 GameObject:
   m_ObjectHideFlags: 0
@@ -1473,6 +1487,7 @@ GameObject:
   - component: {fileID: 4230674668679273989}
   - component: {fileID: 8170707317414517154}
   - component: {fileID: 6598622436281157220}
+  - component: {fileID: 7891978421642869382}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1542,6 +1557,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C5E\u6027\uFF1A"
+--- !u!114 &7891978421642869382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5008248057540541071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10194
 --- !u!1 &5182747711655341285
 GameObject:
   m_ObjectHideFlags: 0
@@ -1644,6 +1672,7 @@ GameObject:
   - component: {fileID: 4346796970422155979}
   - component: {fileID: 5625902866573920376}
   - component: {fileID: 2729956649548390542}
+  - component: {fileID: 8613698400489029809}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1713,6 +1742,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E03\u9053\u5FC3\u5883"
+--- !u!114 &8613698400489029809
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7407177216227092324}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10195
 --- !u!1 &8454043528910518791
 GameObject:
   m_ObjectHideFlags: 0

+ 98 - 0
Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -107,6 +107,7 @@ GameObject:
   - component: {fileID: 5462186991158084938}
   - component: {fileID: 4120117667128276633}
   - component: {fileID: 8801748433091037963}
+  - component: {fileID: 4148332433799508222}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -176,6 +177,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7279\u6B8A\u6548\u679C"
+--- !u!114 &4148332433799508222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741793683712924752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10200
 --- !u!1 &1048431458388444575
 GameObject:
   m_ObjectHideFlags: 0
@@ -986,6 +1000,7 @@ GameObject:
   - component: {fileID: 3901820814049949018}
   - component: {fileID: 9077695253424898362}
   - component: {fileID: 3360249867863613287}
+  - component: {fileID: 7379733412482311614}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1070,6 +1085,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6862745, g: 0.6117647, b: 0.57254905, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7379733412482311614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471604515071345865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10204
 --- !u!1 &2539860516855989072
 GameObject:
   m_ObjectHideFlags: 0
@@ -1542,6 +1570,7 @@ GameObject:
   - component: {fileID: 62797131548316216}
   - component: {fileID: 8973767117532586104}
   - component: {fileID: 2257854166180824715}
+  - component: {fileID: 943853463764434505}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1626,6 +1655,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.21176472, g: 0.38823533, b: 0.3372549, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &943853463764434505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3149521884711883608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10201
 --- !u!1 &3186814507385341761
 GameObject:
   m_ObjectHideFlags: 0
@@ -1726,6 +1768,7 @@ GameObject:
   - component: {fileID: 1618446015633265560}
   - component: {fileID: 4658420417724510445}
   - component: {fileID: 9054897281558856292}
+  - component: {fileID: 3399225419570025943}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1795,6 +1838,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u57FA\u7840\u5C5E\u6027"
+--- !u!114 &3399225419570025943
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10198
 --- !u!1 &3314419697092224364
 GameObject:
   m_ObjectHideFlags: 0
@@ -3963,6 +4019,7 @@ GameObject:
   - component: {fileID: 8345998270810602064}
   - component: {fileID: 1742658536006775814}
   - component: {fileID: 9170284339109765767}
+  - component: {fileID: 69354767690102635}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -4032,6 +4089,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6CD5\u5B9D\u6548\u679C"
+--- !u!114 &69354767690102635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6819205046936886586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10199
 --- !u!1 &6855930046191711767
 GameObject:
   m_ObjectHideFlags: 0
@@ -4044,6 +4114,7 @@ GameObject:
   - component: {fileID: 6674707642684229937}
   - component: {fileID: 6169273498034197456}
   - component: {fileID: 2715828969720676018}
+  - component: {fileID: 790167163540477963}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4128,6 +4199,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.20784315, g: 0.3921569, b: 0.49411768, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &790167163540477963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6855930046191711767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10202
 --- !u!1 &6891933565934835835
 GameObject:
   m_ObjectHideFlags: 0
@@ -4187,6 +4271,7 @@ GameObject:
   - component: {fileID: 8737435201132713237}
   - component: {fileID: 5668261920968099654}
   - component: {fileID: 6822675929848103333}
+  - component: {fileID: 9053633812066392234}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4271,6 +4356,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.5294118, g: 0.38823533, b: 0.29411766, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &9053633812066392234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7007869723404515456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10202
 --- !u!1 &7897947665373750767
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -2135,6 +2135,7 @@ GameObject:
   - component: {fileID: 4230346137702958171}
   - component: {fileID: 8911786067647200514}
   - component: {fileID: 9041634365181078547}
+  - component: {fileID: 592344222064337924}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2219,6 +2220,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.19215688, g: 0.43137258, b: 0.40000004, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &592344222064337924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4045698680392365287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10169
 --- !u!1 &4613292265912729625
 GameObject:
   m_ObjectHideFlags: 0
@@ -3863,6 +3877,7 @@ GameObject:
   - component: {fileID: 6494192655659048786}
   - component: {fileID: 6374094321362993211}
   - component: {fileID: 6294271820291261417}
+  - component: {fileID: 713215085916987482}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3947,6 +3962,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.19215688, g: 0.43137258, b: 0.40000004, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &713215085916987482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8748422954866088636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10170
 --- !u!1 &8816327462997807595
 GameObject:
   m_ObjectHideFlags: 0

+ 56 - 0
Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -458,6 +458,7 @@ GameObject:
   - component: {fileID: 6236550534434111574}
   - component: {fileID: 1526018650847726743}
   - component: {fileID: 4839312907111622284}
+  - component: {fileID: 8704922108070187347}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -542,6 +543,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.8470589, g: 0.7254902, b: 0.4431373, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &8704922108070187347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2941944296177608750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10179
 --- !u!1 &3130597206452923713
 GameObject:
   m_ObjectHideFlags: 0
@@ -1038,6 +1052,7 @@ GameObject:
   - component: {fileID: 7795755333039391946}
   - component: {fileID: 5357729916732336808}
   - component: {fileID: 8585342351763295681}
+  - component: {fileID: 5517336535545917837}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1107,6 +1122,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6302\u673A\u89C4\u5219"
+--- !u!114 &5517336535545917837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6890044827097431758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10176
 --- !u!1 &6974122640565028989
 GameObject:
   m_ObjectHideFlags: 0
@@ -1207,6 +1235,7 @@ GameObject:
   - component: {fileID: 736018531242558669}
   - component: {fileID: 2736692243949800816}
   - component: {fileID: 775907732381339675}
+  - component: {fileID: 5741420070498122393}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1276,6 +1305,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53EF\u80FD\u83B7\u5F97"
+--- !u!114 &5741420070498122393
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7651753569586649839}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10178
 --- !u!1 &8207949862918204580
 GameObject:
   m_ObjectHideFlags: 0
@@ -1496,6 +1538,7 @@ GameObject:
   - component: {fileID: 5811889443116312175}
   - component: {fileID: 2597693103234350293}
   - component: {fileID: 4631578995114678957}
+  - component: {fileID: 6669999713262919682}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1565,3 +1608,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &6669999713262919682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9211404844896670783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262

+ 70 - 0
Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

@@ -100,6 +100,7 @@ GameObject:
   - component: {fileID: 5035167302667195021}
   - component: {fileID: 3996857531579991943}
   - component: {fileID: 7675581068234204215}
+  - component: {fileID: 7727667835602078107}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -169,6 +170,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6389\u843D\u8BE6\u60C5"
+--- !u!114 &7727667835602078107
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 363035462212344119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10174
 --- !u!1 &1596459594373263505
 GameObject:
   m_ObjectHideFlags: 0
@@ -271,6 +285,7 @@ GameObject:
   - component: {fileID: 3448986095428033778}
   - component: {fileID: 700079147170673296}
   - component: {fileID: 3803316130909754873}
+  - component: {fileID: 7830982427227946356}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -340,6 +355,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6302\u673A\u6536\u76CA"
+--- !u!114 &7830982427227946356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2049999833027880694}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10171
 --- !u!1 &2532249118558326853
 GameObject:
   m_ObjectHideFlags: 0
@@ -665,6 +693,7 @@ GameObject:
   - component: {fileID: 5321997241014361333}
   - component: {fileID: 7356625214712943944}
   - component: {fileID: 5271963949917915171}
+  - component: {fileID: 2240617675617681373}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -734,6 +763,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u83B7\u5F97\u9053\u5177"
+--- !u!114 &2240617675617681373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3016613418067968727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10173
 --- !u!1 &3604333629156684956
 GameObject:
   m_ObjectHideFlags: 0
@@ -880,6 +922,7 @@ GameObject:
   - component: {fileID: 1390114855689535063}
   - component: {fileID: 7485414286195926253}
   - component: {fileID: 264577896367833749}
+  - component: {fileID: 8218447288406010425}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -949,6 +992,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!114 &8218447288406010425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4339270302534241287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10262
 --- !u!1 &4827274471633624863
 GameObject:
   m_ObjectHideFlags: 0
@@ -1726,6 +1782,7 @@ GameObject:
   - component: {fileID: 1540786413512136814}
   - component: {fileID: 6251230890227274927}
   - component: {fileID: 55703236791615156}
+  - component: {fileID: 7124722172771162832}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -1810,6 +1867,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.8470589, g: 0.7254902, b: 0.4431373, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
+--- !u!114 &7124722172771162832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7727814668973207574}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10175
 --- !u!1 &8886446535026244096
 GameObject:
   m_ObjectHideFlags: 0

+ 154 - 0
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 2197576514537598055}
   - component: {fileID: 8624296202358403133}
   - component: {fileID: 4551161929545566271}
+  - component: {fileID: 613406281800350740}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -425,6 +426,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &613406281800350740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 384269343322849443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &545300615795425504
 GameObject:
   m_ObjectHideFlags: 0
@@ -436,6 +450,7 @@ GameObject:
   - component: {fileID: 8724379656954861553}
   - component: {fileID: 1084455871667264799}
   - component: {fileID: 9037374286165453700}
+  - component: {fileID: 2818768290241486985}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -505,6 +520,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &2818768290241486985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 545300615795425504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &821592631266946925
 GameObject:
   m_ObjectHideFlags: 0
@@ -1711,6 +1739,7 @@ GameObject:
   - component: {fileID: 8712308375318904764}
   - component: {fileID: 5963447625720637767}
   - component: {fileID: 3303909127726201600}
+  - component: {fileID: 8858433976529887197}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1780,6 +1809,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "90\u8FDE\u4FDD\u5E95\u51FA\u91D1\u8272\u6321\u4F4D\u5B9D\u5377"
+--- !u!114 &8858433976529887197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2556280747425114603}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10237
 --- !u!1 &2720669039826339307
 GameObject:
   m_ObjectHideFlags: 0
@@ -1791,6 +1833,7 @@ GameObject:
   - component: {fileID: 8969851006313811870}
   - component: {fileID: 3662656345577876215}
   - component: {fileID: 1508713389770196219}
+  - component: {fileID: 8788035973780030852}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1860,6 +1903,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "10\u8FDE\u4FDD\u5E95\u51FA\u7D2B\u8272\u6321\u4F4D\u5B9D\u5377"
+--- !u!114 &8788035973780030852
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10236
 --- !u!1 &3314336736973313898
 GameObject:
   m_ObjectHideFlags: 0
@@ -1872,6 +1928,7 @@ GameObject:
   - component: {fileID: 8793441359962076526}
   - component: {fileID: 3868606778493837749}
   - component: {fileID: 2842507757105308458}
+  - component: {fileID: 8212398364123823311}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -1956,6 +2013,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8212398364123823311
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10234
 --- !u!1 &3474275561877960227
 GameObject:
   m_ObjectHideFlags: 0
@@ -2153,6 +2223,7 @@ GameObject:
   - component: {fileID: 7556215900362502466}
   - component: {fileID: 4006986155286800134}
   - component: {fileID: 2704682498779368053}
+  - component: {fileID: 2090496180395684559}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -2222,6 +2293,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u62BD\u4EE3\u91D1\u5377"
+--- !u!114 &2090496180395684559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4207721097829976971}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10232
 --- !u!1 &4243376540668156147
 GameObject:
   m_ObjectHideFlags: 0
@@ -2329,6 +2413,7 @@ GameObject:
   - component: {fileID: 1050067315303430227}
   - component: {fileID: 8972264517317569572}
   - component: {fileID: 266783762442540142}
+  - component: {fileID: 7390983343711225798}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -2398,6 +2483,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &7390983343711225798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4558952006796478470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &4846709721966904208
 GameObject:
   m_ObjectHideFlags: 0
@@ -2857,6 +2955,7 @@ GameObject:
   - component: {fileID: 528673476842239041}
   - component: {fileID: 93835371485559685}
   - component: {fileID: 1748273484820765212}
+  - component: {fileID: 4410034090924764247}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -2941,6 +3040,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &4410034090924764247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10233
 --- !u!1 &5446121015897482731
 GameObject:
   m_ObjectHideFlags: 0
@@ -3620,6 +3732,7 @@ GameObject:
   - component: {fileID: 5522755505824043809}
   - component: {fileID: 8197789312143983254}
   - component: {fileID: 9205004485099477634}
+  - component: {fileID: 6559838807607604449}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -3689,6 +3802,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &6559838807607604449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662389305889523523}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &7866375378532981335
 GameObject:
   m_ObjectHideFlags: 0
@@ -3985,6 +4111,7 @@ GameObject:
   - component: {fileID: 8975067585024914700}
   - component: {fileID: 6906539779169998035}
   - component: {fileID: 2798024686861002083}
+  - component: {fileID: 4267517252340139725}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -4054,6 +4181,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &4267517252340139725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8426370114494986623}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238
 --- !u!1 &8467925213815132010
 GameObject:
   m_ObjectHideFlags: 0
@@ -4583,6 +4723,7 @@ GameObject:
   - component: {fileID: 299358148823740969}
   - component: {fileID: 1269666230456169891}
   - component: {fileID: 1296186262974792229}
+  - component: {fileID: 5367612048591242570}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Name
@@ -4652,3 +4793,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EE3\u91D1\u5377"
+--- !u!114 &5367612048591242570
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9183658485641831872}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10238

+ 42 - 0
Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab

@@ -939,6 +939,7 @@ GameObject:
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
   - component: {fileID: 2456884504023472445}
+  - component: {fileID: 1985489301449211950}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_ShuangBei
@@ -1077,6 +1078,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &1985489301449211950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4418083923053840122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10192
 --- !u!1 &4588207117918255426
 GameObject:
   m_ObjectHideFlags: 0
@@ -1757,6 +1771,7 @@ GameObject:
   - component: {fileID: 6103133270796787680}
   - component: {fileID: 9174172303824925929}
   - component: {fileID: 4377398059297220351}
+  - component: {fileID: 6831221917211705353}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (2)
@@ -1826,6 +1841,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9886\u53D62-4\u500D\u7FFB\u500D\u5956\u52B1"
+--- !u!114 &6831221917211705353
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8531779723099794274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10193
 --- !u!1 &9069997952576734485
 GameObject:
   m_ObjectHideFlags: 0
@@ -1838,6 +1866,7 @@ GameObject:
   - component: {fileID: 3168964478753531872}
   - component: {fileID: 3768501890861781930}
   - component: {fileID: 2654173926048081410}
+  - component: {fileID: 6816519898809452594}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -1922,6 +1951,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &6816519898809452594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9069997952576734485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10270
 --- !u!1 &9098043191021390043
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -323,6 +323,7 @@ GameObject:
   - component: {fileID: 5433355474203580553}
   - component: {fileID: 5168015494678081087}
   - component: {fileID: 1207217417030577173}
+  - component: {fileID: 1883681821019418846}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -392,6 +393,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u5883\u754C"
+--- !u!114 &1883681821019418846
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760249640184550313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10217
 --- !u!1 &975683146836102746
 GameObject:
   m_ObjectHideFlags: 0
@@ -1443,6 +1457,7 @@ GameObject:
   - component: {fileID: 3549792637730888341}
   - component: {fileID: 4186974081922981718}
   - component: {fileID: 6812991800126589188}
+  - component: {fileID: 4706971563289100342}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -1512,6 +1527,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u6548\u679C"
+--- !u!114 &4706971563289100342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4826391284103991921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10218
 --- !u!1 &4882534291422396107
 GameObject:
   m_ObjectHideFlags: 0

+ 112 - 0
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -771,6 +771,7 @@ GameObject:
   - component: {fileID: 4927574875558780897}
   - component: {fileID: 2133244237143657967}
   - component: {fileID: 1780334426314849626}
+  - component: {fileID: 510276586662715379}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GongFaCount
@@ -840,6 +841,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E00\u952E\u88C5\u914D"
+--- !u!114 &510276586662715379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675307928623745481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10211
 --- !u!1 &760159596962817389
 GameObject:
   m_ObjectHideFlags: 0
@@ -851,6 +865,7 @@ GameObject:
   - component: {fileID: 4735643001707298055}
   - component: {fileID: 6645589002682933467}
   - component: {fileID: 8539869173354091990}
+  - component: {fileID: 1065497139874792312}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -920,6 +935,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u76D8"
+--- !u!114 &1065497139874792312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 760159596962817389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10206
 --- !u!1 &857437492319237345
 GameObject:
   m_ObjectHideFlags: 0
@@ -2274,6 +2302,7 @@ GameObject:
   - component: {fileID: 87607927935484462}
   - component: {fileID: 6314345131758368494}
   - component: {fileID: 9175187348211492529}
+  - component: {fileID: 8190567843051848756}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2343,6 +2372,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4FE1\u606F"
+--- !u!114 &8190567843051848756
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135059945273132741}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10216
 --- !u!1 &2199692367964551178
 GameObject:
   m_ObjectHideFlags: 0
@@ -3520,6 +3562,7 @@ GameObject:
   - component: {fileID: 4514347021073670849}
   - component: {fileID: 3642748124106631649}
   - component: {fileID: 4782197136162955827}
+  - component: {fileID: 2812138280631574750}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Setting
@@ -3656,6 +3699,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &2812138280631574750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3581938487787395720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10207
 --- !u!1 &3891518416558775222
 GameObject:
   m_ObjectHideFlags: 0
@@ -3668,6 +3724,7 @@ GameObject:
   - component: {fileID: 8438237142757567239}
   - component: {fileID: 1461499720874115526}
   - component: {fileID: 7136091248352913582}
+  - component: {fileID: 7241239895409799409}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3752,6 +3809,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7241239895409799409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891518416558775222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10214
 --- !u!1 &3898641425973088963
 GameObject:
   m_ObjectHideFlags: 0
@@ -4984,6 +5054,7 @@ GameObject:
   - component: {fileID: 4727156979047918535}
   - component: {fileID: 2704694145830204549}
   - component: {fileID: 5048207027985940991}
+  - component: {fileID: 3891197051174853768}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5068,6 +5139,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3891197051174853768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5885840101328355703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10212
 --- !u!1 &6270492250459322942
 GameObject:
   m_ObjectHideFlags: 0
@@ -6373,6 +6457,7 @@ GameObject:
   - component: {fileID: 489359079058652538}
   - component: {fileID: 8197373045940010032}
   - component: {fileID: 566360598316617976}
+  - component: {fileID: 3268066186942309884}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -6457,6 +6542,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3268066186942309884
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8374476484755925391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10213
 --- !u!1 &8428897132685908306
 GameObject:
   m_ObjectHideFlags: 0
@@ -6468,6 +6566,7 @@ GameObject:
   - component: {fileID: 5985873034990668332}
   - component: {fileID: 3339769281478272295}
   - component: {fileID: 3866877181325385980}
+  - component: {fileID: 5304470405785004291}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Tips
@@ -6537,6 +6636,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63D0\u793A\uFF1A\u70B9\u51FB\u529F\u6CD5\u8FDB\u884C\u88C5\u914D"
+--- !u!114 &5304470405785004291
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8428897132685908306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10215
 --- !u!1 &8729277598116330670
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -580,6 +580,7 @@ GameObject:
   - component: {fileID: 7495592736081618043}
   - component: {fileID: 5728318949835301204}
   - component: {fileID: 5712998391856636078}
+  - component: {fileID: 2596033370412433455}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main (1)
@@ -695,6 +696,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &2596033370412433455
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1808984493116565295}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10161
 --- !u!1 &1881408301506554395
 GameObject:
   m_ObjectHideFlags: 0
@@ -1705,6 +1719,7 @@ GameObject:
   - component: {fileID: 7012158455063748255}
   - component: {fileID: 4290280934127662415}
   - component: {fileID: 1967428217266383594}
+  - component: {fileID: 5722501915926636096}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main (1)
@@ -1820,6 +1835,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &5722501915926636096
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5884159851099503130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10160
 --- !u!1 &6002680713102466570
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 4 - 4
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -86,9 +86,9 @@ namespace Fort23.Mono
             StartRoot.gameObject.SetActive(SummonData.isSummonSocre);
             if (SummonData.isSummonSocre)
             {
-                Text_JingDu.text =
-                    $"当前进度:{SummonData.drawHistory.Count * 10}/{_openBoxConfig.ProgressRewardChoukaCount}";
-                Text_Score.text = $"目前得分:{SummonData.score}";
+                Text_JingDu.text = LanguageManager.Instance.Text(10260, SummonData.drawHistory.Count * 10,
+                    _openBoxConfig.ProgressRewardChoukaCount);
+                Text_Score.text = LanguageManager.Instance.Text(10261, SummonData.score);
 
                 OpenBoxScoreRule openBoxScoreRule = CheckAchievements(SummonData);
                 if (openBoxScoreRule.ID != 0)
@@ -227,7 +227,7 @@ namespace Fort23.Mono
                 // await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }
-            
+
             AudioManager.Instance.PlayAudio("ui_chouqugongfa.wav");
         }
     }

+ 2 - 1
Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using GameLogic.Bag;
 using UnityEngine.UI;
@@ -38,7 +39,7 @@ namespace Fort23.Mono
         {
             this.lingquCallBack = lingquCallBack;
             _openBoxProgressReward = openBoxProgressReward;
-            Text_Name.text = $"累计达到 {openBoxProgressReward.TotalScore}";
+            Text_Name.text = $"{LanguageManager.Instance.Text(10191)} {openBoxProgressReward.TotalScore}";
             for (var i = 0; i < openBoxProgressReward.PrizeID.Length; i++)
             {
                 WidgetItem widgetItem =

+ 6 - 7
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -933,9 +933,8 @@ namespace Fort23.Mono
                 allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
             }
 
-            Text_Cd.text = "功法盘运行周期:" +
-                           ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
-                               PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd) + "s";
+            Text_Cd.text =  LanguageManager.Instance.Text(10208, ((PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum *
+                PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000) + addcd));
         }
 
         public List<int> GetNumbers(int start, float offset)
@@ -1004,10 +1003,10 @@ namespace Fort23.Mono
             }
 
 
-            Text_GongFaCount.text =
-                $"功法数量:{GetMainGongFaCount()}/{PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum}";
-            Text_FuZhuGongFaCount.text =
-                $"辅助功法:{GetPassiveGongFaCount()}/{PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum}";
+            Text_GongFaCount.text = LanguageManager.Instance.Text(10210, GetMainGongFaCount(),
+                PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum);
+                Text_FuZhuGongFaCount.text = LanguageManager.Instance.Text(10209, GetPassiveGongFaCount(),
+                    PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum);
         }
 
         private async void OnClick(ItemWidgetBasic obj)

+ 3 - 1
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -149,7 +150,8 @@ namespace Fort23.Mono
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
                            PlayerManager.Instance.gameConstantConfig.DetectEventCount;
 
-            Text_ShenShiCount.text = $"神识({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
+            Text_ShenShiCount.text =   LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
+          
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);

+ 4 - 2
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -72,7 +73,7 @@ namespace Fort23.Mono
         private void Slider_Count_OnValueChanged(float value)
         {
             useCount = (int)value;
-            Text_Count.text = $"神识探索:{value}次";
+            Text_Count.text = LanguageManager.Instance.Text(10253,value);
             // Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
             Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value }/{maxCount})";
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
@@ -95,7 +96,8 @@ namespace Fort23.Mono
             divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
             HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
 
-            Text_Level.text = $"神识等级:{AccountFileInfo.Instance.playerData.divineSenseLevel}级";
+            Text_Level.text =
+                LanguageManager.Instance.Text(10251, AccountFileInfo.Instance.playerData.divineSenseLevel);
             Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/{divineSenseConfig.exp}";
             Slider_Exp.maxValue = divineSenseConfig.exp;
             Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;

+ 3 - 2
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceLevelPreviewPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -40,7 +41,7 @@ namespace Fort23.Mono
                 CurrentBls[i].text = $"{probabilities[i] * 100:F2}%";
             }
 
-            Text_CurrentLevel.text = $"当前等级预览:{AccountFileInfo.Instance.playerData.divineSenseLevel}";
+            Text_CurrentLevel.text = LanguageManager.Instance.Text(10243,AccountFileInfo.Instance.playerData.divineSenseLevel);
 
             if (divineSenseConfig.ID >= divineSenseConfigs.Length)
             {
@@ -59,7 +60,7 @@ namespace Fort23.Mono
                     NextBls[i].text = $"{probabilities1[i] * 100:F2}%";
                 }
 
-                Text_NextLevel.text = $"下级预览:{AccountFileInfo.Instance.playerData.divineSenseLevel + 1}";
+                Text_NextLevel.text = LanguageManager.Instance.Text(10244,AccountFileInfo.Instance.playerData.divineSenseLevel + 1);
             }
 
             return base.AsyncInit(uiData);

+ 3 - 3
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -108,7 +108,7 @@ namespace Fort23.Mono
             }
 
 
-            Text_Go.text = "前往";
+            Text_Go.text = LanguageManager.Instance.Text(10156);
             if (eventLinkData == null || eventLinkData.eventConditions == null ||
                 eventLinkData.eventConditions.Count == 0)
             {
@@ -143,7 +143,7 @@ namespace Fort23.Mono
 
                     if (evenkConfig.ResultType == 0 || evenkConfig.ResultType == 3)
                     {
-                        Text_Go.text = "完成";
+                        Text_Go.text = LanguageManager.Instance.Text(10156);
                     }
                 }
                 else
@@ -157,7 +157,7 @@ namespace Fort23.Mono
 
             if (eventList.isCompleted)
             {
-                Text_Go.text = "已完成";
+                Text_Go.text = LanguageManager.Instance.Text(10240);
                 Btn_Go.image.color = new Color32(200, 199, 199, 255);
             }
             else

+ 14 - 12
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -175,10 +175,10 @@ namespace Fort23.Mono
             _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;
-            Text_Level1.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
-            Text_Level.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
+            Text_Level1.text = LanguageManager.Instance.Text(10222, _skillInfo.SkillPowerupConfig.ID.ToString());
+            Text_Level.text = LanguageManager.Instance.Text(10222, _skillInfo.SkillPowerupConfig.ID.ToString());
 
-            Text_SkillCd.text = $"加功法盘速度:{skillConfig.addcd}秒";
+            Text_SkillCd.text = LanguageManager.Instance.Text(10208, skillConfig.addcd);
 
             // skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
@@ -323,8 +323,8 @@ namespace Fort23.Mono
 
 
                     Text_NextLevel.transform.parent.gameObject.SetActive(true);
-                    Text_NextLevel.text =
-                        $"{_skillInfo.SkillPowerupConfig.ID}级  →  {nextSkillInfo.SkillPowerupConfig.ID}级";
+                    Text_NextLevel.text = LanguageManager.Instance.Text(10221, _skillInfo.SkillPowerupConfig.ID,
+                        nextSkillInfo.SkillPowerupConfig.ID);
 
                     LayoutRebuilder.ForceRebuildLayoutImmediate(Text_NextLevel.GetComponent<RectTransform>());
                     LayoutRebuilder.ForceRebuildLayoutImmediate(Text_NextLevel.transform.parent
@@ -347,7 +347,7 @@ namespace Fort23.Mono
                     else
                     {
                         Btn_UpGrade.gameObject.transform.RecoverColor();
-                        Text_UpGrade.text = "升级";
+                        Text_UpGrade.text = LanguageManager.Instance.Text(10220);
                         UpGradeItemRoot.SetActive(true);
                         for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
                         {
@@ -370,8 +370,10 @@ namespace Fort23.Mono
                 else
                 {
                     Text_NextLevel.transform.parent.gameObject.SetActive(true);
-                    Text_NextLevel.text = $"{_skillInfo.skillConfig.level}级  →  Max级";
-                    Text_UpGrade.text = "已满级";
+
+                    Text_NextLevel.text = LanguageManager.Instance.Text(10221, _skillInfo.skillConfig.level,
+                        "Max");
+                    Text_UpGrade.text = LanguageManager.Instance.Text(10264);
                     Btn_UpStar.gameObject.SetActive(false);
                     UpGradeItemRoot.SetActive(false);
                 }
@@ -389,7 +391,7 @@ namespace Fort23.Mono
                 if (_skillInfo.skillConfig.level < 6)
                 {
                     Btn_UpStar.gameObject.transform.RecoverColor();
-                    Text_UpStar.text = "领悟";
+                    Text_UpStar.text = LanguageManager.Instance.Text(10219);
                     Btn_UpGrade.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(true);
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_skillInfo.skillConfig.PieceID);
@@ -411,7 +413,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_UpStar.text = "已满星";
+                    Text_UpStar.text = LanguageManager.Instance.Text(10265);
                     Btn_UpGrade.gameObject.SetActive(false);
                     UpStarItemRoot.SetActive(false);
                 }
@@ -427,8 +429,8 @@ namespace Fort23.Mono
                 Btn_UpStar.gameObject.SetActive(true);
                 UpStarItemRoot.SetActive(false);
                 UpGradeItemRoot.SetActive(false);
-                Text_UpStar.text = "领悟";
-                Text_UpGrade.text = "升级";
+                Text_UpStar.text = LanguageManager.Instance.Text(10219);
+                Text_UpGrade.text = LanguageManager.Instance.Text(10220);
                 Btn_UpGrade.gameObject.transform.RecoverColor();
                 foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
                 {

+ 19 - 10
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -176,11 +176,13 @@ namespace Fort23.Mono
             // HeroAttributeWidgets.Add(heroAttributeWidget);
             Text_Jingjie1.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]);
-            Text_Jingjie.text =
+            string jingjie =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) + "(" +
-                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 + "/10)";
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
+    
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -204,12 +206,15 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text =
-                    $"修炼速度:{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{PlayerManager.TimeToHSM(miao)}";
+                Text_Speed.text = LanguageManager.Instance.Text(10230,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
+           
             }
             else
             {
-                Text_Speed.text = $"修炼速度:{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 可以突破";
+  
+                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
 
@@ -218,11 +223,11 @@ namespace Fort23.Mono
 
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
             {
-                Text_TuPo.text = "突破";
+                Text_TuPo.text = LanguageManager.Instance.Text(10228);
             }
             else
             {
-                Text_TuPo.text = "渡劫";
+                Text_TuPo.text = LanguageManager.Instance.Text(10229);
             }
         }
 
@@ -243,11 +248,15 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text = $"修炼速度:{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{PlayerManager.TimeToHSM(miao)}秒";
+                Text_Speed.text = LanguageManager.Instance.Text(10230,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
+           
             }
             else
             {
-                Text_Speed.text = $"修炼速度:{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 可以突破";
+  
+                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                    PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
         }
 

+ 3 - 3
Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -412,7 +412,7 @@ namespace Fort23.Mono
             {
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
                                       faBaoInfo.FabaoPowerupConfig.ID;
-                Text_Power.text = $"强度:{faBaoInfo.qiangDu}";
+                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}:{faBaoInfo.qiangDu}";
                 Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
                     faBaoInfo.effectValue);
 
@@ -436,11 +436,11 @@ namespace Fort23.Mono
                     //tupo
                     if (_nextFaBaoInfo.FabaoPowerupConfig.SkillLevel != selectedFaBaoInfo.FabaoPowerupConfig.SkillLevel)
                     {
-                        Text_UpGrade.text = "突破";
+                        Text_UpGrade.text = LanguageManager.Instance.Text(10205);
                     }
                     else
                     {
-                        Text_UpGrade.text = "升级";
+                        Text_UpGrade.text =  LanguageManager.Instance.Text(10203);
                     }
 
                     Text_UpGrade.gameObject.SetActive(true);

+ 14 - 7
Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -34,13 +35,16 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            Text_Desc.text = $"挂机上限时间:{UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime)}";
+            Text_Desc.text = LanguageManager.Instance.Text(10177,
+                UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
 
             List<QiankundaiConfig> qiankundaiConfigs = new List<QiankundaiConfig>();
             foreach (var playerDataQiankundaiData in AccountFileInfo.Instance.playerData.QiankundaiDatas)
             {
-                QiankundaiConfig qiankundaiConfig = ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
-                if (PlayerManager.Instance.myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] && PlayerManager.Instance.myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
+                QiankundaiConfig qiankundaiConfig =
+                    ConfigComponent.Instance.Get<QiankundaiConfig>(playerDataQiankundaiData.id);
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID >= qiankundaiConfig.dropLevel[0] &&
+                    PlayerManager.Instance.myHero.powerUpConfig.ID <= qiankundaiConfig.dropLevel[1])
                 {
                     qiankundaiConfigs.Add(qiankundaiConfig);
                 }
@@ -58,10 +62,12 @@ namespace Fort23.Mono
                 {
                     if (qiankundaiConfig.DropCount[i] < 0)
                     {
-                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                        List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                            qiankundaiConfig.DropCount[i]);
                         foreach (var info in itemInfo)
                         {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            WidgetItem widgetItem =
+                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                             widgetItem.InitWidget(new ItemInfo(info.itemID, 0));
                             items.Add(widgetItem);
                         }
@@ -71,7 +77,8 @@ namespace Fort23.Mono
                         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.ChoukaID[i]);
                         foreach (var i1 in dropConfig.showItemId)
                         {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            WidgetItem widgetItem =
+                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
                             widgetItem.InitWidget(new ItemInfo(i1, 0));
                             items.Add(widgetItem);
                         }
@@ -84,7 +91,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top,isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top, isShowBG: true);
         }
 
         public override void Close()

+ 11 - 4
Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using GameLogic.Bag;
@@ -47,7 +48,8 @@ namespace Fort23.Mono
                     {
                         for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
                         {
-                            List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i], qiankundaiConfig.DropCount[i]);
+                            List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
+                                qiankundaiConfig.DropCount[i]);
                             foreach (var info in itemInfo)
                             {
                                 PlayerManager.Instance.BagController.AddItem(info);
@@ -64,7 +66,8 @@ namespace Fort23.Mono
 
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer = 0;
                 AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Clear();
-                AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime = TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
+                AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime =
+                    TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
                 AccountFileInfo.Instance.SavePlayerData();
 
                 RewardsPanel.OpenPanel(itemInfos);
@@ -88,7 +91,11 @@ namespace Fort23.Mono
             }
 
             items.Clear();
-            Text_Desc.text = $"挂机时间:{UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer)}/{UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime)}";
+   
+            Text_Desc.text =
+                LanguageManager.Instance.Text(10172,
+                    UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
+                    UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
@@ -99,7 +106,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top,isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top, isShowBG: true);
         }
 
         public override void Close()

+ 9 - 8
Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                 {
                     if (Icon_Ads.gameObject.activeSelf)
                     {
-                        tenCion.text = "免费";
+                        tenCion.text = LanguageManager.Instance.Text(10235);
                         Icon_Ads.gameObject.SetActive(false);
                     }
                 }
@@ -161,7 +162,7 @@ namespace Fort23.Mono
                 {
                     if (!Icon_Ads.gameObject.activeSelf)
                     {
-                        tenCion.text = "今日免费次数已经用完";
+                        tenCion.text = LanguageManager.Instance.Text(10268);
                         Icon_Ads.gameObject.SetActive(true);
                     }
                 }
@@ -185,7 +186,7 @@ namespace Fort23.Mono
                 {
                     if (oneBiaoJi)
                     {
-                        onCion.text = "免费";
+                        onCion.text = LanguageManager.Instance.Text(10235);
                         oneBiaoJi = false;
                         oneButton.image.GetComponent<MyImage>().IsGray = false;
                     }
@@ -194,7 +195,7 @@ namespace Fort23.Mono
                 {
                     if (!oneBiaoJi)
                     {
-                        onCion.text = "今日免费次数已经用完";
+                        onCion.text = LanguageManager.Instance.Text(10268);
                         oneBiaoJi = true;
                         oneButton.image.GetComponent<MyImage>().IsGray = false;
                     }
@@ -210,12 +211,12 @@ namespace Fort23.Mono
             if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
-                tenCion.text = "免费";
+                tenCion.text =  LanguageManager.Instance.Text(10235);
             }
             //今日次数已用完
             else if (summonData.tenFreeCount >= openBoxConfig.oneConsumeFreePara_1[1])
             {
-                onCion.text = "进入免费次数已经用完";
+                onCion.text = LanguageManager.Instance.Text(10268);
             }
             else
             {
@@ -224,13 +225,13 @@ namespace Fort23.Mono
             if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] &&
                 PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
-                onCion.text = "免费";
+                onCion.text =  LanguageManager.Instance.Text(10235);
                 oneButton.image.GetComponent<MyImage>().IsGray = false;
                 oneBiaoJi = true;
             }
             else if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
             {
-                onCion.text = "进入免费次数已经用完";
+                onCion.text = LanguageManager.Instance.Text(10268);
                 oneButton.image.GetComponent<MyImage>().IsGray = true;
                 oneBiaoJi = false;
             }

+ 1 - 1
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -233,7 +233,7 @@ namespace Fort23.Mono
                     xianTuDatas.Add(xianTuData2);
                 }
 
-                xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName) + " (" + count + "/" + allCount + ")";
+                xianTuData.name = LanguageManager.Instance.Text(10225, LanguageManager.Instance.Text(bigMapConfig.mapName),count,allCount) ;
             }
         }
 

+ 2 - 2
Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs

@@ -37,7 +37,7 @@ namespace Fort23.Mono
                 _bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(id);
                 if (_bigMapConfig.ID == 0)
                 {
-                    Text_Name.text = "全部";
+                    Text_Name.text = LanguageManager.Instance.Text(10163);
                 }
                 else
                 {
@@ -50,7 +50,7 @@ namespace Fort23.Mono
 
                 if (_placesConfig.ID == 0)
                 {
-                    Text_Name.text = "全部";
+                    Text_Name.text = LanguageManager.Instance.Text(10163);
                 }
                 else
                 {

BIN
Excel2Json/Excel/Language.xlsx


+ 57 - 275
UserSettings/Layouts/default-2022.dwlt

@@ -1,54 +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: -2553
-    y: 377
-    width: 2560
-    height: 1015
-  m_ShowMode: 0
-  m_Title: 
-  m_RootView: {fileID: 5}
-  m_MinSize: {x: 100, y: 121}
-  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: -2054
-    y: 328
-    width: 892
-    height: 541
-  m_ShowMode: 0
-  m_Title: Console
-  m_RootView: {fileID: 7}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,114 +19,12 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 8}
+  m_Title: Game
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !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: HotReloadWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 2560
-    height: 1015
-  m_MinSize: {x: 100, y: 121}
-  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: 2560
-    height: 1015
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 166
-  draggingID: 0
---- !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: ConsoleWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 892
-    height: 541
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  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: 892
-    height: 541
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 18
-  draggingID: 0
---- !u!114 &8
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -187,9 +37,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 10}
-  - {fileID: 11}
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -202,7 +52,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -224,7 +74,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,10 +87,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 15}
-  - {fileID: 12}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 9}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -250,9 +100,9 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 66
+  controlID: 105
   draggingID: 0
---- !u!114 &11
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -273,7 +123,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -292,14 +142,14 @@ MonoBehaviour:
     y: 0
     width: 411
     height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,12 +170,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -346,12 +196,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -361,7 +211,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -372,82 +222,14 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 23}
-  - {fileID: 22}
-  - {fileID: 18}
-  m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &16
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f62a84c0b148b0a4582bdd9f1a69e6d3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: ' Hot Reload'
-    m_Image: {fileID: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -2553
-    y: 377
-    width: 2560
-    height: 994
-  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
---- !u!114 &17
-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: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: -2054
-    y: 328
-    width: 892
-    height: 520
-  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
---- !u!114 &18
+  - {fileID: 15}
+  - {fileID: 14}
+  - {fileID: 10}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -517,7 +299,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &19
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -556,7 +338,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 78faffff
+      m_ExpandedIDs: 58eb3cffa6d33dff1ad73fffd42d4bffec2d4bfff02d4bfff42d4bff022e4bffb24e5fffb84e5fff380d68ff3e0d68ff600e68ff780e68ff7c0e68ff8e0e68ff40236aff46236aff3ce072ff4ee072ff76bd89ff504eb2ff624eb2ff9cf4ffffa2f4ffffc4f5ffffe2f5ffffe6f5fffff4f5ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -572,7 +354,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 12}
+        m_ClientGUIView: {fileID: 6}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -580,7 +362,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &20
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -627,7 +409,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &21
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -662,7 +444,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: DivineSenceEventPreviewPanel
+    m_NameFilter: gamerun
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -672,24 +454,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/DivineSence
+    - Assets/Res/UI/SkillSelectPanel
     m_Globs: []
-    m_OriginalText: DivineSenceEventPreviewPanel
+    m_OriginalText: gamerun
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/DivineSence
+  - Assets/Res/UI/SkillSelectPanel
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 6cc80000
-    m_LastClickedID: 51308
-    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000000ca9a3b
+    m_SelectedIDs: 8cc80000
+    m_LastClickedID: 51340
+    m_ExpandedIDs: 00000000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac8000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -717,7 +499,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c80000
+    m_ExpandedIDs: 00000000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000004c8000006c8000008c800000ac80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -744,7 +526,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 784b0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -761,7 +543,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -773,7 +555,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 115
---- !u!114 &22
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -871,7 +653,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &23
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1247,9 +1029,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 48}
+      snapOffset: {x: -200, y: -55}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapCorner: 3
       id: Hot Reload
       index: 12
       layout: 4
@@ -1266,9 +1048,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.11300865, y: -1.5106583, z: 430.86832}
+    m_Target: {x: -0.20906934, y: 0.6829152, z: -0.011603642}
     speed: 2
-    m_Value: {x: -0.11300865, y: -1.5106583, z: 430.86832}
+    m_Value: {x: -0.24608578, y: 0.70919997, z: -0.012543052}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1318,9 +1100,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.2990048
+    m_Target: 1.9936346
     speed: 2
-    m_Value: 3.2990048
+    m_Value: 2.0875754
   m_Ortho:
     m_Target: 1
     speed: 2

Некоторые файлы не были показаны из-за большого количества измененных файлов