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

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

Assets/Res/Aduio/MainAudio.asset

@@ -17,64 +17,64 @@ MonoBehaviour:
   - describe: "\u6253boss\u7684\u65F6\u5019\u7528\u7684"
     audionClipName: bossBattle.wav
     volume: 1
-  - describe: "\u9ED8\u8BA4\u6218\u6597\u4F7F\u7528\u7684"
+  - describe: combatBattle.wav
     audionClipName: combatBattle.wav
     volume: 1
-  - describe: "\u51B0\u7684\u5907\u673A"
+  - describe: bing_hit.wav
     audionClipName: bing_hit.wav
     volume: 0.4
-  - describe: "\u6B7B\u4EA1\u7684\u9ED8\u8BA4\u97F3\u6548"
+  - describe: die1.wav
     audionClipName: die1.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.747
+  - describe: hero01_sk1.wav
     audionClipName: hero01_sk1.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.747
+  - describe: hero02_sk1.wav
     audionClipName: hero02_sk1.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.631
+  - describe: hero03_att.wav
     audionClipName: hero03_att.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: hero03_sk1.wav
     audionClipName: hero03_sk1.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.712
+  - describe: hero04_att.wav
     audionClipName: hero04_att.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.722
+  - describe: hero04_sk1.wav
     audionClipName: hero04_sk1.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: hero01_att.wav
     audionClipName: hero01_att.wav
-    volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+    volume: 0.712
+  - describe: boss_lang_att.wav
     audionClipName: boss_lang_att.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_lang_die.wav
     audionClipName: boss_lang_die.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_lang_jiao.wav
     audionClipName: boss_lang_jiao.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_lang_sk1.wav
     audionClipName: boss_lang_sk1.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_lang_sk3.wav
     audionClipName: boss_lang_sk3.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_she_att.wav
     audionClipName: boss_she_att.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_she_die.wav
     audionClipName: boss_she_die.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_she_sk1.wav
     audionClipName: boss_she_sk1.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: boss_she_sk3.wav
     audionClipName: boss_she_sk3.wav
     volume: 1
-  - describe: "\u6218\u58EB\u97F3\u6548"
+  - describe: xiaoshe_die.wav
     audionClipName: xiaoshe_die.wav
     volume: 1
   - describe: jingbi

Assets/Res/UI/Canvas/Canvas.prefab

@@ -284,7 +284,7 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 32
 --- !u!1 &5950518730338176997
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 3582209448685582547}
   - component: {fileID: 6098000932219685594}
   - component: {fileID: 667431388228105620}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: txtHeroExp
   m_TagString: Untagged
@@ -146,7 +146,7 @@ GameObject:
   - component: {fileID: 7295285484143575252}
   - component: {fileID: 5110367857571788923}
   - component: {fileID: 3173585067917471387}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Diamon
   m_TagString: Untagged
@@ -231,7 +231,7 @@ GameObject:
   - component: {fileID: 3062904392940559701}
   - component: {fileID: 6143139382776230165}
   - component: {fileID: 6175765214212676001}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: bossName
   m_TagString: Untagged
@@ -328,7 +328,7 @@ GameObject:
   - component: {fileID: 2769935772698356797}
   - component: {fileID: 4134183460199500448}
   - component: {fileID: 1495863749115099245}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Slider_Hp_Boss
   m_TagString: Untagged
@@ -478,7 +478,7 @@ GameObject:
   - component: {fileID: 1276612167795138221}
   - component: {fileID: 1064142111384354065}
   - component: {fileID: 1262253723378278969}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon
   m_TagString: Untagged
@@ -554,7 +554,7 @@ GameObject:
   - component: {fileID: 4467886094601239176}
   - component: {fileID: 6946297553114181735}
   - component: {fileID: 8884207522203186992}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
   m_TagString: Untagged
@@ -634,7 +634,9 @@ GameObject:
   - component: {fileID: 3100148146476530636}
   - component: {fileID: 2408033288920626530}
   - component: {fileID: 2120651646428104405}
-  m_Layer: 0
+  - component: {fileID: 6938869369846052540}
+  - component: {fileID: 662163898753535128}
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Topbar
   m_TagString: Untagged
@@ -704,6 +706,46 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!223 &6938869369846052540
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 711202643630758425}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: -1
+  m_TargetDisplay: 0
+--- !u!114 &662163898753535128
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 711202643630758425}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 32
 --- !u!1 &764028176511703825
 GameObject:
   m_ObjectHideFlags: 0
@@ -713,7 +755,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 397899105639740}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pos3
   m_TagString: Untagged
