lzx преди 1 ден
родител
ревизия
414786442a
променени са 36 файла, в които са добавени 1411 реда и са изтрити 51 реда
  1. 1 1
      Assets/Res/Aduio/UI/combat_win.wav.meta
  2. 1 1
      Assets/Res/Aduio/UI/ui_button.ogg.meta
  3. 98 0
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  4. 56 0
      Assets/Res/UI/BoxPanel/BoxPanel.prefab
  5. 14 0
      Assets/Res/UI/BoxPanel/GachaPanel.prefab
  6. 28 0
      Assets/Res/UI/DivineSence/BossInfoPanel.prefab
  7. 42 0
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab
  8. 14 0
      Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab
  9. 14 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab
  10. 28 0
      Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab
  11. 28 0
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  12. 14 0
      Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab
  13. 56 0
      Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab
  14. 84 0
      Assets/Res/UI/MainPanel/MainPanel.prefab
  15. 28 0
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  16. 14 0
      Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab
  17. 14 0
      Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab
  18. 28 0
      Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab
  19. 1 1
      Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab
  20. 607 0
      Assets/Res/UI/SkillMassgePanel.prefab
  21. 7 0
      Assets/Res/UI/SkillMassgePanel.prefab.meta
  22. 126 0
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  23. 28 0
      Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab
  24. 1 1
      Assets/Scripts/Core/Audio/AudioButton.cs
  25. 3 1
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  26. 5 0
      Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs
  27. 2 0
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  28. 2 0
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs
  29. 40 40
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs
  30. 4 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  31. 8 1
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs
  32. 8 2
      Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs
  33. 1 1
      Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs
  34. 3 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs
  35. 3 1
      Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs
  36. 0 0
      Assets/StreamingAssets/assetConfig.txt

+ 1 - 1
Assets/Res/Aduio/UI/combat_win.wav.meta

@@ -13,7 +13,7 @@ AudioImporter:
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}
-  forceToMono: 0
+  forceToMono: 1
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

+ 1 - 1
Assets/Res/Aduio/UI/ui_button.ogg.meta

@@ -13,7 +13,7 @@ AudioImporter:
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}
-  forceToMono: 0
+  forceToMono: 1
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

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

@@ -1003,6 +1003,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3250744888703642702}
   - component: {fileID: 9120908431640298670}
+  - component: {fileID: 8215570333168314116}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: bnt_shengShi
@@ -1077,6 +1078,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8215570333168314116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1695594006432185856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1763543629339751110
 GameObject:
   m_ObjectHideFlags: 0
@@ -1165,6 +1179,7 @@ GameObject:
   - component: {fileID: 4181439185128367319}
   - component: {fileID: 2609989254926019074}
   - component: {fileID: 759492161019403368}
+  - component: {fileID: 7252785412647633890}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Menu
@@ -1288,6 +1303,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7252785412647633890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2349479014257640583
 GameObject:
   m_ObjectHideFlags: 0
@@ -2158,6 +2186,7 @@ GameObject:
   - component: {fileID: 6167623955488994832}
   - component: {fileID: 7753631802842447130}
   - component: {fileID: 553848956453578161}
+  - component: {fileID: 5335756367815044491}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Shop
@@ -2355,6 +2384,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &5335756367815044491
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4816422879295191460}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4883639511437899985
 GameObject:
   m_ObjectHideFlags: 0
@@ -3294,6 +3336,7 @@ GameObject:
   - component: {fileID: 4164584344635147333}
   - component: {fileID: 4539428625316042701}
   - component: {fileID: 8481861464388171268}
+  - component: {fileID: 7223344407103502978}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_DongFu
@@ -3491,6 +3534,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7223344407103502978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6600899041924302467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6972003309492748989
 GameObject:
   m_ObjectHideFlags: 0
@@ -3505,6 +3561,7 @@ GameObject:
   - component: {fileID: 2988647656428222839}
   - component: {fileID: 8687067159130349924}
   - component: {fileID: 1550958269248561588}
+  - component: {fileID: 7940123243640709996}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_GongFa
@@ -3702,6 +3759,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7940123243640709996
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6972003309492748989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6989890744348440139
 GameObject:
   m_ObjectHideFlags: 0
