添加音效

Assets/Res/Aduio/combatBattle2.wav.meta → Assets/Res/Aduio/Bgm/dongfu.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CHod4XulUCnVWqoTjG4XQIoIrVvx3i1Aj7QnoSF6tPIlk/XxHFe4qTazIngM
+guid: B3sWsCmqBipV/BoM4pBzVtCPZFf0e+DTRgdQF7nPjUZGuGkSvEpBLM/4JlSS
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7

Assets/Res/Aduio/die1.wav.meta → Assets/Res/Aduio/Bgm/xunlongduobao1.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WyxN5C2rBnw907ZX7Ph0J8ZyMlEWdphlymfbWbl6TXQpGCK+aahKiC79cvPd
+guid: CS5N5imuU31KCiPaTdgZpyMZjR/W0xdwGD3/OTxERn+SHlTVO4xO5b3LwUkz
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7

Assets/Res/Aduio/combatBattle.wav.meta → Assets/Res/Aduio/UI/XXX-标版音2.wav.meta

@@ -1,19 +1,19 @@
 fileFormatVersion: 2
-guid: XX0f4H+kVH+qHMSHyy81Iw0/+ZXmr3poecNfGgzwHw8sSiIuaoZTxQkTfVe1
+guid: D31JsCP+Wy9fCgffL/zDU9kSu7J6O6AHJdrwT08soSOZhp6yCfTCuIiqfhmW
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7
   defaultSettings:
     serializedVersion: 2
-    loadType: 1
+    loadType: 0
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 0.02
+    quality: 1
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}
-  forceToMono: 1
+  forceToMono: 0
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

Assets/Res/Aduio/bossBattle.wav.meta → Assets/Res/Aduio/UI/ui_chaozuoshibai.WAV.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DX9OsCytWnryFvNZCpF51OPJu7S1sMYHdzF5yYTCLPrYWbNSw+CQBfiKpTQE
+guid: Dn8btSmtUH3OX4U4aI/710n9Ozno/Mr0gXe0tzLgV/CViJ8V9lCttYVFxB3X
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7
@@ -12,17 +12,8 @@ AudioImporter:
     quality: 1
     conversionMode: 0
     preloadAudioData: 0
-  platformSettingOverrides:
-    36:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 2
-      sampleRateOverride: 44100
-      compressionFormat: 7
-      quality: 0.5
-      conversionMode: 0
-      preloadAudioData: 0
-  forceToMono: 1
+  platformSettingOverrides: {}
+  forceToMono: 0
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

Assets/Res/Aduio/UI/ui_chouqugongfa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CChM5HupBy7aGaeYbuksmxHGylnDyd8RNiochZOxBq1sUJtjwoDv60P4//WH
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_fanhui.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CStNsi6tAS7Vrq8GL9yjq6aI3xjfU6J2O2wjH8lA3Y0hYg+bdZov9cLH2SFS
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_fbgfsj.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DCwft3urV3h8jH2fZjtNMGj3XLCFVMZ/qPokHIKrsfnBdLGU2SyTJbNpN/nX
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_fzgf_yx.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: W3gb4S3/VCqmRCAu72S9v6QD4TzHBbk1yMW3xQSESmleebqIgsg1hR8WHsh7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_shangdian.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CX9OtCL8AX8KPo3goUWNM4lexCmeml248R2KscBP4JchqkgfDvNTg515i5T6
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_shanggongfa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CHxMs3uvAnjeonaloT9CYlyBfgtLk7uO20sKyPACwvpfK00bqLYxBBCpZPg8
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_shengji.WAV.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Xnke5C78Vi32lXOunXleFTwYUQFLvcHZ19/3+e6Xr6HhzlSP6x85eUiJMJ4t
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_shengshitansuo.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: WytJsCv/Wyl8NWEOBCEMLncSwt91jQQ0Au+0/wbQ56ikxSqOpglEwxMZ+Utt
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_tupo.WAV.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: Ci8YsiP/VXKEBNzez5oYsKW0fBrWFX9gws/lZkhAIN55vCfDuMjm3vxyxE3y
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_tuposhibai.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XngavXivVnwCKyE8ZswxR4eozTp42M6iqj47Q7ogJGwPQ8jFvBDGcxqxuiKz
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_tycg.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: CH4WvS+kB3P1xArBMdAWVDt+SDLFbSwfPhWwe74v47yz5Z9kn84Y/lKrOY3c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_xiazhenggongfa.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: DyhLtniqUngR5dcluCQ0R+9Oxycgbho4Vj1DNuKegE/h38JEwoSyxBNyAUFd
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Aduio/UI/ui_zbfbcg.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: XHIZ5yj8AnNSiPmHl9Zr4zhu6y/4fBn39Tpx2dMgbfN9VlYznJdKqbiPzVkn
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -2643,7 +2643,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 1008
+      value: 9001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -4460,7 +4460,7 @@ Sprite:
     3fb1e3f2ace104b39a8b5a61d145264f: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