@@ -754,7 +796,7 @@ GameObject:
   - component: {fileID: 2995776495546699441}
   - component: {fileID: 7334061425741396743}
   - component: {fileID: 7638280281831798661}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: levelName
   m_TagString: Untagged
@@ -889,7 +931,7 @@ GameObject:
   - component: {fileID: 5490862801310319621}
   - component: {fileID: 239914879977752742}
   - component: {fileID: 4230680898015263907}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
   m_TagString: Untagged
@@ -965,7 +1007,7 @@ GameObject:
   - component: {fileID: 1722181438945693490}
   - component: {fileID: 3847333068659712797}
   - component: {fileID: 2163574940505033628}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: HeroExp
   m_TagString: Untagged
@@ -1043,7 +1085,7 @@ GameObject:
   - component: {fileID: 5433286787357854352}
   - component: {fileID: 5309631651483224709}
   - component: {fileID: 6524193313608138032}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Coin
   m_TagString: Untagged
@@ -1127,7 +1169,7 @@ GameObject:
   - component: {fileID: 3215950451646426847}
   - component: {fileID: 4567690350099036121}
   - component: {fileID: 2299632390429321421}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Diamond
   m_TagString: Untagged
@@ -1205,7 +1247,7 @@ GameObject:
   - component: {fileID: 5534452814957956837}
   - component: {fileID: 6015459758941301288}
   - component: {fileID: 3654216362739388222}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
   m_TagString: Untagged
@@ -1286,7 +1328,7 @@ GameObject:
   - component: {fileID: 7998270753822092529}
   - component: {fileID: 8105235733683382179}
   - component: {fileID: 977153492453243612}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
   m_TagString: Untagged
@@ -1382,7 +1424,7 @@ GameObject:
   - component: {fileID: 8755000152043504334}
   - component: {fileID: 6970331778420469864}
   - component: {fileID: 735756078291472635}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
   m_TagString: Untagged
@@ -1472,7 +1514,7 @@ GameObject:
   - component: {fileID: 8114552564632858583}
   - component: {fileID: 7086113347311675477}
   - component: {fileID: 4420137891263129620}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon
   m_TagString: Untagged
@@ -1556,7 +1598,7 @@ GameObject:
   - component: {fileID: 3982605015737934310}
   - component: {fileID: 5424208663245091192}
   - component: {fileID: 9221840542676857237}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pattern
   m_TagString: Untagged
@@ -1633,7 +1675,7 @@ GameObject:
   - component: {fileID: 3965420227716831052}
   - component: {fileID: 4754362989316858534}
   - component: {fileID: 1277215176106341}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: HeroBags
   m_TagString: Untagged
@@ -1753,7 +1795,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 3468098832702461023}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: expPoint
   m_TagString: Untagged
@@ -1789,7 +1831,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 2250993577439367798}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: FillArea
   m_TagString: Untagged
@@ -1830,7 +1872,7 @@ GameObject:
   - component: {fileID: 4951065845791404470}
   - component: {fileID: 3392180999714964130}
   - component: {fileID: 8410502372712779645}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Slider_Exp_Process
   m_TagString: Untagged
@@ -1981,7 +2023,7 @@ GameObject:
   - component: {fileID: 1125220131462145608}
   - component: {fileID: 1960521246473662934}
   - component: {fileID: 6158807530568912656}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Face
   m_TagString: Untagged
@@ -2057,7 +2099,7 @@ GameObject:
   - component: {fileID: 2025367596617419548}
   - component: {fileID: 7528320002955402115}
   - component: {fileID: 3147154861999153646}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Light
   m_TagString: Untagged
@@ -2133,7 +2175,7 @@ GameObject:
   - component: {fileID: 5944412108433976429}
   - component: {fileID: 4838901169462861028}
   - component: {fileID: 8722945087495955615}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -2209,7 +2251,7 @@ GameObject:
   - component: {fileID: 9120029036529632753}
   - component: {fileID: 5455270301715299168}
   - component: {fileID: 1799918944523038801}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -2293,7 +2335,7 @@ GameObject:
   - component: {fileID: 2164720003180004667}
   - component: {fileID: 6711690020208574591}
   - component: {fileID: 2511412495675166438}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Light
   m_TagString: Untagged
@@ -2369,7 +2411,7 @@ GameObject:
   - component: {fileID: 8242191573766590419}
   - component: {fileID: 3862026962367334465}
   - component: {fileID: 1715631634302475548}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -2445,7 +2487,7 @@ GameObject:
   - component: {fileID: 148135373626990328}
   - component: {fileID: 7657080206990876893}
   - component: {fileID: 7701462367861168002}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: txtDiamond
   m_TagString: Untagged
@@ -2578,7 +2620,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 9073062006211861286}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pos1
   m_TagString: Untagged