@@ -3928,6 +3998,7 @@ GameObject:
   - component: {fileID: 9062925167079628804}
   - component: {fileID: 3259496073566101817}
   - component: {fileID: 1834289658214911251}
+  - component: {fileID: 6561864756815396146}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon1
@@ -4050,6 +4121,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6561864756815396146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8859662043645165086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9122554430680811667
 GameObject:
   m_ObjectHideFlags: 0
@@ -4064,6 +4148,7 @@ GameObject:
   - component: {fileID: 553404141406869920}
   - component: {fileID: 6088456933348836006}
   - component: {fileID: 6914948721015485670}
+  - component: {fileID: 3691452578137234337}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_HeroInfomation
@@ -4261,3 +4346,16 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &3691452578137234337
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9122554430680811667}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button

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

@@ -553,6 +553,7 @@ GameObject:
   - component: {fileID: 2476547123357523038}
   - component: {fileID: 4787805764913935495}
   - component: {fileID: 4503408883972826744}
+  - component: {fileID: 2646849737300079892}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenButton
@@ -679,6 +680,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2646849737300079892
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2832511953393709571}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2874684587771247412
 GameObject:
   m_ObjectHideFlags: 0
@@ -1518,6 +1532,7 @@ GameObject:
   - component: {fileID: 2971171615382265200}
   - component: {fileID: 3399192810761971074}
   - component: {fileID: 410208381731937681}
+  - component: {fileID: 9021132201883759791}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Score
@@ -1641,6 +1656,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &9021132201883759791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6320631392713871374
 GameObject:
   m_ObjectHideFlags: 0
@@ -2234,6 +2262,7 @@ GameObject:
   - component: {fileID: 8422212410502206005}
   - component: {fileID: 7583580464878605426}
   - component: {fileID: 3394084652991186606}
+  - component: {fileID: 2931040312717943506}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: oneButton
@@ -2360,6 +2389,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2931040312717943506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7228162602162805773}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &7758839808363013551
 GameObject:
   m_ObjectHideFlags: 0
@@ -2468,6 +2510,7 @@ GameObject:
   - component: {fileID: 6574333515156057038}
   - component: {fileID: 5188705645907806893}
   - component: {fileID: 8840482638861773983}
+  - component: {fileID: 2263477818664029553}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Gl
@@ -2591,6 +2634,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2263477818664029553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8763388957352667591}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9137321245016860518
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1540,6 +1540,7 @@ GameObject:
   - component: {fileID: 751266163501733369}
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
+  - component: {fileID: 8212985562436809507}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: fanhuiButton
@@ -1665,6 +1666,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8212985562436809507
+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: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4470634333790369813
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -743,6 +743,7 @@ GameObject:
   - component: {fileID: 2934276402299459566}
   - component: {fileID: 2433990691951363383}
   - component: {fileID: 3169074378938001994}
+  - component: {fileID: 8377263828955554182}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Ok
@@ -866,6 +867,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8377263828955554182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3025038015932564937
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,6 +892,7 @@ GameObject:
   - component: {fileID: 8089809648900348943}
   - component: {fileID: 6203446928090234941}
   - component: {fileID: 8494958331963905743}
+  - component: {fileID: 1285710428779438375}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Cancel
@@ -1001,6 +1016,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1285710428779438375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3025038015932564937}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3375656862256571646
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 1417190639178892933}
   - component: {fileID: 4712656620761187434}
   - component: {fileID: 4500398768621823800}
+  - component: {fileID: 7599276762024930445}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_DaoYou
@@ -196,6 +197,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &7599276762024930445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 384327879646792540}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &543655539214675260
 GameObject:
   m_ObjectHideFlags: 0
@@ -596,6 +610,7 @@ GameObject:
   - component: {fileID: 342810598981405438}
   - component: {fileID: 5258984480970263254}
   - component: {fileID: 2346187674936933079}
+  - component: {fileID: 1013011384258992587}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Log
@@ -719,6 +734,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1013011384258992587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737360981415971026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
@@ -1884,6 +1912,7 @@ GameObject:
   - component: {fileID: 8570571649648203346}
   - component: {fileID: 4976295221266540732}
   - component: {fileID: 5349980305419514505}