@@ -4554,7 +4554,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -4634,14 +4634,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 272
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -5868,7 +5868,7 @@ Sprite:
     3fb1e3f2ace104b39a8b5a61d145264f: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
@@ -5962,7 +5962,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -6042,14 +6042,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 272
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -11762,7 +11762,7 @@ Sprite:
     3fb1e3f2ace104b39a8b5a61d145264f: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
@@ -11856,7 +11856,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -11936,14 +11936,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 272
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -12802,7 +12802,7 @@ Sprite:
     3fb1e3f2ace104b39a8b5a61d145264f: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
@@ -12896,7 +12896,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -12976,14 +12976,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 272
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -14835,7 +14835,7 @@ Sprite:
     3b5496225424c894180fe06fe939122a: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
@@ -14929,7 +14929,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -15009,14 +15009,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 136
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 136, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 200, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -15174,7 +15174,7 @@ Sprite:
     3b5496225424c894180fe06fe939122a: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
@@ -15268,7 +15268,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -15348,14 +15348,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 136
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 136, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 200, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}
@@ -15486,7 +15486,7 @@ Sprite:
     3fb1e3f2ace104b39a8b5a61d145264f: 21300000
   m_AtlasTags:
   - skillIcon
-  m_SpriteAtlas: {fileID: 0}
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   m_RD:
     serializedVersion: 3
     texture: {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
@@ -15580,7 +15580,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 0}
+    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -15660,14 +15660,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 272
       y: 0
       width: 128
       height: 128
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
+    atlasRectOffset: {x: 272, y: 0}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 336, z: 100, w: 64}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.64, y: 0.64}

Assets/Scripts/GameLogic/Combat/CombatState/CombatFightState.cs

@@ -19,7 +19,13 @@ namespace GameLogic.Combat.CombatState
             CombatController.CombatCameraControllder.isStop = true;
             CombatController.IsFightState = true;
             CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(60, 3);
-            AudioManager.Instance.PlayBGM("battle1.mp3");
+            int odds=Random.Range(0, 100);
+            if (odds < 50)
+                AudioManager.Instance.PlayBGM("battle2.mp3");
+            else
+            {
+                AudioManager.Instance.PlayBGM("battle1.mp3");
+            }
         }
 
         protected override void ProExit()

UserSettings/Layouts/default-2022.dwlt

@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
-    y: 51
-    width: 2544
-    height: 1333
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Timeline
+  m_Title: Project
   m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
+  m_Maximized: 1
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -41,8 +41,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 278
-    height: 1283
+    width: 461
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 25}
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 15}
   m_Position:
     serializedVersion: 2
-    x: 1972
+    x: 1608
     y: 0
-    width: 572
-    height: 1283
+    width: 952
+    height: 1299
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 333
+  controlID: 336
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -92,11 +92,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1184
-    width: 912
-    height: 99
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    y: 1120
+    width: 917
+    height: 179
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -121,12 +121,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 912
-    height: 1283
+    width: 917
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 20
+  controlID: 43
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -144,11 +144,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 763
-    width: 725
-    height: 520
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+    y: 772
+    width: 484
+    height: 527
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 23}
   m_Panes:
   - {fileID: 20}
@@ -175,8 +175,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1333
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -200,7 +200,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -221,8 +221,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1313
-    width: 2544
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -247,12 +247,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1283
+    width: 2560
+    height: 1299
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 89
+  controlID: 335
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -271,8 +271,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 912
-    height: 1184
+    width: 917
+    height: 1120
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
@@ -297,10 +297,10 @@ MonoBehaviour:
   - {fileID: 6}
   m_Position:
     serializedVersion: 2
-    x: 912
+    x: 917
     y: 0
-    width: 725
-    height: 1283
+    width: 484
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
@@ -323,10 +323,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 725
-    height: 763
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 484
+    height: 772
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
@@ -349,10 +349,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1637
+    x: 1401
     y: 0
-    width: 335
-    height: 1283
+    width: 207
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 24}
@@ -375,10 +375,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 278
+    x: 461
     y: 0