@@ -2618,7 +2660,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3456306615374035144}
   - component: {fileID: 5996943567978577101}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Group_ResourceBar
   m_TagString: Untagged
@@ -2685,7 +2727,7 @@ GameObject:
   - component: {fileID: 7919522989949582024}
   - component: {fileID: 3597234037776745320}
   - component: {fileID: 3491799872198757383}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Light
   m_TagString: Untagged
@@ -2759,7 +2801,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 639903755856041467}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: expPoint
   m_TagString: Untagged
@@ -2798,7 +2840,7 @@ GameObject:
   - component: {fileID: 2795529932863041108}
   - component: {fileID: 1659965290666304219}
   - component: {fileID: 7649691318132559334}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Button_Menu
   m_TagString: Untagged
@@ -2876,7 +2918,7 @@ GameObject:
   - component: {fileID: 1912819747190079380}
   - component: {fileID: 4854944828813712381}
   - component: {fileID: 2510850195512127075}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -2950,7 +2992,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6466028004710776003}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: hero_battle
   m_TagString: Untagged
@@ -2992,7 +3034,7 @@ GameObject:
   - component: {fileID: 8968252359368126328}
   - component: {fileID: 3916997886492460011}
   - component: {fileID: 5467949433514799329}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Face
   m_TagString: Untagged
@@ -3068,7 +3110,7 @@ GameObject:
   - component: {fileID: 9197816965968549393}
   - component: {fileID: 4586383362179916085}
   - component: {fileID: 1451205693205235240}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: txtCoin
   m_TagString: Untagged
@@ -3203,7 +3245,7 @@ GameObject:
   - component: {fileID: 5532971017468151339}
   - component: {fileID: 4442485902627794409}
   - component: {fileID: 2737143574375238366}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Face
   m_TagString: Untagged
@@ -3279,7 +3321,7 @@ GameObject:
   - component: {fileID: 7579430473201180889}
   - component: {fileID: 8297623478016568359}
   - component: {fileID: 3717982641529904387}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Image
   m_TagString: Untagged
@@ -3363,7 +3405,7 @@ GameObject:
   - component: {fileID: 2946191979770722486}
   - component: {fileID: 8511772474124218940}
   - component: {fileID: 5205465547970432591}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Fill
   m_TagString: Untagged
@@ -3449,7 +3491,7 @@ GameObject:
   - component: {fileID: 7362160405140399304}
   - component: {fileID: 7796557343502220076}
   - component: {fileID: 6067803364732538754}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon
   m_TagString: Untagged
@@ -3534,7 +3576,7 @@ GameObject:
   - component: {fileID: 759101761977387150}
   - component: {fileID: 2936033210018505849}
   - component: {fileID: 6907310053830266856}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
   m_TagString: Untagged
@@ -3624,7 +3666,7 @@ GameObject:
   - component: {fileID: 2100703262940690265}
   - component: {fileID: 2955394832739376810}
   - component: {fileID: 929145644436089968}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: TextExp
   m_TagString: Untagged
@@ -3759,7 +3801,7 @@ GameObject:
   - component: {fileID: 279313896802372466}
   - component: {fileID: 8858526776177206461}
   - component: {fileID: 2171035838349782778}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -3833,7 +3875,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 3469845461661622283}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pos4
   m_TagString: Untagged
@@ -3874,7 +3916,7 @@ GameObject:
   - component: {fileID: 7503648074123454508}
   - component: {fileID: 8993302638415002497}
   - component: {fileID: 1006458911419196544}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Fill
   m_TagString: Untagged
@@ -3960,7 +4002,7 @@ GameObject:
   - component: {fileID: 3698375508512883033}
   - component: {fileID: 8907077497437144677}
   - component: {fileID: 7223948676877318740}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pattern
   m_TagString: Untagged
@@ -4036,7 +4078,7 @@ GameObject:
   - component: {fileID: 6072608780181466686}
   - component: {fileID: 1912714546525601189}
   - component: {fileID: 1958755530715212547}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Image (2)
   m_TagString: Untagged
@@ -4118,7 +4160,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6107101496507914859}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pos2
   m_TagString: Untagged
@@ -4160,7 +4202,7 @@ GameObject:
   - component: {fileID: 689932323184248302}
   - component: {fileID: 7741549639772608107}
   - component: {fileID: 1278717619321358154}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
   m_TagString: Untagged
@@ -4250,7 +4292,7 @@ GameObject:
   - component: {fileID: 2366751367701215255}
   - component: {fileID: 3853813168643185399}
   - component: {fileID: 5834541233658636316}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: box
   m_TagString: Untagged