+  - component: {fileID: 7303487924201986757}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ShenShi
@@ -2066,6 +2095,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &7303487924201986757
+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: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8511026840262256518
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1295,6 +1295,7 @@ GameObject:
   - component: {fileID: 2934276402299459566}
   - component: {fileID: 2433990691951363383}
   - component: {fileID: 3169074378938001994}
+  - component: {fileID: 6564502241614664599}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Ok
@@ -1418,6 +1419,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6564502241614664599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2568419713978303985
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -291,6 +291,7 @@ GameObject:
   - component: {fileID: 8044263114105609004}
   - component: {fileID: 1571941360682940458}
   - component: {fileID: 8048933075909396369}
+  - component: {fileID: 3983431434537885405}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Go
@@ -414,6 +415,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3983431434537885405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1856204643308014621
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 6849183701650811517}
   - component: {fileID: 731186082125369934}
   - component: {fileID: 1689730871889590423}
+  - component: {fileID: 5662111671770691226}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_DaoLv
@@ -135,6 +136,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5662111671770691226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2179581233926790995
 GameObject:
   m_ObjectHideFlags: 0
@@ -238,6 +252,7 @@ GameObject:
   - component: {fileID: 9181716882316998638}
   - component: {fileID: 6053108420661588814}
   - component: {fileID: 3384885484753796925}
+  - component: {fileID: 8243756025044455815}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_XiuLian
@@ -361,6 +376,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8243756025044455815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2878224673519074309
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 3137680743407424967}
   - component: {fileID: 9140324648405904296}
   - component: {fileID: 4901190760083256278}
+  - component: {fileID: 732761516243516562}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_DanYao
@@ -135,6 +136,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &732761516243516562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 686241986462251838}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &761335188077721832
 GameObject:
   m_ObjectHideFlags: 0
@@ -2464,6 +2478,7 @@ GameObject:
   - component: {fileID: 3449428202073114142}
   - component: {fileID: 4997955734526943379}
   - component: {fileID: 4936947918008458010}
+  - component: {fileID: 1369994220362251709}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_TuPo
@@ -2587,6 +2602,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1369994220362251709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5686636881236467809}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5698769226998451686
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1615,6 +1615,7 @@ GameObject:
   - component: {fileID: 7414710902306389851}
   - component: {fileID: 2618405343744575314}
   - component: {fileID: 7353808877449382449}
+  - component: {fileID: 27451668666179327}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Go
@@ -1738,6 +1739,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &27451668666179327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8125396639363880815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8551123114888839117
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -2207,6 +2207,7 @@ GameObject:
   - component: {fileID: 8390928313110045558}
   - component: {fileID: 1087691984517513849}
   - component: {fileID: 4188353976954862433}
+  - component: {fileID: 2725410468052320680}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_UpGrade
@@ -2332,6 +2333,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2725410468052320680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3931340268851502278
 GameObject:
   m_ObjectHideFlags: 0
@@ -3611,6 +3625,7 @@ GameObject:
   - component: {fileID: 781565039073399761}
   - component: {fileID: 1779521675834816083}
   - component: {fileID: 2934430960029227933}
+  - component: {fileID: 5195813603041424718}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Change
@@ -3734,6 +3749,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5195813603041424718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376219014674938603}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6510912021188530160
 GameObject:
   m_ObjectHideFlags: 0
@@ -4255,6 +4283,7 @@ GameObject:
   - component: {fileID: 405865854687704222}
   - component: {fileID: 8302224067188339116}
   - component: {fileID: 284704070319449970}
+  - component: {fileID: 3425143634650109716}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_PeiYang
@@ -4378,6 +4407,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3425143634650109716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7897947665373750767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8681148993979204635
 GameObject:
   m_ObjectHideFlags: 0
@@ -4684,6 +4726,7 @@ GameObject:
   - component: {fileID: 5534412852682778287}
   - component: {fileID: 3217534402310447278}
   - component: {fileID: 7159301952731043819}
