diff --git a/Assets/arts/effects/texture/glow/light_01.tga.meta b/Assets/arts/effects/texture/glow/light_01.tga.meta index cd15deb7c..e4c032a09 100644 --- a/Assets/arts/effects/texture/glow/light_01.tga.meta +++ b/Assets/arts/effects/texture/glow/light_01.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/other/light_dzh_0068_b01.png.meta b/Assets/arts/effects/texture/other/light_dzh_0068_b01.png.meta index ae6941bd4..d4efed00b 100644 --- a/Assets/arts/effects/texture/other/light_dzh_0068_b01.png.meta +++ b/Assets/arts/effects/texture/other/light_dzh_0068_b01.png.meta @@ -89,26 +89,26 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/sounds/sfx/battle/10001.wav b/Assets/arts/sounds/sfx/battle/10001.wav new file mode 100644 index 000000000..bb22768ef Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10001.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10001.wav.meta b/Assets/arts/sounds/sfx/battle/10001.wav.meta new file mode 100644 index 000000000..f467606df --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10001.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9635ac656f92c664eb8866ae8ff7f438 +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: diff --git a/Assets/arts/sounds/sfx/battle/10002.wav b/Assets/arts/sounds/sfx/battle/10002.wav new file mode 100644 index 000000000..bbf27b010 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10002.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10002.wav.meta b/Assets/arts/sounds/sfx/battle/10002.wav.meta new file mode 100644 index 000000000..ef0ea1880 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10002.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d2ce62b4e34191f4eb1a24d72274927b +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: diff --git a/Assets/arts/sounds/sfx/battle/10003.wav b/Assets/arts/sounds/sfx/battle/10003.wav new file mode 100644 index 000000000..676f0793a Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10003.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10003.wav.meta b/Assets/arts/sounds/sfx/battle/10003.wav.meta new file mode 100644 index 000000000..91af1ae56 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10003.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 901b4a7c83900c340a15c02f34d3d826 +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: diff --git a/Assets/arts/sounds/sfx/battle/10004.wav b/Assets/arts/sounds/sfx/battle/10004.wav new file mode 100644 index 000000000..676f0793a Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10004.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10004.wav.meta b/Assets/arts/sounds/sfx/battle/10004.wav.meta new file mode 100644 index 000000000..ae0031ad9 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10004.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c371660e22da83d4791e47a356ca8b51 +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: diff --git a/Assets/arts/sounds/sfx/battle/10005.wav b/Assets/arts/sounds/sfx/battle/10005.wav new file mode 100644 index 000000000..8f6a6b5c2 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10005.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10005.wav.meta b/Assets/arts/sounds/sfx/battle/10005.wav.meta new file mode 100644 index 000000000..adda7a6b9 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10005.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9f0be5391bdadd44fb7d83f2789027e2 +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: diff --git a/Assets/arts/sounds/sfx/battle/10006.wav b/Assets/arts/sounds/sfx/battle/10006.wav new file mode 100644 index 000000000..8b78b39b8 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10006.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10006.wav.meta b/Assets/arts/sounds/sfx/battle/10006.wav.meta new file mode 100644 index 000000000..736407b3c --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10006.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5f8d9b3b042797242a2d9ad489121dd5 +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: diff --git a/Assets/arts/sounds/sfx/battle/10022.wav b/Assets/arts/sounds/sfx/battle/10022.wav new file mode 100644 index 000000000..8f6a6b5c2 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10022.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10022.wav.meta b/Assets/arts/sounds/sfx/battle/10022.wav.meta new file mode 100644 index 000000000..fd85cd786 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10022.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5a680f6ea2cc84e43ab4a1bab03f92df +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: diff --git a/Assets/arts/sounds/sfx/battle/10029.wav b/Assets/arts/sounds/sfx/battle/10029.wav new file mode 100644 index 000000000..c6a2dafe3 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10029.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10029.wav.meta b/Assets/arts/sounds/sfx/battle/10029.wav.meta new file mode 100644 index 000000000..c9042f9b7 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10029.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a8cd7e7184ace81459012887beb065c1 +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: diff --git a/Assets/arts/sounds/sfx/battle/10030.wav b/Assets/arts/sounds/sfx/battle/10030.wav new file mode 100644 index 000000000..24d3187cb Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10030.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10030.wav.meta b/Assets/arts/sounds/sfx/battle/10030.wav.meta new file mode 100644 index 000000000..967e32e47 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10030.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 786fd36d727ed8a4c9a45e1eff884d0e +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: diff --git a/Assets/arts/sounds/sfx/battle/10031.wav b/Assets/arts/sounds/sfx/battle/10031.wav new file mode 100644 index 000000000..720662f02 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10031.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10031.wav.meta b/Assets/arts/sounds/sfx/battle/10031.wav.meta new file mode 100644 index 000000000..493fcf744 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10031.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6b86a3452c7bcc447bce7837b53c7d9d +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: diff --git a/Assets/arts/sounds/sfx/battle/10042.wav b/Assets/arts/sounds/sfx/battle/10042.wav new file mode 100644 index 000000000..ec81c4e99 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10042.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10042.wav.meta b/Assets/arts/sounds/sfx/battle/10042.wav.meta new file mode 100644 index 000000000..79b3f276e --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10042.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6541c529a7ce23241ad969844869c9a4 +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: diff --git a/Assets/arts/sounds/sfx/battle/10048.wav b/Assets/arts/sounds/sfx/battle/10048.wav new file mode 100644 index 000000000..eff167e0b Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10048.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10048.wav.meta b/Assets/arts/sounds/sfx/battle/10048.wav.meta new file mode 100644 index 000000000..8278ecd35 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10048.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7d8f99df9f2930e4b876514b5e46d321 +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: diff --git a/Assets/arts/sounds/sfx/battle/10053.wav b/Assets/arts/sounds/sfx/battle/10053.wav new file mode 100644 index 000000000..9a3749749 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10053.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10053.wav.meta b/Assets/arts/sounds/sfx/battle/10053.wav.meta new file mode 100644 index 000000000..2dc5f4db3 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10053.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a64cd667d767c0d41a679c9896239843 +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: diff --git a/Assets/arts/sounds/sfx/battle/10066.wav b/Assets/arts/sounds/sfx/battle/10066.wav new file mode 100644 index 000000000..f56e32053 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10066.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10066.wav.meta b/Assets/arts/sounds/sfx/battle/10066.wav.meta new file mode 100644 index 000000000..c3421b1a2 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10066.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 456368878c122a6409eeb7450f51ab47 +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: diff --git a/Assets/arts/sounds/sfx/battle/10072.wav b/Assets/arts/sounds/sfx/battle/10072.wav new file mode 100644 index 000000000..aec46bef2 Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10072.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10072.wav.meta b/Assets/arts/sounds/sfx/battle/10072.wav.meta new file mode 100644 index 000000000..c95f58e2a --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10072.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e23477734367ea741adf84757bc8f500 +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: diff --git a/Assets/arts/sounds/sfx/battle/10082.wav b/Assets/arts/sounds/sfx/battle/10082.wav new file mode 100644 index 000000000..a0e3c2aaa Binary files /dev/null and b/Assets/arts/sounds/sfx/battle/10082.wav differ diff --git a/Assets/arts/sounds/sfx/battle/10082.wav.meta b/Assets/arts/sounds/sfx/battle/10082.wav.meta new file mode 100644 index 000000000..a65ad8ea5 --- /dev/null +++ b/Assets/arts/sounds/sfx/battle/10082.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ec91937f6824f3849b469df72286b11e +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: diff --git a/Assets/lua/app/common/config_manager.lua.bytes b/Assets/lua/app/common/config_manager.lua.bytes index 6c73ea79b..5a94ad8d3 100644 Binary files a/Assets/lua/app/common/config_manager.lua.bytes and b/Assets/lua/app/common/config_manager.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index f979dd63f..7212b532b 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index 6a92e6cdf..df849f422 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/module/gm/gm_const.lua.bytes b/Assets/lua/app/module/gm/gm_const.lua.bytes index c58eb668d..17b3e754c 100644 Binary files a/Assets/lua/app/module/gm/gm_const.lua.bytes and b/Assets/lua/app/module/gm/gm_const.lua.bytes differ diff --git a/Assets/lua/app/server/server_data_manager.lua.bytes b/Assets/lua/app/server/server_data_manager.lua.bytes index a7382d640..6e21ec882 100644 Binary files a/Assets/lua/app/server/server_data_manager.lua.bytes and b/Assets/lua/app/server/server_data_manager.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_data.lua.bytes index 33d2613f1..739997144 100644 Binary files a/Assets/lua/app/userdata/battle/battle_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes index 47c582ec1..caac8ebca 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes differ