@@ -4581,7 +4623,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 4207053513884661540}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: bossHp
   m_TagString: Untagged
@@ -4621,7 +4663,7 @@ GameObject:
   - component: {fileID: 5407905478464383173}
   - component: {fileID: 5884104357082562518}
   - component: {fileID: 7490247204099664926}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: BottomBar_Menu
   m_TagString: Untagged
@@ -4701,7 +4743,7 @@ GameObject:
   - component: {fileID: 6372682890431576924}
   - component: {fileID: 6295583510039350843}
   - component: {fileID: 798236197730424178}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Coin
   m_TagString: Untagged
@@ -4779,7 +4821,7 @@ GameObject:
   - component: {fileID: 1772377454253642209}
   - component: {fileID: 7534213609645617238}
   - component: {fileID: 8497682459376352873}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Face
   m_TagString: Untagged
@@ -4855,7 +4897,7 @@ GameObject:
   - component: {fileID: 55913211285366238}
   - component: {fileID: 8903571713035526237}
   - component: {fileID: 8567988803187819516}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Image (1)
   m_TagString: Untagged
@@ -4937,7 +4979,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5521065678043945688}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: FillArea
   m_TagString: Untagged
@@ -4976,7 +5018,7 @@ GameObject:
   - component: {fileID: 6989071283435105637}
   - component: {fileID: 2473317446412967829}
   - component: {fileID: 2002673787439862528}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_HeroExp
   m_TagString: Untagged
@@ -5061,7 +5103,7 @@ GameObject:
   - component: {fileID: 4391858190883622590}
   - component: {fileID: 5791296258592111927}
   - component: {fileID: 1268618840442841001}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Alert_Circle_s_Green
   m_TagString: Untagged
@@ -5149,7 +5191,7 @@ GameObject:
   - component: {fileID: 9085850810200614516}
   - component: {fileID: 3544557126014929307}
   - component: {fileID: 4538825450821745528}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Button_battleBoss
   m_TagString: Untagged
@@ -5382,7 +5424,7 @@ GameObject:
   - component: {fileID: 2734671052946263575}
   - component: {fileID: 8647862052369413808}
   - component: {fileID: 6576371512156790021}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Bg
   m_TagString: Untagged
@@ -5470,7 +5512,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 3778428922014953483}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Alert_Dot_Red
   m_TagString: Untagged
@@ -5511,7 +5553,7 @@ GameObject:
   - component: {fileID: 3017748408813379772}
   - component: {fileID: 7219012259747859616}
   - component: {fileID: 6604196030626565380}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pattern
   m_TagString: Untagged
@@ -5587,7 +5629,7 @@ GameObject:
   - component: {fileID: 874346651065516408}
   - component: {fileID: 4820894086034610323}
   - component: {fileID: 1697561738051742496}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Border
   m_TagString: Untagged
@@ -5663,7 +5705,7 @@ GameObject:
   - component: {fileID: 6837456160130922249}
   - component: {fileID: 3062343760500970082}
   - component: {fileID: 1935190956160303366}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Pattern
   m_TagString: Untagged
@@ -5739,7 +5781,7 @@ GameObject:
   - component: {fileID: 9152630222983204973}
   - component: {fileID: 1240165218298724847}
   - component: {fileID: 6433044716245704488}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: txtNum
   m_TagString: Untagged
@@ -5872,7 +5914,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 2815392744438249048}
-  m_Layer: 0
+  m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: levelInfo
   m_TagString: Untagged
@@ -6023,6 +6065,10 @@ PrefabInstance:
       propertyPath: ShapeModule.radius.value
       value: 0.2
       objectReference: {fileID: 0}
+    - target: {fileID: 7432888934282514419, guid: 7f5a9c9a7b322614fbce15a45e076f45, type: 3}
+      propertyPath: m_Layer
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -6046,6 +6092,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6989071283435105637}
     m_Modifications:
+    - target: {fileID: 917664038515431752, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+      propertyPath: m_Layer
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 5652462218939348953, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/Core/Audio/AudioManager.cs

@@ -245,7 +245,7 @@ namespace Core.Audio
                 }
 
                 AudioSourcePool audioSourcePool = GetAudioSourcePool();
-                audioSourcePool.Play(audionName, audioClip, isLoop, speed);
+                audioSourcePool.Play(audionName, audioClip, isLoop, audioBundleInfo._volume,speed);
                 _currPlayAudio[audionName] = audioSourcePool;
                 return audioSourcePool;
             }

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -21,7 +21,7 @@ namespace Fort23.Mono
         public static async CTask<ShowItemMoveToTargetPanel> OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle,
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Bottom,
                     isFocus: false);
             return showItemMoveToTargetPanel;
         }