+  - component: {fileID: 7122092377375404730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Cancel
@@ -4807,6 +4850,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7122092377375404730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9111287373956877969
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -88,6 +88,7 @@ GameObject:
   - component: {fileID: 3771783693810167237}
   - component: {fileID: 3320536128833058962}
   - component: {fileID: 5969371070923762822}
+  - component: {fileID: 9104841837450743452}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Event
@@ -212,6 +213,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &9104841837450743452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 454805197462043420}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &602921537856488800
 GameObject:
   m_ObjectHideFlags: 0
@@ -870,6 +884,7 @@ GameObject:
   - component: {fileID: 2833581182454625980}
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
+  - component: {fileID: 4472099066628972237}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -995,6 +1010,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4472099066628972237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -2007,6 +2035,7 @@ GameObject:
   - component: {fileID: 3509285127109723964}
   - component: {fileID: 8225963938330085936}
   - component: {fileID: 4949307884219371714}
+  - component: {fileID: 1656038444323376164}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: QianKunDai
@@ -2129,6 +2158,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1656038444323376164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4680823746377642281}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4927818824340999732
 GameObject:
   m_ObjectHideFlags: 0
@@ -2440,6 +2482,7 @@ GameObject:
   - component: {fileID: 6917675478362225246}
   - component: {fileID: 960266946171387090}
   - component: {fileID: 3954529720047950621}
+  - component: {fileID: 8747963378692631453}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_StartEvent
@@ -2565,6 +2608,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8747963378692631453
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678225597687261677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5703344219272490068
 GameObject:
   m_ObjectHideFlags: 0
@@ -2577,6 +2633,7 @@ GameObject:
   - component: {fileID: 6605159727525256171}
   - component: {fileID: 9148720037800396540}
   - component: {fileID: 637557749215430934}
+  - component: {fileID: 5703728964949210874}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Box
@@ -2699,6 +2756,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5703728964949210874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5703344219272490068}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5936847983662490449
 GameObject:
   m_ObjectHideFlags: 0
@@ -4107,6 +4177,7 @@ GameObject:
   - component: {fileID: 8210925538578532506}
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
+  - component: {fileID: 7489813112688999977}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -4231,6 +4302,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7489813112688999977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -3301,6 +3301,7 @@ GameObject:
   - component: {fileID: 8308121774079586848}
   - component: {fileID: 7967887453677892711}
   - component: {fileID: 2934063472977667771}
+  - component: {fileID: 3485659043694127256}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: oneButton
@@ -3426,6 +3427,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &3485659043694127256
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &7321907789896462625
 GameObject:
   m_ObjectHideFlags: 0
@@ -4052,6 +4066,7 @@ GameObject:
   - component: {fileID: 4991873065644050646}
   - component: {fileID: 191353844122783110}
   - component: {fileID: 2257356165437005101}
+  - component: {fileID: 6778620985483564446}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenButton
@@ -4178,6 +4193,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6778620985483564446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8669257028166209448
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab

@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 4461412605857524956}
   - component: {fileID: 722437814468193619}
   - component: {fileID: 9027247075650066786}
+  - component: {fileID: 6144175277733531317}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: ShopBtnWidget
@@ -227,6 +228,19 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &6144175277733531317
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910660254783983298}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3624944491826870057
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab

@@ -856,6 +856,7 @@ GameObject:
   - component: {fileID: 5804626943219981259}
   - component: {fileID: 2837612809958411126}
   - component: {fileID: 5574530936304665885}
+  - component: {fileID: 6204911548440429903}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Function
@@ -979,6 +980,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6204911548440429903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3271933524860438450}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3400556632824824613
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -938,6 +938,7 @@ GameObject:
   - component: {fileID: 751266163501733369}
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
+  - component: {fileID: 2456884504023472445}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_ShuangBei
@@ -1063,6 +1064,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2456884504023472445
+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: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4588207117918255426
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,6 +1543,7 @@ GameObject:
   - component: {fileID: 1993766289997657026}
   - component: {fileID: 609131292570836846}
   - component: {fileID: 3033052995166084162}
