Merge branch 'dev_hero' into dev_hero_2

2025-10-31 20:33:04 +08:00 · 2025-10-31 20:33:04 +08:00 · c0d9bde0e3
commit c0d9bde0e3
parent cbce1e763f bfb73d847f
29 changed files with 264 additions and 0 deletions
--- a/Assets/arts/sounds/sfx/battle/10016001.wav
+++ b/Assets/arts/sounds/sfx/battle/10016001.wav
--- a/Assets/arts/sounds/sfx/battle/10016001.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10016001.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a1d8887dd859cc54585b7c9ab57144ee
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10016002.wav
+++ b/Assets/arts/sounds/sfx/battle/10016002.wav
--- a/Assets/arts/sounds/sfx/battle/10016002.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10016002.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b826daa1025d1d348be87b6bebbf4d35
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10016003.wav
+++ b/Assets/arts/sounds/sfx/battle/10016003.wav
--- a/Assets/arts/sounds/sfx/battle/10016003.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10016003.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e6c8b2259610de44bad027bc3e4ae91f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10017001.wav
+++ b/Assets/arts/sounds/sfx/battle/10017001.wav
--- a/Assets/arts/sounds/sfx/battle/10017001.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10017001.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 985d5e09912ad9f43a69c3332406298a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10017002.wav
+++ b/Assets/arts/sounds/sfx/battle/10017002.wav
--- a/Assets/arts/sounds/sfx/battle/10017002.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10017002.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 897aaeb8f7179274c82beb82c898bb2e
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10017003.wav
+++ b/Assets/arts/sounds/sfx/battle/10017003.wav
--- a/Assets/arts/sounds/sfx/battle/10017003.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10017003.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f7a32951a668ccd4db6c4e2b7fca75ec
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10018001.wav
+++ b/Assets/arts/sounds/sfx/battle/10018001.wav
--- a/Assets/arts/sounds/sfx/battle/10018001.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10018001.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 645c162c1d8c92640a78b5361373fb43
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10018002.wav
+++ b/Assets/arts/sounds/sfx/battle/10018002.wav
--- a/Assets/arts/sounds/sfx/battle/10018002.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10018002.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d62f96915dd20494d93e935f4e692c5f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10018003.wav
+++ b/Assets/arts/sounds/sfx/battle/10018003.wav
--- a/Assets/arts/sounds/sfx/battle/10018003.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10018003.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8eb7d8bfbbdabe249894c98cf8212c05
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10019001.wav
+++ b/Assets/arts/sounds/sfx/battle/10019001.wav
--- a/Assets/arts/sounds/sfx/battle/10019001.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10019001.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 9011dc829c995534981a7dd239b5b156
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10019002.wav
+++ b/Assets/arts/sounds/sfx/battle/10019002.wav
--- a/Assets/arts/sounds/sfx/battle/10019002.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10019002.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 815bbe14c5eea0344b5ebeeb597b8ac3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/10019003.wav
+++ b/Assets/arts/sounds/sfx/battle/10019003.wav
--- a/Assets/arts/sounds/sfx/battle/10019003.wav.meta
+++ b/Assets/arts/sounds/sfx/battle/10019003.wav.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: afdb02dcdda929443bf28ebe89b0cd97
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 0
+    compressionFormat: 2
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 1
+  normalize: 1
+  preloadAudioData: 0
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/sounds/sfx/battle/2500201.wav
+++ b/Assets/arts/sounds/sfx/battle/2500201.wav
--- a/Assets/arts/sounds/sfx/battle/2500202.wav
+++ b/Assets/arts/sounds/sfx/battle/2500202.wav
--- a/Assets/arts/sounds/sfx/battle/2500203.wav
+++ b/Assets/arts/sounds/sfx/battle/2500203.wav
--- a/Assets/arts/sounds/sfx/battle/2500204.wav
+++ b/Assets/arts/sounds/sfx/battle/2500204.wav
--- a/Assets/arts/spines/characters/m10019/m10019.skel.bytes
+++ b/Assets/arts/spines/characters/m10019/m10019.skel.bytes