diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta index cdad065a2..4c9691d7d 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 86ed21a582598d94cb17c98ba4598b0e TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta index f9e54bc0e..cfd494829 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes index 045bbb985..f41a04fda 100644 Binary files a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes and b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta index 0da7825b9..8ad7785ff 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 2712e76af21e0b74490cb458b6ae7dc1 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta index e71919a74..c24cbcebc 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat index 019971a03..fcc235f6e 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_battle_obstacle_firesnake_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta index 42faeec40..dc341cbde 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta index ea180eb75..958e6334a 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta index 5a269129c..a440eab8b 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 3ed10442ee9581f47a6444d6b5b652d9 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta index 87215db4e..a72c3097e 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes index 6a985a51f..2d06c50b9 100644 Binary files a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes and b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta index 91f02ae30..5da0ec9f8 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 2816dc8db3ede0045b0b050a5a1b516c TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta index afbe81c5f..a8c91a6a1 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat index a26a2f90f..3a30538bb 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat @@ -8,9 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_battle_obstacle_waternake_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: [] m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -29,6 +28,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -36,9 +36,10 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 1 + - _StraightAlphaInput: 0 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta index 603d932d4..5a569f7f3 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta index c96ba1529..8d833bbdf 100644 --- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/background/battle_common/chessboard_1.png b/Assets/arts/textures/background/battle_common/chessboard_1.png index a1d38dd20..0ef96306e 100644 Binary files a/Assets/arts/textures/background/battle_common/chessboard_1.png and b/Assets/arts/textures/background/battle_common/chessboard_1.png differ diff --git a/Assets/arts/textures/background/battle_common/chessboard_1_1.png b/Assets/arts/textures/background/battle_common/chessboard_1_1.png index acebfdb1a..c9d2262cf 100644 Binary files a/Assets/arts/textures/background/battle_common/chessboard_1_1.png and b/Assets/arts/textures/background/battle_common/chessboard_1_1.png differ diff --git a/Assets/arts/textures/background/battle_common/chessboard_2.png b/Assets/arts/textures/background/battle_common/chessboard_2.png index a68e22b12..1b0b68074 100644 Binary files a/Assets/arts/textures/background/battle_common/chessboard_2.png and b/Assets/arts/textures/background/battle_common/chessboard_2.png differ diff --git a/Assets/arts/textures/background/battle_common/chessboard_2_1.png b/Assets/arts/textures/background/battle_common/chessboard_2_1.png index 534f2b2cd..edce975d8 100644 Binary files a/Assets/arts/textures/background/battle_common/chessboard_2_1.png and b/Assets/arts/textures/background/battle_common/chessboard_2_1.png differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png b/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png deleted file mode 100644 index 941a3ec22..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png.meta b/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png.meta deleted file mode 100644 index 4a72c894c..000000000 --- a/Assets/arts/textures/background/chapter/chapter_1/bg_1_10_dingdanmuqiang.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 2360508f62bb248758b26adbeea013e9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png b/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png deleted file mode 100644 index d825c2a29..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png.meta b/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png.meta deleted file mode 100644 index 65e87d029..000000000 --- a/Assets/arts/textures/background/chapter/chapter_1/bg_1_11_fanzhongli.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 6b233f56ddbc24522b06af655dee419a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png b/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png deleted file mode 100644 index c0d52a494..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png.meta b/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png.meta deleted file mode 100644 index 81571c3ac..000000000 --- a/Assets/arts/textures/background/chapter/chapter_1/bg_1_12_shangdian.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 8ca6014a7fb8148d7bf3b73639379614 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png b/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png deleted file mode 100644 index 8030112aa..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png.meta b/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png.meta deleted file mode 100644 index f7f2d655d..000000000 --- a/Assets/arts/textures/background/chapter/chapter_1/bg_1_13_chuansongmen.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 90efbf7cecc9b4fb7be0b744062928e3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png b/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png deleted file mode 100644 index d23926935..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png.meta b/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png.meta deleted file mode 100644 index b713f482e..000000000 --- a/Assets/arts/textures/background/chapter/chapter_1/bg_1_14_guanceta.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: ee47aa9c239374714af9f074c8e01b7e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png b/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png deleted file mode 100644 index 953659c8b..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png.meta b/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png.meta deleted file mode 100644 index cf1d5348b..000000000 --- a/Assets/arts/textures/background/chapter/chapter_2/bg_2_10_shiyanguan.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 24aa903d9702b4e91b07bd98416913ff -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png b/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png deleted file mode 100644 index 344125163..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png.meta b/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png.meta deleted file mode 100644 index 3aa353df0..000000000 --- a/Assets/arts/textures/background/chapter/chapter_2/bg_2_11_shusong.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: dd485d07f2482412a8572624ea152541 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png b/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png deleted file mode 100644 index 38953b875..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png.meta b/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png.meta deleted file mode 100644 index 83bb84501..000000000 --- a/Assets/arts/textures/background/chapter/chapter_2/bg_2_12_chouyou.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: eeb3442ea99ca45cb8c4d8f0456e9de3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png b/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png deleted file mode 100644 index 337c53d9b..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png.meta b/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png.meta deleted file mode 100644 index ca600db9d..000000000 --- a/Assets/arts/textures/background/chapter/chapter_2/bg_2_13_lianyou.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 63cf7875eff23409bb1a83292845e769 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png b/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png deleted file mode 100644 index ab779329f..000000000 Binary files a/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png and /dev/null differ diff --git a/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png.meta b/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png.meta deleted file mode 100644 index fe54140b8..000000000 --- a/Assets/arts/textures/background/chapter/chapter_2/bg_2_9_lajichang.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 6b3414f2c4e6747e89b4d53a4fdcb524 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png index e8fc0f2a8..f179a4218 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png and b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index a20243231..00cb7e36d 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 84dd47f24..efe33a358 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/task/task_manager.lua.bytes b/Assets/lua/app/module/task/task_manager.lua.bytes index faf1bcd09..4b963d4e7 100644 Binary files a/Assets/lua/app/module/task/task_manager.lua.bytes and b/Assets/lua/app/module/task/task_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index df1a5330c..43f487d6d 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes b/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes index 836472f3d..b81de8c45 100644 Binary files a/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes index eeb704208..aae7a0c8c 100644 Binary files a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes and b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index 9db7f35ea..108eac928 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index 1b709628d..538f3a0c8 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes index 4c763ca0f..d08902d8e 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 76db24be0..bfe4c0066 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/daily_challenge/daily_challenge_data.lua.bytes b/Assets/lua/app/userdata/daily_challenge/daily_challenge_data.lua.bytes index 2b3461fab..0abee3899 100644 Binary files a/Assets/lua/app/userdata/daily_challenge/daily_challenge_data.lua.bytes and b/Assets/lua/app/userdata/daily_challenge/daily_challenge_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/task/daily_task_data.lua.bytes b/Assets/lua/app/userdata/task/daily_task_data.lua.bytes index 28ac6f2dd..7ba00459f 100644 Binary files a/Assets/lua/app/userdata/task/daily_task_data.lua.bytes and b/Assets/lua/app/userdata/task/daily_task_data.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_rank_ui.prefab b/Assets/prefabs/ui/arena/arena_rank_ui.prefab index ebdae1836..ef3230d56 100644 --- a/Assets/prefabs/ui/arena/arena_rank_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_rank_ui.prefab @@ -1574,7 +1574,7 @@ MonoBehaviour: contentTrans: {fileID: 1586705043716040712} bfCell: {fileID: 8514494654570193417} topRecoveryOffset: 10 - downRecoveryOffset: 100 + downRecoveryOffset: 120 direction: 0 reverse: 0 cellWidth: 566 diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 28f48e6b2..2065ffb24 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -3511,7 +3511,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: -202.16693, y: 566.8778} + m_AnchoredPosition: {x: 0, y: 400} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7510062288709795474 @@ -5095,7 +5095,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} + m_Sprite: {fileID: 21300000, guid: 0251428c4fe5b4170a1c5828842659d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7417,7 +7417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7998466248905419511 RectTransform: m_ObjectHideFlags: 0 @@ -13471,7 +13471,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0251428c4fe5b4170a1c5828842659d6, type: 3} + m_Sprite: {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/chapter/chapter_2.prefab b/Assets/prefabs/ui/chapter/chapter_2.prefab index 3a8f7b3dd..5c37aaac6 100644 --- a/Assets/prefabs/ui/chapter/chapter_2.prefab +++ b/Assets/prefabs/ui/chapter/chapter_2.prefab @@ -30,14 +30,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5978201479599747125} m_Father: {fileID: 1432777368416542138} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 1500, y: 160} - m_SizeDelta: {x: 1500, y: 258} + m_SizeDelta: {x: 1500, y: 75} m_Pivot: {x: 0, y: 0} --- !u!222 &2891671087543336163 CanvasRenderer: @@ -67,7 +68,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 964f6c6f724124d93a3c229cbe6ca190, type: 3} + m_Texture: {fileID: 2800000, guid: 4d6ceeb35c94a4c82b95956758454d47, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -291,7 +292,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6750413216202164023 RectTransform: m_ObjectHideFlags: 0 @@ -309,8 +310,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 1800, y: 160} - m_SizeDelta: {x: 1732, y: 475} + m_AnchoredPosition: {x: 1500, y: 160} + m_SizeDelta: {x: 1500, y: 475} m_Pivot: {x: 0, y: 0} --- !u!222 &8314503688661495172 CanvasRenderer: @@ -340,7 +341,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 46d3aa3fcd00c416bbc668b9a820c315, type: 3} + m_Texture: {fileID: 2800000, guid: 964f6c6f724124d93a3c229cbe6ca190, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -360,8 +361,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1500 + resetX: 1500 type: 1 canMove: 1 --- !u!1 &1753946574179196349 @@ -631,14 +632,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5371487463751879116} m_Father: {fileID: 1432777368416542138} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 160} - m_SizeDelta: {x: 1500, y: 258} + m_SizeDelta: {x: 1500, y: 75} m_Pivot: {x: 0, y: 0} --- !u!222 &1102480095711075157 CanvasRenderer: @@ -668,7 +670,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 6179524a2f0c24a699922f311c0b6176, type: 3} + m_Texture: {fileID: 2800000, guid: 4d6ceeb35c94a4c82b95956758454d47, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -922,7 +924,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3211587025020768502 RectTransform: m_ObjectHideFlags: 0 @@ -941,7 +943,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 160} - m_SizeDelta: {x: 1732, y: 475} + m_SizeDelta: {x: 1500, y: 475} m_Pivot: {x: 0, y: 0} --- !u!222 &1651912296838112386 CanvasRenderer: @@ -971,7 +973,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 46d3aa3fcd00c416bbc668b9a820c315, type: 3} + m_Texture: {fileID: 2800000, guid: 6179524a2f0c24a699922f311c0b6176, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -991,8 +993,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1500 + resetX: 1500 type: 1 canMove: 1 --- !u!1 &5674239360881427173 @@ -1086,6 +1088,79 @@ MonoBehaviour: resetX: 2880 type: 1 canMove: 1 +--- !u!1 &6359316721153412421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5978201479599747125} + - component: {fileID: 4429614300471292787} + - component: {fileID: 6031130609397424974} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5978201479599747125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359316721153412421} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 240331695105713579} + m_RootOrder: 0 + 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_SizeDelta: {x: 1290, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4429614300471292787 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359316721153412421} + m_CullTransparentMesh: 1 +--- !u!114 &6031130609397424974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359316721153412421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 5686ac612d0ba4162b61859edd9de371, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &6387967998967931729 GameObject: m_ObjectHideFlags: 0 @@ -1178,3 +1253,76 @@ MonoBehaviour: resetX: 1800 type: 1 canMove: 1 +--- !u!1 &8387522397111918951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5371487463751879116} + - component: {fileID: 6340439257496401512} + - component: {fileID: 5747629588034418165} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5371487463751879116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8387522397111918951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6472266928923050935} + m_RootOrder: 0 + 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_SizeDelta: {x: 1290, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6340439257496401512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8387522397111918951} + m_CullTransparentMesh: 1 +--- !u!114 &5747629588034418165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8387522397111918951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 5686ac612d0ba4162b61859edd9de371, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 diff --git a/Assets/prefabs/ui/chapter/chapter_2_1.prefab b/Assets/prefabs/ui/chapter/chapter_2_1.prefab index 94ac5bae9..82de1c45b 100644 --- a/Assets/prefabs/ui/chapter/chapter_2_1.prefab +++ b/Assets/prefabs/ui/chapter/chapter_2_1.prefab @@ -30,14 +30,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7533606966740886399} m_Father: {fileID: 1432777368416542138} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 1500, y: 286} - m_SizeDelta: {x: 1500, y: 258} + m_AnchoredPosition: {x: 1440, y: 288} + m_SizeDelta: {x: 1440, y: 75} m_Pivot: {x: 0, y: 0} --- !u!222 &2891671087543336163 CanvasRenderer: @@ -67,7 +68,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 964f6c6f724124d93a3c229cbe6ca190, type: 3} + m_Texture: {fileID: 2800000, guid: 4d6ceeb35c94a4c82b95956758454d47, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -87,8 +88,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -100 - endX: -3000 - resetX: 1500 + endX: -2880 + resetX: 1440 type: 1 canMove: 0 --- !u!1 &829626138664820105 @@ -273,7 +274,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6750413216202164023 RectTransform: m_ObjectHideFlags: 0 @@ -291,8 +292,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 1800, y: 286} - m_SizeDelta: {x: 1732, y: 475} + m_AnchoredPosition: {x: 1500, y: 286} + m_SizeDelta: {x: 1500, y: 475} m_Pivot: {x: 0, y: 0} --- !u!222 &8314503688661495172 CanvasRenderer: @@ -322,7 +323,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 46d3aa3fcd00c416bbc668b9a820c315, type: 3} + m_Texture: {fileID: 2800000, guid: 964f6c6f724124d93a3c229cbe6ca190, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -342,8 +343,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -3000 + resetX: 1500 type: 1 canMove: 0 --- !u!1 &2137053403109311484 @@ -439,6 +440,79 @@ MonoBehaviour: resetX: 1800 type: 1 canMove: 0 +--- !u!1 &2444569535055171142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1158306127951737450} + - component: {fileID: 1642415134874041853} + - component: {fileID: 2709633900840241163} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1158306127951737450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2444569535055171142} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6472266928923050935} + m_RootOrder: 0 + 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_SizeDelta: {x: 1290, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1642415134874041853 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2444569535055171142} + m_CullTransparentMesh: 1 +--- !u!114 &2709633900840241163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2444569535055171142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 5686ac612d0ba4162b61859edd9de371, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &3578169134902532849 GameObject: m_ObjectHideFlags: 0 @@ -615,14 +689,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1158306127951737450} m_Father: {fileID: 1432777368416542138} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 286} - m_SizeDelta: {x: 1500, y: 258} + m_AnchoredPosition: {x: 0, y: 288} + m_SizeDelta: {x: 1440, y: 75} m_Pivot: {x: 0, y: 0} --- !u!222 &1102480095711075157 CanvasRenderer: @@ -652,7 +727,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 6179524a2f0c24a699922f311c0b6176, type: 3} + m_Texture: {fileID: 2800000, guid: 4d6ceeb35c94a4c82b95956758454d47, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -672,8 +747,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -100 - endX: -3000 - resetX: 1500 + endX: -2880 + resetX: 1440 type: 1 canMove: 0 --- !u!1 &4360703028100900995 @@ -921,7 +996,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3211587025020768502 RectTransform: m_ObjectHideFlags: 0 @@ -940,7 +1015,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 286} - m_SizeDelta: {x: 1732, y: 475} + m_SizeDelta: {x: 1500, y: 475} m_Pivot: {x: 0, y: 0} --- !u!222 &1651912296838112386 CanvasRenderer: @@ -970,7 +1045,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 46d3aa3fcd00c416bbc668b9a820c315, type: 3} + m_Texture: {fileID: 2800000, guid: 6179524a2f0c24a699922f311c0b6176, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -990,8 +1065,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -3000 + resetX: 1500 type: 1 canMove: 0 --- !u!1 &5634995114437035876 @@ -1305,6 +1380,79 @@ MonoBehaviour: resetX: 1800 type: 1 canMove: 0 +--- !u!1 &8564957085459170932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7533606966740886399} + - component: {fileID: 651802830381460875} + - component: {fileID: 361989311442625752} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7533606966740886399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564957085459170932} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 240331695105713579} + m_RootOrder: 0 + 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_SizeDelta: {x: 1290, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &651802830381460875 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564957085459170932} + m_CullTransparentMesh: 1 +--- !u!114 &361989311442625752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564957085459170932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 5686ac612d0ba4162b61859edd9de371, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8585040324751805280 GameObject: m_ObjectHideFlags: 0 @@ -1391,7 +1539,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x @@ -1404,7 +1556,11 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 171c57b9f57f7354d8edbda1ece70770, type: 2} + objectReference: {fileID: 11400000, guid: 1484612e2d5543d4db6571c739c4dd91, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1475,7 +1631,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 498 + value: 570 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1509,7 +1665,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x @@ -1522,7 +1682,11 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 88cb0269e772e3b48a64a75accfd9b53, type: 2} + objectReference: {fileID: 11400000, guid: f14e265aa38c14947b05a57fdf3f5bbc, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1593,7 +1757,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 470 + value: 532 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1627,7 +1791,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x @@ -1640,7 +1808,11 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 3615fc47150c6374db1e778321db8fbe, type: 2} + objectReference: {fileID: 11400000, guid: 7778876e39ec98f4a907ebdcca02af9b, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1711,7 +1883,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 660 + value: 506 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1745,7 +1917,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x @@ -1758,7 +1934,11 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 44a3e3cd901ff57418c551b286ac9f7f, type: 2} + objectReference: {fileID: 11400000, guid: 75616f3f67d893b41826482ed0d7f70b, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1829,7 +2009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 498 + value: 528 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1863,7 +2043,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x @@ -1876,7 +2060,11 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 5eefb238d7acb2f4e9b156cdf5678084, type: 2} + objectReference: {fileID: 11400000, guid: 550d61ca8b899834aba7f1e52ad0de7d, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: idle + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1947,7 +2135,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 664 + value: 528 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/common/large_hero_cell.prefab b/Assets/prefabs/ui/common/large_hero_cell.prefab index 84391e1a1..fc62c1c44 100644 --- a/Assets/prefabs/ui/common/large_hero_cell.prefab +++ b/Assets/prefabs/ui/common/large_hero_cell.prefab @@ -639,8 +639,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -82} - m_SizeDelta: {x: 114, y: 115} + m_AnchoredPosition: {x: 0, y: -72} + m_SizeDelta: {x: 146, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3537342382456181005 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index ea8eb32c9..3f5d6f782 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -464,7 +464,7 @@ RectTransform: m_Children: - {fileID: 1625210172884337300} m_Father: {fileID: 1443961818954166758} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3221,7 +3221,7 @@ RectTransform: m_Children: - {fileID: 6592300693110446494} m_Father: {fileID: 1443961818954166758} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5415,7 +5415,7 @@ MonoBehaviour: contentTrans: {fileID: 4199406621349083570} bfCell: {fileID: 7947404490969342071} topRecoveryOffset: 5 - downRecoveryOffset: 5 + downRecoveryOffset: 20 direction: 0 reverse: 0 cellWidth: 558 @@ -7377,7 +7377,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1443961818954166758} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8458,7 +8458,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5554011540702472092} - {fileID: 8952348940423952381} - {fileID: 7850571191567575331} - {fileID: 7516486505902988567} @@ -14487,82 +14486,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8028773929583091421 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5554011540702472092} - - component: {fileID: 5862716795985047645} - - component: {fileID: 8694056661476374455} - m_Layer: 5 - m_Name: line_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5554011540702472092 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8028773929583091421} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1443961818954166758} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 2} - m_SizeDelta: {x: 589, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5862716795985047645 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8028773929583091421} - m_CullTransparentMesh: 1 ---- !u!114 &8694056661476374455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8028773929583091421} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8061818373701141259 GameObject: m_ObjectHideFlags: 0 @@ -17380,7 +17303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -17868,7 +17791,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/prefabs/ui/summon/summon_main_ui.prefab b/Assets/prefabs/ui/summon/summon_main_ui.prefab index b1ac42a5c..fcadf3285 100644 --- a/Assets/prefabs/ui/summon/summon_main_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_main_ui.prefab @@ -3810,7 +3810,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2638488844881420663 RectTransform: m_ObjectHideFlags: 0 @@ -3859,7 +3859,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4a21c25c3ad7fd54ab5e182776e39a00, type: 3} + m_Sprite: {fileID: 21300000, guid: 176147803f6170a4ea4b1386b7fff51b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1