+  - component: {fileID: 2306673733446962983}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_LingQu
@@ -1652,6 +1667,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2306673733446962983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8247906758069621421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8315564883920848820
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab

@@ -8252,7 +8252,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 146, y: -23}
-  m_SizeDelta: {x: 182, y: 50}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7048921669090791528
 CanvasRenderer:

+ 607 - 0
Assets/Res/UI/SkillMassgePanel.prefab

@@ -0,0 +1,607 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &959975830485342132
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4480049515833029494}
+  - component: {fileID: 5048528037997048130}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: SkillMassgePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4480049515833029494
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959975830485342132}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3960169911326494192}
+  - {fileID: 1490485299211484798}
+  - {fileID: 3849278629804045308}
+  - {fileID: 6122583032657971884}
+  - {fileID: 7480622896368215423}
+  - {fileID: 7888271529645998825}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5048528037997048130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959975830485342132}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: nameText
+    gameObject: {fileID: 7669451477446727280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: massgeText
+    gameObject: {fileID: 1697194343927889744}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: guanbi
+    gameObject: {fileID: 7117935602168875445}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2319571757915002341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1490485299211484798}
+  - component: {fileID: 3771240254086539797}
+  - component: {fileID: 6132052890035956622}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1490485299211484798
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 427, y: 244.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3771240254086539797
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  m_CullTransparentMesh: 1
+--- !u!114 &6132052890035956622
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_Round09
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3207348546879999267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7888271529645998825}
+  - component: {fileID: 3065997782230339610}
+  - component: {fileID: 4072185081800750322}
+  - component: {fileID: 7117935602168875445}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: guanbi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7888271529645998825
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 177, y: 89}
+  m_SizeDelta: {x: 44, y: 44}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3065997782230339610
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_CullTransparentMesh: 1
+--- !u!114 &4072185081800750322
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.3254717, b: 0.3254717, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c7c98a2b50d944d2d933ad3c1f60ad39, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7117935602168875445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4072185081800750322}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3687039284328616005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6122583032657971884}
+  - component: {fileID: 3878207609747309761}
+  - component: {fileID: 7669451477446727280}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6122583032657971884
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 93}
+  m_SizeDelta: {x: 458.32, y: 74.79}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3878207609747309761
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  m_CullTransparentMesh: 1
+--- !u!114 &7669451477446727280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &5454792456129180181
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3960169911326494192}
+  - component: {fileID: 4587643134225274661}
+  - component: {fileID: 6333405649071353888}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3960169911326494192
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1000, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4587643134225274661
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  m_CullTransparentMesh: 1
+--- !u!114 &6333405649071353888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.59607846}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5461590099198253036
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3849278629804045308}
+  - component: {fileID: 7681446096203755470}
+  - component: {fileID: 3105243733130640181}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3849278629804045308
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 88.852}
+  m_SizeDelta: {x: 427, y: 66.495}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7681446096203755470
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  m_CullTransparentMesh: 1
+--- !u!114 &3105243733130640181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9433962, g: 0.6832053, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_Round09
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6012879202658065893
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7480622896368215423}
+  - component: {fileID: 2833182074333685423}
+  - component: {fileID: 1697194343927889744}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: massgeText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7480622896368215423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.5, y: -22.5}
+  m_SizeDelta: {x: 389.4, y: 138.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2833182074333685423
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  m_CullTransparentMesh: 1
+--- !u!114 &1697194343927889744
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New TextNew TextNew TextNew TextNew TextNew TextNew Text

+ 7 - 0
Assets/Res/UI/SkillMassgePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHMZt3mlWy68Uu6UpNxaoBIS2lHBGBbROg3HnmxyH8h6U4FxB7i8gk4vdeT3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -934,6 +934,7 @@ GameObject:
   - component: {fileID: 6443286834363809288}
   - component: {fileID: 1911700382173267592}
   - component: {fileID: 4442566135324607271}
+  - component: {fileID: 8230082480020880759}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ZhuDong
@@ -1118,6 +1119,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8230082480020880759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 857437492319237345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &877933799468505262
 GameObject:
   m_ObjectHideFlags: 0
@@ -1666,6 +1680,7 @@ GameObject:
   - component: {fileID: 8562629278153307331}
   - component: {fileID: 2772232097560558729}
   - component: {fileID: 4712953945019267583}
+  - component: {fileID: 3718944129453067507}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Tu
@@ -1788,6 +1803,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3718944129453067507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1467704899622376746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1515688381437741579
 GameObject:
   m_ObjectHideFlags: 0
@@ -3491,6 +3519,7 @@ GameObject:
   - component: {fileID: 7918248993400424687}
   - component: {fileID: 4514347021073670849}
   - component: {fileID: 3642748124106631649}
+  - component: {fileID: 4782197136162955827}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Setting
@@ -3614,6 +3643,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4782197136162955827
+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: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3891518416558775222
 GameObject:
   m_ObjectHideFlags: 0
@@ -4329,6 +4371,7 @@ GameObject:
   - component: {fileID: 5668826745793188999}
   - component: {fileID: 5253754700981536788}
   - component: {fileID: 3014350990386040911}
+  - component: {fileID: 6424468551234770231}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Huo
@@ -4451,6 +4494,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6424468551234770231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5080917074618674990}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5235669251348932779
 GameObject:
   m_ObjectHideFlags: 0
