diff --git a/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshi002.png b/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshi002.png index 0f1ba9912f..559da8801f 100644 Binary files a/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshi002.png and b/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshi002.png differ diff --git a/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshixx.png b/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshixx.png index 9038605af7..48846c0c8c 100644 Binary files a/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshixx.png and b/Assets/ManagedResources/Atlas/CardAtlas/t_zhandoukuang_zhuangshixx.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudihong.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudihong.png index ef62e9eb18..0bf21fa274 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudihong.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudihong.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudizhuanshi.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudizhuanshi.png index c637eae312..db3107d995 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudizhuanshi.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_duiwudizhuanshi.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_hongse.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_hongse.png index 399d10deb7..d189557d24 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_hongse.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_hongse.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png new file mode 100644 index 0000000000..d8f9d3de3e Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png.meta new file mode 100644 index 0000000000..ff55642fe9 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_huise.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f9fe4f602d42d354c9b1f24efd491ff8 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3d889f6f3197b1f4da5f8817d4f184cb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png new file mode 100644 index 0000000000..2f0aa6e537 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png.meta new file mode 100644 index 0000000000..e07e542423 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_lvse.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4a4cf54bf46888d45a214e27929cc9fb +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0bffd35b373762a448a1ab0476a0a355 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshi.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshi.png index 8d320f0f41..db6d72fd5d 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshi.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshi.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png new file mode 100644 index 0000000000..bf16daaaf0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png.meta new file mode 100644 index 0000000000..2c832d3e4f --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_zhuanshiliujiaoxin.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b96ce91822621be4b824b0b7f9504f92 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3d8735f787e3c4f469afb18c69b710ed + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_hong10.png b/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_hong10.png index 018606ee57..42da7e7405 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_hong10.png and b/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_hong10.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_zhuangshixx_png.png b/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_zhuangshixx_png.png index 9038605af7..48846c0c8c 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_zhuangshixx_png.png and b/Assets/ManagedResources/Atlas/PublicAtlas/t_zhandoukuang_zhuangshixx_png.png differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ab_00014_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ab_00014_attack_01.mp3 index 1cb4374221..fa4768d327 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ab_00014_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ab_00014_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ax_0067_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ax_0067_attack_01.mp3 index 25f7086b44..f536845f74 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ax_0067_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ax_0067_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_bhxz_00013_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_bhxz_00013_attack_01.mp3 index 638ee762c5..bb9d2d15b1 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_bhxz_00013_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_bhxz_00013_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ce_00034_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ce_00034_attack_01.mp3 index d0861d804a..bea479ad2f 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ce_00034_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ce_00034_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0047_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0047_attack_01.mp3 index ec050f1b2a..35c7704269 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0047_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0047_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0049_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0049_attack_01.mp3 index 19b8d15c56..6e20e8a2d8 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0049_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cff_0049_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ch_0015_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ch_0015_attack_01.mp3 index 959fab6503..d9f2447c18 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ch_0015_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ch_0015_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3 new file mode 100644 index 0000000000..25b79e5006 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3.meta new file mode 100644 index 0000000000..60eb7c5720 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8ea2ecced0eadcd41af4dd18f049dc63 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_00031_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_00031_attack_01.mp3 index 6400b15a71..91746e9272 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_00031_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_00031_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cyh_0008_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cyh_0008_attack_01.mp3 index bab246380a..fbeff80b43 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cyh_0008_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cyh_0008_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ddtz_00049_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ddtz_00049_attack_01.mp3 index 5ae4d7453b..6b74d3b1fc 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ddtz_00049_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ddtz_00049_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dhdj_00042_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dhdj_00042_attack_01.mp3 index 37ca628017..fac3fc11ec 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dhdj_00042_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dhdj_00042_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dj_0008_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dj_0008_attack_01.mp3 index 0988b45754..98bf59671b 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dj_0008_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dj_0008_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dlsm_00033_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dlsm_00033_attack_01.mp3 index 8df13f3570..b28c45a3cd 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dlsm_00033_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dlsm_00033_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dst_00023_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dst_00023_attack_01.mp3 index d977591fc1..c1b6c22fa3 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dst_00023_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dst_00023_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3 new file mode 100644 index 0000000000..5da6e5e940 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3.meta new file mode 100644 index 0000000000..1b73982479 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_dt_00084_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d66c8d99cf1733d47ada027588aee6b7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_eh_00035_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_eh_00035_attack_01.mp3 index ddd0c81ce1..3072163d01 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_eh_00035_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_eh_00035_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fhlh_00021_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fhlh_00021_attack_01.mp3 index 4e85b24697..7261a42589 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fhlh_00021_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fhlh_00021_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fm_0027_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fm_0027_attack_01.mp3 index 8effb94ee0..bfc046637d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fm_0027_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fm_0027_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3 new file mode 100644 index 0000000000..1e046daaff Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3.meta new file mode 100644 index 0000000000..025d7541c8 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fs_00080_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2c81d89370bc5e24998e1a271830eaaa +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3 new file mode 100644 index 0000000000..d780c28160 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3.meta new file mode 100644 index 0000000000..a3c83b4050 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ft_00026_attack_01_1.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 139f29cf9ee4eed468ceb2dbe11b1bb5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fx_00028_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fx_00028_attack_01.mp3 index 59688b4180..087d6f1487 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fx_00028_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_fx_00028_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3 new file mode 100644 index 0000000000..35814555d2 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3.meta new file mode 100644 index 0000000000..35c7cc98b7 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gc_00081_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 605bb8bea292b3d45aa4d31ba9723056 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3 new file mode 100644 index 0000000000..8d819041ab Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3.meta new file mode 100644 index 0000000000..d23132f994 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gcll_00085_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 0323de3519eb5c94aa8c3f59abab30d6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gg_0005_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gg_0005_attack_01.mp3 index 018b50c2bc..34c2ba002f 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gg_0005_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gg_0005_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ghn_0009_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ghn_0009_attack_01.mp3 index a1848dc5ef..67fe957f76 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ghn_0009_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ghn_0009_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_attack_01.mp3 index b5621c7819..9915541ab9 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hhe_00011_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hhe_00011_attack_01.mp3 index a9b4acafcf..1c04e457c9 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hhe_00011_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hhe_00011_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3 new file mode 100644 index 0000000000..25c754b667 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3.meta new file mode 100644 index 0000000000..fc5e9e107d --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hl_00075_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 76d623c3ef722084eacc3f05371af0e7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hsmw_00010_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hsmw_00010_attack_01.mp3 index e8f5306400..b680046f6f 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hsmw_00010_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hsmw_00010_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3 new file mode 100644 index 0000000000..c649ebbd6c Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3.meta new file mode 100644 index 0000000000..4c1dae15f0 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_hy_00078_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: ec216d3e02fac4e479b4508bc10222a6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 index 55f2e0f9ac..ebe1367191 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jcdp_00027_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jcdp_00027_attack_01.mp3 index 372a87a94a..e55c95b6a8 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jcdp_00027_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jcdp_00027_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jff_0050_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jff_0050_attack_01.mp3 index 2baf8b1426..fdf97dd82b 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jff_0050_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jff_0050_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jhsn_0021_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jhsn_0021_attack_01.mp3 index e8f3580ec7..40b47e5b4e 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jhsn_0021_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jhsn_0021_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_attack_01.mp3 index 4480c45d47..1916fbb408 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jmm_0006_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jmm_0006_attack_01.mp3 index 7686a1b4bb..96cd49fad7 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jmm_0006_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jmm_0006_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jpw_0024_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jpw_0024_attack_01.mp3 index 903a3b9d8b..fd14b183a5 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jpw_0024_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jpw_0024_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_attack_01.mp3 index 9b807a9154..9fe8e034e9 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jw_0003_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jw_0003_attack_01.mp3 index 429da9ec4a..265a825494 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jw_0003_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jw_0003_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jz_0002_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jz_0002_attack_01.mp3 index c1683d9908..701d8f892d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jz_0002_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jz_0002_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jzy_00043_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jzy_00043_attack_01.mp3 index 3d02020ea8..29edf4c3e9 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jzy_00043_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jzy_00043_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_kqmw_00018_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_kqmw_00018_attack_01.mp3 index f6c72dc534..bc0f3a7eda 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_kqmw_00018_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_kqmw_00018_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lc_00050_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lc_00050_attack_01.mp3 index 856bf504a5..8ea339afeb 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lc_00050_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lc_00050_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack_01.mp3 index b0943e40ab..3633e6b8b6 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ldb_00047_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ljgz_00032_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ljgz_00032_attack_01.mp3 index 94f953732f..0a4ebead32 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ljgz_00032_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ljgz_00032_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ls_0004_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ls_0004_attack_01.mp3 index a1a6062735..045ef206b6 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ls_0004_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ls_0004_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_attack_01.mp3 index 96f14ed8fe..b1b48487b7 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lslz_00046_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lzz_0002_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lzz_0002_attack_01.mp3 index 896eaa5c96..8aff683adc 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lzz_0002_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_lzz_0002_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mc_0034_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mc_0034_attack_01.mp3 index 8f86e52eb3..84c9f3f70c 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mc_0034_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mc_0034_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mlmn_0054_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mlmn_0054_attack_01.mp3 index 91f35fabfc..a0a383cd9c 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mlmn_0054_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mlmn_0054_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mp_00051_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mp_00051_attack_01.mp3 index 278898016e..a18c904ce0 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mp_00051_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mp_00051_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mz_00038_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mz_00038_attack_01.mp3 index 7f6b290fc1..986da23ba7 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mz_00038_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_mz_00038_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3 new file mode 100644 index 0000000000..d8c3fb53c2 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3.meta new file mode 100644 index 0000000000..5b03d501e5 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nj_00079_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 9a8bcb7492321cf42a416003936ec723 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ny_00036_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ny_00036_attack_01.mp3 index 1620be4725..0551f2e646 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ny_00036_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ny_00036_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nz_00029_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nz_00029_attack_01.mp3 index 6697cb9bcf..406fbba368 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nz_00029_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_nz_00029_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_pxps_00024_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_pxps_00024_attack_01.mp3 index 66cc21a0e1..8eadb64d0f 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_pxps_00024_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_pxps_00024_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_qr_0065_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_qr_0065_attack_01.mp3 index 9a2f6b6501..2eb0d3afd5 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_qr_0065_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_qr_0065_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rd_00019_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rd_00019_attack_01.mp3 index 2870048541..82cf5f9cdb 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rd_00019_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rd_00019_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rj_0033_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rj_0033_attack_01.mp3 index 0d8b5ed987..c14493ab6d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rj_0033_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_rj_0033_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_attack_01.mp3 index 2b649352be..e3a39c56de 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sjnn_00012_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sjnn_00012_attack_01.mp3 index ae633657da..cc918172b7 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sjnn_00012_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sjnn_00012_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 index 23cf3d38ae..462e20f330 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_attack_01_1.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ttjz_00048_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ttjz_00048_attack_01.mp3 index 8f1b3d5388..80236b5a86 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ttjz_00048_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ttjz_00048_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wg_00037_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wg_00037_attack_01.mp3 index c8c4abca23..d4c9e37c01 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wg_00037_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wg_00037_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wsps_00016_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wsps_00016_attack_01.mp3 index 4348048ae9..00d871767a 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wsps_00016_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_wsps_00016_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3 new file mode 100644 index 0000000000..c649ebbd6c Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3.meta new file mode 100644 index 0000000000..80883d3bbf --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhy_00082_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 0709745bf1c22ee4abf982df3129db09 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3 new file mode 100644 index 0000000000..82aba2f5b8 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3.meta new file mode 100644 index 0000000000..c043848258 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xl_0030_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: c18170647e0af9444b8e891e8ddb2d2b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xllh_00022_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xllh_00022_attack_01.mp3 index 0a9280cece..a145b15997 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xllh_00022_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xllh_00022_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3 new file mode 100644 index 0000000000..6e894a4db4 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3.meta new file mode 100644 index 0000000000..051b034327 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xv_00071_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bd9955ff7920f1e4894ece48e7da5b6e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0026_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0026_attack_01.mp3 index fd04fa4195..34c154e88c 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0026_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0026_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_attack_01.mp3 index 72e496fe03..f450291423 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3 new file mode 100644 index 0000000000..7d5f8ad012 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3.meta new file mode 100644 index 0000000000..d85f285be0 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_y_0013_skeff_slidesk_debuff.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: 5256dc62ef807b847b5a0fcd352f9bd8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yc_00052_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yc_00052_attack_01.mp3 index 089d995055..6540f74e15 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yc_00052_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yc_00052_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ygps_00025_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ygps_00025_attack_01.mp3 index 6df7982ac8..2f2de2334e 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ygps_00025_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ygps_00025_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_attack_01.mp3 index 4be3233376..e4701e08b4 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3 new file mode 100644 index 0000000000..45ed7b46b6 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3.meta new file mode 100644 index 0000000000..dea0645cc1 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yl_0014_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: ff337c8e6b92b224ca626a7bbbc20faa +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ylw_00053_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ylw_00053_attack_01.mp3 index 1c04a6bac1..6fb367d8fb 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ylw_00053_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ylw_00053_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0051_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0051_attack_01.mp3 index 7bc0432052..da444d772d 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0051_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0051_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0052_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0052_attack_01.mp3 index 6ff84ef832..4e00ba59fc 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0052_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ym_0052_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3 new file mode 100644 index 0000000000..c649ebbd6c Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3.meta new file mode 100644 index 0000000000..131d508948 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ynj_00083_attack_01.mp3.meta @@ -0,0 +1,43 @@ +fileFormatVersion: 2 +guid: b384ee9e3df7440449ce3bbe75fcd99f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 1: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 4: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + 7: + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zgm_00039_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zgm_00039_attack_01.mp3 index 873aafe9a2..37c53d7786 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zgm_00039_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zgm_00039_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zs_0080_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zs_0080_attack_01.mp3 index dbc35fff99..baa402b70e 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zs_0080_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_zs_0080_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 new file mode 100644 index 0000000000..9fd8df7abb Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta new file mode 100644 index 0000000000..d9321b00e5 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2530113d163f1be4985362807cb96f15 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 new file mode 100644 index 0000000000..2af4d6abcf Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3.meta new file mode 100644 index 0000000000..c6cd006378 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a304c709f92ec07449617872fbef2e0d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3 new file mode 100644 index 0000000000..b309b227fa Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3.meta new file mode 100644 index 0000000000..8692c9f3db --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6557c3bc70dac9f45b86c2c438f6b80e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 index 9ce93b9e35..f829d10278 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 04f5902a95..d16de8abea 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -4554,7 +4554,7 @@ ParticleSystem: --- !u!199 &199787422305027156 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9203,7 +9203,7 @@ ParticleSystem: --- !u!199 &199651780022285358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20763,6 +20763,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -20771,22 +20781,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -20913,6 +20913,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -20921,22 +20931,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -21063,6 +21063,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -21071,22 +21081,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -21213,6 +21213,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -21221,22 +21231,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -21363,6 +21363,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -21371,22 +21381,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -21513,6 +21513,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -21521,22 +21531,12 @@ PrefabInstance: - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: -1.2000008 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab index 486eed46da..7512c9d9f6 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab @@ -3297,8 +3297,8 @@ RectTransform: 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.93, y: 4.25} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: -0.9299011, y: 4.250122} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4902145506794804002 CanvasRenderer: @@ -14748,7 +14748,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8119500688749586592} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -15907,7 +15907,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 156.3, y: -15} + m_AnchoredPosition: {x: 138.9, y: -9.7} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3772607619230890780 diff --git a/Assets/ManagedResources/Prefabs/UI/View/Hero.prefab b/Assets/ManagedResources/Prefabs/UI/View/Hero.prefab index 0d909edc09..e0ec9bdbad 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/Hero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/Hero.prefab @@ -35,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110.139496, y: 1.2465} + m_AnchoredPosition: {x: 69.153496, y: 1.2465} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &8743653308438433369 @@ -332,7 +332,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 48.660496, y: 1.2465} + m_AnchoredPosition: {x: 48.660496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818097329355 @@ -481,7 +481,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.26} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031818352649178 @@ -704,7 +704,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: 1.2465} + m_AnchoredPosition: {x: 69.153496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818590170636 @@ -1074,7 +1074,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.26} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031818794305975 @@ -1149,8 +1149,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 103.1465, y: 1.2465} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 184, y: 12.5} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818851291984 CanvasRenderer: @@ -1167,7 +1167,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2320031818851291987} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1180,7 +1180,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1373,7 +1373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28.167496, y: 1.2465} + m_AnchoredPosition: {x: 28.167496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031818921221044 @@ -1447,8 +1447,8 @@ RectTransform: 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: -1.2, y: 5.15} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031819088404997 CanvasRenderer: @@ -1596,7 +1596,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.26} m_SizeDelta: {x: 19, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031819195525459 @@ -1745,7 +1745,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110.139496, y: 1.2465} + m_AnchoredPosition: {x: 110.139496, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819291926011 @@ -2349,8 +2349,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82.653496, y: 1.2465} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 145, y: 12.5} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819788793331 CanvasRenderer: @@ -2367,7 +2367,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2320031819788793294} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2380,7 +2380,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2424,8 +2424,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.153496, y: 1.2465} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 59.899994, y: 4.5} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819795124044 CanvasRenderer: @@ -2442,7 +2442,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2320031819795124047} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2455,7 +2455,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2499,8 +2499,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 45.399994, y: 25} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 45.899994, y: 16} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031819818155162 CanvasRenderer: @@ -2647,7 +2647,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.26} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031819916146519 @@ -2838,7 +2838,7 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: -16 m_ChildAlignment: 4 m_Spacing: -12 m_ChildForceExpandWidth: 0 @@ -2880,8 +2880,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 123.639496, y: 1.2465} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 223, y: 12.5} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820124984919 CanvasRenderer: @@ -2898,7 +2898,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2320031820124984914} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2911,7 +2911,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2955,8 +2955,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82.653496, y: 1.2465} - m_SizeDelta: {x: 32.493, y: 32.493} + m_AnchoredPosition: {x: 106, y: 12.5} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820163869941 CanvasRenderer: @@ -2973,7 +2973,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2320031820163869936} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2986,7 +2986,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} + m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3029,7 +3029,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.26} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2320031820207909308 @@ -3104,7 +3104,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.6465, y: 1.2465} + m_AnchoredPosition: {x: 89.6465, y: -6.7535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2320031820211446152 diff --git a/Assets/ManagedResources/Prefabs/UI/View/card.prefab b/Assets/ManagedResources/Prefabs/UI/View/card.prefab index 4ba7897872..5a6379997b 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/card.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/card.prefab @@ -480,7 +480,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c265e2f8d19ae954794be1fdcdc056a6, type: 3} + m_Sprite: {fileID: 21300000, guid: 7143a2cd0ef48cd41b6ca47409825665, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/View/starGrid.prefab b/Assets/ManagedResources/Prefabs/UI/View/starGrid.prefab index 39739fc354..8b4984c2a5 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/starGrid.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/starGrid.prefab @@ -34,7 +34,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7449540768042544964 @@ -108,8 +108,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3996141899547081441 CanvasRenderer: @@ -332,7 +332,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1551955089937526459 CanvasRenderer: @@ -362,7 +362,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} + m_Sprite: {fileID: 21300000, guid: b96ce91822621be4b824b0b7f9504f92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -481,7 +481,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1551067733914725939 CanvasRenderer: @@ -706,7 +706,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1551334454772819811 CanvasRenderer: @@ -736,7 +736,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} + m_Sprite: {fileID: 21300000, guid: b96ce91822621be4b824b0b7f9504f92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -854,7 +854,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1550502014964558859 CanvasRenderer: @@ -929,7 +929,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1551214621104267977 CanvasRenderer: @@ -959,7 +959,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} + m_Sprite: {fileID: 21300000, guid: b96ce91822621be4b824b0b7f9504f92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1003,8 +1003,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773780714588224777 CanvasRenderer: @@ -1077,7 +1077,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2172601992576033742 @@ -1151,7 +1151,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3818454397937373093 @@ -1227,7 +1227,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4208875937828559942 CanvasRenderer: @@ -1300,7 +1300,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8770222257757600509 @@ -1374,7 +1374,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8770466691058792572 @@ -1448,7 +1448,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8066637356983613169 @@ -1524,7 +1524,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8861670425039887895 CanvasRenderer: @@ -1554,7 +1554,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} + m_Sprite: {fileID: 21300000, guid: b96ce91822621be4b824b0b7f9504f92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1599,7 +1599,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1457376719880785993 CanvasRenderer: @@ -1672,7 +1672,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2804619991605214407 @@ -1747,8 +1747,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6695412919181047459 CanvasRenderer: @@ -1821,7 +1821,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7821147682072810527 @@ -1897,7 +1897,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &195995575523161788 CanvasRenderer: @@ -1971,8 +1971,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6987409428865215157 CanvasRenderer: @@ -2047,7 +2047,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &451391444765037712 CanvasRenderer: @@ -2122,7 +2122,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 79, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2078663146705090522 CanvasRenderer: @@ -2195,7 +2195,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5590499270208418293 @@ -2269,7 +2269,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 3.21} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5173825936022625071 @@ -2344,8 +2344,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7514722374955115056 CanvasRenderer: @@ -2420,7 +2420,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 60, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6357671899559768833 CanvasRenderer: @@ -2450,7 +2450,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3} + m_Sprite: {fileID: 21300000, guid: b96ce91822621be4b824b0b7f9504f92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2494,8 +2494,8 @@ RectTransform: 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.88, y: 3.58} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &411422871683197309 CanvasRenderer: diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader new file mode 100644 index 0000000000..6cbf9449c9 --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader @@ -0,0 +1,33 @@ +// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) + +// Simplified Diffuse shader. Differences from regular Diffuse one: +// - no Main Color +// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. + +Shader "Hidden/Default-Diffuse" { +Properties { + //_MainTex ("Base (RGB)", 2D) = "white" {} +} +SubShader { + Tags { "RenderType"="Opaque" } + LOD 150 + +CGPROGRAM +#pragma surface surf Lambert noforwardadd + +//sampler2D _MainTex; + +struct Input { + float2 uv_MainTex; +}; + +void surf (Input IN, inout SurfaceOutput o) { + //fixed4 c = tex2D(_MainTex, IN.uv_MainTex); + o.Albedo = fixed3(1,1,1); + o.Alpha = 1; +} +ENDCG +} + +Fallback "Hidden/InternalErrorShader" +} diff --git a/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader.meta b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader.meta new file mode 100644 index 0000000000..d8a9251f60 --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse_shader.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1cf234f48b286c5458c446aca9ea60c7 +timeCreated: 1505447125 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 39da5203d2..357f19593f 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -9498,6 +9498,10 @@ MonoBehaviour: extension: .png resPathIndex: 54 resAbNameIndex: 28 + - resName: r_tongyong_huise + extension: .png + resPathIndex: 54 + resAbNameIndex: 28 - resName: r_tongyong_jia extension: .png resPathIndex: 54 @@ -9522,6 +9526,10 @@ MonoBehaviour: extension: .png resPathIndex: 54 resAbNameIndex: 28 + - resName: r_tongyong_lvse + extension: .png + resPathIndex: 54 + resAbNameIndex: 28 - resName: r_tongyong_qipao extension: .png resPathIndex: 54 @@ -16762,6 +16770,10 @@ MonoBehaviour: extension: .png resPathIndex: 117 resAbNameIndex: 1089 + - resName: Logo_dhyq + extension: .png + resPathIndex: 117 + resAbNameIndex: 1089 - resName: l_lb_1 extension: .jpg resPathIndex: 117 @@ -17982,6 +17994,14 @@ MonoBehaviour: extension: .anim resPathIndex: 120 resAbNameIndex: 1316 + - resName: dajin_effect_03_001 + extension: .anim + resPathIndex: 120 + resAbNameIndex: 1316 + - resName: dajin_effect_03_004 + extension: .anim + resPathIndex: 120 + resAbNameIndex: 1316 - resName: DaMen extension: .controller resPathIndex: 120 @@ -18226,6 +18246,10 @@ MonoBehaviour: extension: .controller resPathIndex: 120 resAbNameIndex: 1316 + - resName: glow 2 + extension: .controller + resPathIndex: 120 + resAbNameIndex: 1316 - resName: glow 3 extension: .controller resPathIndex: 120 @@ -18394,6 +18418,10 @@ MonoBehaviour: extension: .controller resPathIndex: 120 resAbNameIndex: 1316 + - resName: neifaguang + extension: .controller + resPathIndex: 120 + resAbNameIndex: 1316 - resName: normalAttackFloat extension: .anim resPathIndex: 120 @@ -20722,6 +20750,26 @@ MonoBehaviour: extension: .mat resPathIndex: 121 resAbNameIndex: 1316 + - resName: dajin_effect_02_60 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 + - resName: dajin_effect_02_62 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 + - resName: dajin_effect_03_01 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 + - resName: dajin_effect_09 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 + - resName: dajin_effect_10 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 - resName: dajin_effect_15 extension: .mat resPathIndex: 121 @@ -22010,6 +22058,10 @@ MonoBehaviour: extension: .mat resPathIndex: 121 resAbNameIndex: 1316 + - resName: RanDeng_effect_07 + extension: .mat + resPathIndex: 121 + resAbNameIndex: 1316 - resName: RanDeng_effect_08 extension: .mat resPathIndex: 121 @@ -24586,6 +24638,10 @@ MonoBehaviour: extension: .tga resPathIndex: 123 resAbNameIndex: 1316 + - resName: H_0974 + extension: .tga + resPathIndex: 123 + resAbNameIndex: 1316 - resName: H_0982 extension: .tga resPathIndex: 123 @@ -26378,6 +26434,10 @@ MonoBehaviour: extension: .tga resPathIndex: 123 resAbNameIndex: 1316 + - resName: waifaguang_02 + extension: .tga + resPathIndex: 123 + resAbNameIndex: 1316 - resName: wan extension: .png resPathIndex: 123 @@ -31478,6 +31538,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 152 resAbNameIndex: 1519 + - resName: UI_Effect_jinkuang_KaPai + extension: .prefab + resPathIndex: 152 + resAbNameIndex: 1519 - resName: live2d_boss_01 extension: .prefab resPathIndex: 153 @@ -46600,7 +46664,6 @@ MonoBehaviour: - lz4/fonts/powerfont.unity3d - lz4/fonts/powernewfont.unity3d - lz4/icons.unity3d - - lz4/prefabs/ui/view.unity3d - lz4/publicartres/animations.unity3d - lz4/publicartres/materials.unity3d - lz4/publicartres/models.unity3d diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e99a6ef9d4..b4b4fd2cc7 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -98,8 +98,8 @@ QualityBgDef = { } --Hero大卡前面遮罩 GetHeroCardQuantityImage = { - [1] = "r_tongyong_lanse", - [2] = "r_tongyong_lanse", + [1] = "r_tongyong_huise", + [2] = "r_tongyong_lvse", [3] = "r_tongyong_lanse", [4] = "r_tongyong_zise", [5] = "r_tongyong_jinse", diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 2c1dd212a3..e36acc43ee 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -327,7 +327,7 @@ function GuildMap_Pos2UV(pos) end --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-16个预设 -function SetHeroStars(starGrid, star, type,_starSize,_scale,_pivot) +function SetHeroStars(starGrid, star, type,_starSize,_scale,_pivot,rotation) local starSize = Vector2(35,35) if _starSize then starSize = _starSize @@ -360,6 +360,9 @@ function SetHeroStars(starGrid, star, type,_starSize,_scale,_pivot) if i <= star then starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = Util.LoadSprite(GetHeroStarImage[1]) starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize + if rotation then + starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) + end starPre.transform:GetChild(i - 1).gameObject:SetActive(true) else starPre.transform:GetChild(i - 1).gameObject:SetActive(false) @@ -370,6 +373,9 @@ function SetHeroStars(starGrid, star, type,_starSize,_scale,_pivot) if i <= star - 5 then starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = Util.LoadSprite(GetHeroStarImage[2]) starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize + if rotation then + starPre.transform:GetChild(i - 1):GetComponent("RectTransform").rotation = Quaternion.Euler(rotation) + end starPre.transform:GetChild(i - 1).gameObject:SetActive(true) else starPre.transform:GetChild(i - 1).gameObject:SetActive(false) @@ -704,20 +710,20 @@ end function GetQuantityImageByquality(quality,star) if star then--and star > 5 if star == 1 then - return "r_characterbg_gray" - elseif star == 2 then - return "r_characterbg_green" - elseif star == 3 then - return "r_characterbg_blue" - elseif star == 4 then - return "r_characterbg_purple" - elseif star == 5 then - return "r_characterbg_goden" - elseif star == 6 then - return "r_characterbg_gules" - elseif star >= 7 then - return "t_tongyong_topkaung" - end + return "r_characterbg_gray" + elseif star == 2 then + return "r_characterbg_green" + elseif star == 3 then + return "r_characterbg_blue" + elseif star == 4 then + return "r_characterbg_purple" + elseif star == 5 then + return "r_characterbg_goden" + elseif star >= 6 and star <=10 then + return "r_characterbg_gules" + elseif star > 10 then + return "r_characterbg_gules" + end else if quality == 0 or quality == 1 then return "r_characterbg_gray" @@ -808,10 +814,10 @@ function GetHeroQuantityImageByquality(quality,star) return "r_characterbg_purple" elseif star == 5 then return "r_characterbg_goden" - elseif star == 6 then + elseif star >= 6 and star <=10 then + return "r_characterbg_gules" + elseif star > 10 then return "r_characterbg_gules" - elseif star >= 7 then - return "t_tongyong_topkaung" end else if quality == 0 or quality == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 0c7a217f5a..02287b69a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -736,16 +736,19 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) --Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = Util.LoadSprite(HeroStageSprite[heroData.HeroStage]) Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false) local starGrid = Util.GetGameObject(_go.transform, "star") - SetHeroStars(starGrid, star) + SetHeroStars(starGrid, star,1,nil,-15,nil,Vector3.New(0,0,-15)) Util.AddOnceClick(Util.GetGameObject(_go.transform, "card"), function() UIManager.OpenPanel(UIName.HandBookHeroInfoPanel,heroData,proId,star) end) if PlayerManager.GetHeroDataByStar(star,heroData.Id) then Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), false) + Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), false) + Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = nil else Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), true) - + Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), true) + Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").material end end --设置装备数据 diff --git a/data_execl/base_data/RoleConfig.xlsx b/data_execl/base_data/RoleConfig.xlsx index 63cc8ad962..0bd794af3d 100644 Binary files a/data_execl/base_data/RoleConfig.xlsx and b/data_execl/base_data/RoleConfig.xlsx differ