-    width: 294
-    height: 1283
+    width: 491
+    height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 26}
@@ -1988,10 +1988,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 1265
-    width: 911
-    height: 78
+    x: 0
+    y: 1193
+    width: 916
+    height: 158
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2160,10 +2160,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 81
-    width: 911
-    height: 1163
+    x: 0
+    y: 73
+    width: 916
+    height: 1099
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2216,23 +2216,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 911
-      height: 1142
-    m_Scale: {x: 0.70320195, y: 0.70320195}
-    m_Translation: {x: 455.5, y: 571}
+      width: 916
+      height: 1078
+    m_Scale: {x: 0.6637931, y: 0.6637931}
+    m_Translation: {x: 458, y: 539}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -647.75134
+      x: -689.97406
       y: -812
-      width: 1295.5027
+      width: 1379.9481
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.70320195
-  m_LastWindowPixelSize: {x: 911, y: 1163}
+  m_defaultScale: 0.6637931
+  m_LastWindowPixelSize: {x: 916, y: 1099}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -2258,10 +2258,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 920
-    y: 81
-    width: 723
-    height: 742
+    x: 917
+    y: 73
+    width: 482
+    height: 751
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2615,7 +2615,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: -200.00003, y: -254}
-      snapOffsetDelta: {x: 0.000030517578, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Hot Reload
       index: 11
@@ -2747,10 +2747,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 920
-    y: 844
-    width: 723
-    height: 499
+    x: 917
+    y: 845
+    width: 482
+    height: 506
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2790,10 +2790,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1645
-    y: 81
-    width: 333
-    height: 1262
+    x: 1401
+    y: 73
+    width: 205
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2807,23 +2807,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: bed50000
+      m_SelectedIDs: be8d0600
       m_LastClickedID: 0
-      m_ExpandedIDs: c82ffbfe7c8e0dffa2881fffc4881fff108731ff048643ffb47a55fffa7367ff167467ffa6b3b7ffc0b3b7ff6005eeff92edffffc0edffff78fafffff4ffffff
+      m_ExpandedIDs: 96bc8aff9cbc8aff7ebd8affe0bd8afff4db98ff02dc98ff58efffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fb_feicuihulu
-        m_OriginalName: fb_feicuihulu
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -5916950
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 14}
       m_SearchString: 
@@ -2853,10 +2853,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1980
-    y: 81
-    width: 276
-    height: 1262
+    x: 1608
+    y: 73
+    width: 459
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2878,7 +2878,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/Aduio/Skill/1402
+    - Assets/Res/Aduio/UI
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2886,30 +2886,30 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/Aduio/Skill/1402
+  - Assets/Res/Aduio/UI
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1099}
-    m_SelectedIDs: bca50100
-    m_LastClickedID: 107964
-    m_ExpandedIDs: 000000001a2d01001c2d01001e2d0100202d0100222d0100242d0100262d0100282d01002a2d01002c2d01002e2d0100302d0100322d0100342d0100362d0100382d01003a2d01003c2d01003e2d0100402d0100422d0100442d0100462d0100482d01004a2d01004c2d01004e2d0100502d0100522d0100542d0100562d0100582d0100302e01004e2e01009a2f0100a6a5010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 758}
+    m_SelectedIDs: a4630100
+    m_LastClickedID: 91044
+    m_ExpandedIDs: 00000000626001006460010066600100686001006a6001006c6001006e60010070600100726001007460010076600100786001007a6001007c6001007e60010080600100826001008460010086600100886001008a6001008c6001008e60010090600100926001009460010096600100986001009a6001009c6001009e600100a0600100a2600100a460010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 9101
-      m_OriginalName: 9101
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 108012
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 2}
     m_SearchString: 
@@ -2923,7 +2923,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000001a2d01001c2d01001e2d0100202d0100222d0100242d0100262d0100282d01002a2d01002c2d01002e2d0100302d0100322d0100342d0100362d0100382d01003a2d01003c2d01003e2d0100402d0100422d0100442d0100462d0100482d01004a2d01004c2d01004e2d0100502d0100522d0100542d0100562d0100582d0100
+    m_ExpandedIDs: 00000000626001006460010066600100686001006a6001006c6001006e60010070600100726001007460010076600100786001007a6001007c6001007e60010080600100826001008460010086600100886001008a6001008c6001008e60010090600100926001009460010096600100986001009a6001009c6001009e600100a0600100a2600100a4600100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2978,7 +2978,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 144
+  m_DirectoriesAreaWidth: 275
 --- !u!114 &26
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -2999,10 +2999,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2258
-    y: 81
-    width: 293
-    height: 1262
+    x: 2069
+    y: 73
+    width: 490
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0