@@ -4690,6 +4746,7 @@ GameObject:
   - component: {fileID: 7022963007068931577}
   - component: {fileID: 3951678519046703922}
   - component: {fileID: 8001917834383050887}
+  - component: {fileID: 2774155745813403205}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Shui
@@ -4812,6 +4869,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2774155745813403205
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602452155610465081}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5808736358538801797
 GameObject:
   m_ObjectHideFlags: 0
@@ -5188,6 +5258,7 @@ GameObject:
   - component: {fileID: 137162416073161416}
   - component: {fileID: 1072359482030610864}
   - component: {fileID: 7624365524179791873}
+  - component: {fileID: 3889592042654972352}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Jin
@@ -5310,6 +5381,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3889592042654972352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6656269987499687188}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6755705262757498291
 GameObject:
   m_ObjectHideFlags: 0
@@ -5945,6 +6029,7 @@ GameObject:
   - component: {fileID: 5122283615108105817}
   - component: {fileID: 4886873273644485354}
   - component: {fileID: 6985992140190241076}
+  - component: {fileID: 4461101014489227716}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_FuZu
@@ -6129,6 +6214,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4461101014489227716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8090296584909710456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8282051426038164161
 GameObject:
   m_ObjectHideFlags: 0
@@ -6451,6 +6549,7 @@ GameObject:
   - component: {fileID: 255801767607311433}
   - component: {fileID: 6475446511729833954}
   - component: {fileID: 6576737988474275193}
+  - component: {fileID: 600863617369158677}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Mu
@@ -6573,6 +6672,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &600863617369158677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729277598116330670}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8803191321697750899
 GameObject:
   m_ObjectHideFlags: 0
@@ -6587,6 +6699,7 @@ GameObject:
   - component: {fileID: 7666637412995097434}
   - component: {fileID: 9156116810739596960}
   - component: {fileID: 8487831545810050738}
+  - component: {fileID: 3468364501085617239}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_All
@@ -6771,6 +6884,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3468364501085617239
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8803191321697750899}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8896063498617044909
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1834,6 +1834,7 @@ GameObject:
   - component: {fileID: 4502216836934010563}
   - component: {fileID: 3565069673636172822}
   - component: {fileID: 9099468221068453453}
+  - component: {fileID: 5661451308959653527}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main
@@ -2004,6 +2005,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5661451308959653527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6002680713102466570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6175007428980403100
 GameObject:
   m_ObjectHideFlags: 0
@@ -2633,6 +2647,7 @@ GameObject:
   - component: {fileID: 4016434911845951850}
   - component: {fileID: 7637998734161463344}
   - component: {fileID: 7756643296972492655}
+  - component: {fileID: 6600563720190713741}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Event
@@ -2803,6 +2818,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6600563720190713741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8376890922099869996}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Core/Audio/AudioButton.cs

@@ -9,7 +9,7 @@ namespace Core.Audio
 
         public void OnPointerUp(PointerEventData eventData)
         {
-            AudioManager.Instance.Play(audioName, false);
+            AudioManager.Instance.Play(audioName+".ogg", false);
         }
     }
 }

+ 3 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -50,6 +51,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
                 // currentOpenUIPanel = null;
             });
             Btn_Menu.onClick.AddListener(async () =>
@@ -184,7 +186,7 @@ namespace Fort23.Mono
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-
+            AudioManager.Instance.PlayAudio("ui_shengshitansuo.wav");
             if(PlayerGuideManager.Instance.curPhase == 2)  
                 PlayerGuideManager.Instance.StepInit();
             if(PlayerGuideManager.Instance.curPhase == 3)  

+ 5 - 0
Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Audio;
 using Fort23.Core;
 using Mono.Utility;
 
@@ -37,8 +38,10 @@ namespace Fort23.Mono
         public async void CustomInit(bool isWin, System.Action callBack)
         {
             this.callBack = callBack;
+            AudioManager.Instance.PauseBGM();
             if (isWin)
             {
+                AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
                 // f
@@ -47,6 +50,7 @@ namespace Fort23.Mono
             }
             else
             {
+                AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
 
@@ -78,6 +82,7 @@ namespace Fort23.Mono
 
         public override void Close()
         {
+            AudioManager.Instance.UnPauseBGM();
             foreach (var skipToWidget in skipToWidgets)
             {
                 UIManager.Instance.DormancyGComponent(skipToWidget);

+ 2 - 0
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Audio;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
@@ -138,6 +139,7 @@ namespace Fort23.Mono
 
         private void CloseButtonCallBack()
         {
+            AudioManager.Instance.PlayAudio("ui_fanhui.wav");
             UIManager.Instance.HideUIUIPanel(this);
 
             EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, null);

+ 2 - 0
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -227,6 +227,8 @@ namespace Fort23.Mono
                 // await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }
+            
+            AudioManager.Instance.PlayAudio("ui_chouqugongfa.wav");
         }
     }
 }

+ 40 - 40
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -339,6 +340,8 @@ namespace Fort23.Mono
                 {
                     // UIManager.Instance.HideUIUIPanel(this);
                 }
+
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
             });
             Btn_RemoveGongFa.onClick.AddListener(() =>
             {
@@ -351,6 +354,7 @@ namespace Fort23.Mono
                 BaoChun();
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
+                AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -636,34 +640,25 @@ namespace Fort23.Mono
 
                 skillKongWidget.SetSKill(selectSkillConfig);
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
+                if (selectSkillConfig.skillConfig.SkillType == 1)
+                {
+                    AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                }
+                else if (selectSkillConfig.skillConfig.SkillType == 2)
+                {
+                    AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                }
+
                 CloseSelect();
                 BaoChun();
 
+
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 1)
-                // {
-                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-                //
-                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 2)
-                // {
-                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
                 if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) &&
                     allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
                 {
@@ -680,32 +675,21 @@ namespace Fort23.Mono
                     return;
                 }
 
-                // if (selectSkillConfig.skillConfig.SkillType == 1)
-                // {
-                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-                //
-                // if (selectSkillConfig.skillConfig.SkillType == 2)
-                // {
-                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig))
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-
 
                 isAlter = true;
                 allUseSkill[skillKongWidget.SkillInfo.index] = null;
                 skillKongWidget.SetSKill(selectSkillConfig);
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 skillKongWidget.SetSKill(selectSkillConfig);
+                if (selectSkillConfig.skillConfig.SkillType == 1)
+                {
+                    AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                }
+                else if (selectSkillConfig.skillConfig.SkillType == 2)
+                {
+                    AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                }
+
                 CloseSelect();
                 BaoChun();
                 showSkillInfo.Sort(Sort);
@@ -729,7 +713,14 @@ namespace Fort23.Mono
                     Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
                     Btn_Info.gameObject.SetActive(true);
                     SelectSkill(skillKongWidget.SkillInfo, false, false);
-                    // BaoChun();
+                    // if (skillKongWidget.SkillInfo.skillConfig.SkillType == 1)
+                    // {
+                    //     AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                    // }
+                    // else if (skillKongWidget.SkillInfo.skillConfig.SkillType == 2)
+                    // {
+                    //     AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                    // }
                 }
                 else
                 {
@@ -748,6 +739,15 @@ namespace Fort23.Mono
 
                     skillKongWidget.SetSKill(selectSkillConfig);
                     allUseSkill[skillKongWidget.index] = selectSkillConfig;
+                    if (selectSkillConfig.skillConfig.SkillType == 1)
+                    {
+                        AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                    }
+                    else if (selectSkillConfig.skillConfig.SkillType == 2)
+                    {
+                        AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                    }
+
                     CloseSelect();
                     BaoChun();
                 }

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -126,6 +127,7 @@ namespace Fort23.Mono
                             {
                                 isTuPoSuccess = false;
                                 RemoveHeroItem(list[1]);
+                             
                                 HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(3, list[1]);
                                 await heroBreakthroughFailPanel.UIClosed();
                                 // TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("雷劫失败");
@@ -136,6 +138,7 @@ namespace Fort23.Mono
 
                     if (isTuPoSuccess)
                     {
+                        AudioManager.Instance.PlayAudio("ui_tupo.wav");
                         await UpHero(type1);
                     }
                 }
@@ -143,7 +146,7 @@ namespace Fort23.Mono
                 else
                 {
                     RemoveHeroItem(list[1]);
-
+                    AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
                     HeroBreakthroughFailPanel heroBreakthroughFailPanel = await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                     await heroBreakthroughFailPanel.UIClosed();
                 }

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Animancer;
 using Animancer.TransitionLibraries;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -111,6 +112,7 @@ namespace Fort23.Mono
                         PlayerManager.Instance.myHero.Upgrade();
                         HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         CustomInit();
+                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
                     }
                     //大突破
                     else
@@ -126,7 +128,12 @@ namespace Fort23.Mono
                 }
             });
 
-            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Close.onClick.AddListener(() =>
+            {
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
+                UIManager.Instance.HideUIUIPanel(this);
+                
+            });
         }
 
         public async CTask CustomInit()

+ 8 - 2
Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -53,7 +54,11 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Close.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUIUIPanel(this);
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
+            });
 
             Btn_Change.onClick.AddListener(() =>
             {
@@ -68,7 +73,7 @@ namespace Fort23.Mono
                 selectedFaBaoInfo = null;
                 CustomInit(selectIndex);
                 UpdateBjUI(false);
-                
+                AudioManager.Instance.PlayAudio("ui_zbfbcg.wav");
           
                 
                 SetSelectIcon(currentFaBaoWidget.SelectRoot);
@@ -113,6 +118,7 @@ namespace Fort23.Mono
                     UpadaFabaoBag();
                     UpdateUI(selectedFaBaoInfo);
                     UpdataGradeUI(true);
+                    AudioManager.Instance.PlayAudio("ui_fbgfsj.wav");
                 }
             });
 

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

@@ -51,7 +51,7 @@ namespace Fort23.Mono
 
         public override CTask Show()
         {
-            AudioManager.Instance.PlayAudio("jiangliui.wav");
+            AudioManager.Instance.PlayAudio("ui_jianglimianban.wav");
             return base.Show();
         }
 

+ 3 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -139,6 +140,8 @@ namespace Fort23.Mono
                     UILayer.Middle,
                     uiData: new object[] { itemInfos, type, configId }, isShowBG: true);
             }
+            
+            AudioManager.Instance.PlayAudio("ui_jianglimianban.wav");
         }
     }
 }

+ 3 - 1
Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
@@ -43,6 +44,7 @@ namespace Fort23.Mono
         {
             TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             AppBarPanel.OpenPanel(this);
+           
             return base.GetFocus();
         }
 
@@ -197,7 +199,7 @@ namespace Fort23.Mono
         {
             ShopPanel shopPanel = await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { isPauseCombat },isFullUI:true);
 
-
+            AudioManager.Instance.PlayAudio("ui_shangdian.wav");
             return shopPanel;
         }
     }

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Някои файлове не бяха показани, защото твърде много файлове са промени