diff --git a/Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_06.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_06.png similarity index 100% rename from Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_06.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_06.png diff --git a/Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_06.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_06.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_06.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_06.png.meta diff --git a/Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_08.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_08.png similarity index 100% rename from Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_08.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_08.png diff --git a/Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_08.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_08.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/GodWays/UI_hz_fs_08.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_fs_08.png.meta diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_39.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_39.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_39.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_39.png diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_39.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_39.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_39.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_39.png.meta diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon1.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon1.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon1.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon1.png diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon1.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon1.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon1.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon1.png.meta diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon2.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon2.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon2.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon2.png diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon2.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon2.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_icon2.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_gonghui_icon2.png.meta diff --git a/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_05.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_lm_05.png similarity index 100% rename from Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_05.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_lm_05.png diff --git a/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_05.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_lm_05.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_05.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_lm_05.png.meta diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_04.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_04.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_04.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_04.png diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_04.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_04.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_04.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_04.png.meta diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_05.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_05.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_05.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_05.png diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_05.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_05.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_05.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_05.png.meta diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_16.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_16.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_16.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_16.png diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_16.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_16.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_16.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_16.png.meta diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_17.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_17.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_17.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_17.png diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_17.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_17.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_17.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_17.png.meta diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_18.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_18.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_18.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_18.png diff --git a/Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_18.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_18.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Lingshou/UI_hz_ls_18.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_ls_18.png.meta diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_01.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_01.png similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_01.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_01.png diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_01.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_01.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_01.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_01.png.meta diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_02.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_02.png similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_02.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_02.png diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_02.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_02.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_02.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_02.png.meta diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_03.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_03.png similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_03.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_03.png diff --git a/Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_03.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_03.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/QiJie/UI_hz_qj_03.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_qj_03.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_33.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_33.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_33.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_33.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_33.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_33.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_33.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_33.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_34.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_34.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_34.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_34.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_34.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_34.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_34.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_34.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_35.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_35.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_35.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_35.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_35.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_35.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_35.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_35.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_36.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_36.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_36.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_36.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_36.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_36.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_36.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_36.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_58.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_58.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_58.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_58.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_58.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_58.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_58.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_58.png.meta diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_59.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_59.png similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_59.png rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_59.png diff --git a/Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_59.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_59.png.meta similarity index 100% rename from Assets/ManagedResources/BG/UI/Shenjiang/UI_hz_shenjiang_59.png.meta rename to Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_shenjiang_59.png.meta diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png new file mode 100644 index 0000000000..b68e3faf3f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png differ diff --git a/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png.meta b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png.meta new file mode 100644 index 0000000000..728b4dacea --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BtnIcons/UI_hz_zhonghe54.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 384d5ca6e3d45ce41b20c213155ef132 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 06fcad8f89fa14a4dabaeb14b09a97a7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology.meta b/Assets/ManagedResources/BG/UI/Earned.meta similarity index 77% rename from Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology.meta rename to Assets/ManagedResources/BG/UI/Earned.meta index eecffb3c9d..b328eef34c 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrintAstrology.meta +++ b/Assets/ManagedResources/BG/UI/Earned.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 133389113f2b38047968f36858cc3272 +guid: d0a29343f5127a947addb6980bbd3eb4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png b/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png new file mode 100644 index 0000000000..12acfc38d7 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png differ diff --git a/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png.meta b/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png.meta new file mode 100644 index 0000000000..e076af1fef --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Earned/UI_hz_Earned_Bg.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a82b266e832d6b841870f1a9384f9857 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 267ccb2b6b71cc941971a0c6c657b7ab + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png b/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png new file mode 100644 index 0000000000..9f6311aa2f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png differ diff --git a/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png.meta b/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png.meta new file mode 100644 index 0000000000..33e844793d --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Guild/UI_hz_gonghui_DeathBg.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 75fa9cf5f8bca6043bc78d073803405d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8f11569baebc12f4285966a478e6b0f7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Shanhe/UI_hz_sh_06.png.meta b/Assets/ManagedResources/BG/UI/Shanhe/UI_hz_sh_06.png.meta index 4f4b978363..88006fdeea 100644 --- a/Assets/ManagedResources/BG/UI/Shanhe/UI_hz_sh_06.png.meta +++ b/Assets/ManagedResources/BG/UI/Shanhe/UI_hz_sh_06.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 34, y: 20, z: 37, w: 16} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat b/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat index 4046b84f60..1918a37460 100644 --- a/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat +++ b/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat @@ -68,7 +68,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _R: 0.1 + - _R: 0.100000024 - _ScaleX: 0.5625 - _ScaleY: 1 - _SmoothnessTextureChannel: 0 @@ -76,8 +76,8 @@ Material: - _SrcBlend: 1 - _Trans: 10 - _UVSec: 0 - - _X: 0.575 - - _Y: 0.12752602 + - _X: 0.5 + - _Y: 0.5 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosPanel.prefab index 2be2316f3f..c9fe36e4d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosPanel.prefab @@ -1,5 +1,586 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &632591955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 632591956} + - component: {fileID: 632591958} + - component: {fileID: 632591957} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &632591956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632591955} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00064086914} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8145920649029148756} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89.99997, y: -88.03497} + m_SizeDelta: {x: 186, y: 165} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &632591958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632591955} + m_CullTransparentMesh: 0 +--- !u!114 &632591957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632591955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 80d90a20c6d5515449a1d751196e2b60, 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 +--- !u!1 &858007856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 858007857} + - component: {fileID: 858007860} + - component: {fileID: 858007859} + - component: {fileID: 858007858} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &858007857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858007856} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00064086914} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8145920649029148756} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89.99997, y: -146} + m_SizeDelta: {x: 160, y: 71.53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &858007860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858007856} + m_CullTransparentMesh: 0 +--- !u!114 &858007859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858007856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9843138, g: 0.9843138, b: 0.9725491, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6392\u884C" +--- !u!114 &858007858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858007856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1 &1228194027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1228194028} + - component: {fileID: 1228194030} + - component: {fileID: 1228194029} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1228194028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228194027} + 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_Children: [] + m_Father: {fileID: 1973340433099576825} + 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: -11.303, y: -770.21} + m_SizeDelta: {x: 1059.4, y: 112.06} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1228194030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228194027} + m_CullTransparentMesh: 0 +--- !u!114 &1228194029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228194027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7047902cea7e0a644bec2bf166d4f6c1, 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 +--- !u!1 &1238966250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1238966251} + - component: {fileID: 1238966253} + - component: {fileID: 1238966252} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1238966251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238966250} + 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_Children: [] + m_Father: {fileID: 8712558289116513251} + m_RootOrder: 9 + 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: 1082, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1238966253 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238966250} + m_CullTransparentMesh: 0 +--- !u!114 &1238966252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1238966250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.6627451} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c2cd72cb479dc9e4491aeea1858a8cf7, 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 +--- !u!1 &1324431726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1324431727} + - component: {fileID: 1324431729} + - component: {fileID: 1324431728} + - component: {fileID: 4143990215107884581} + m_Layer: 5 + m_Name: textName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1324431727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324431726} + 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_Children: [] + m_Father: {fileID: 5780144967252424959} + 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} + m_AnchoredPosition: {x: -2, y: 0} + m_SizeDelta: {x: 200.75, y: 84.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1324431729 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324431726} + m_CullTransparentMesh: 0 +--- !u!114 &1324431728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324431726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9960785, g: 0.9960785, b: 0.9960785, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 52 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u98CE\u543C\u9635" +--- !u!114 &4143990215107884581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324431726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.45098042, g: 0.21960786, b: 0, a: 1} + m_EffectDistance: {x: 3, y: -3} + m_UseGraphicAlpha: 1 +--- !u!1 &1534873003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1534873004} + - component: {fileID: 1534873006} + - component: {fileID: 1534873005} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1534873004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534873003} + 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_Children: [] + m_Father: {fileID: 7884662649454219735} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 165, y: 167} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1534873006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534873003} + m_CullTransparentMesh: 0 +--- !u!114 &1534873005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534873003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 384d5ca6e3d45ce41b20c213155ef132, 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 +--- !u!1 &1803862575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1803862576} + - component: {fileID: 1803862579} + - component: {fileID: 1803862578} + - component: {fileID: 1803862577} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1803862576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803862575} + 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_Children: [] + m_Father: {fileID: 7884662649454219735} + m_RootOrder: 2 + 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: -61} + m_SizeDelta: {x: 160, y: 71.53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1803862579 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803862575} + m_CullTransparentMesh: 0 +--- !u!114 &1803862578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803862575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9843138, g: 0.9843138, b: 0.9725491, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5956\u52B1" +--- !u!114 &1803862577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803862575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &645477905369748496 GameObject: m_ObjectHideFlags: 0 @@ -38,7 +619,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: -388.6, y: -657.3} + m_AnchoredPosition: {x: -329, y: -318} m_SizeDelta: {x: 369.7, y: 298} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &92818610488097453 @@ -125,7 +706,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -9.2, y: 21.7} m_SizeDelta: {x: 512, y: 56.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4811307136535250600 @@ -149,7 +730,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7568628, g: 0.6627451, b: 0.62352943, a: 1} + m_Color: {r: 0.9607844, g: 0.9725491, b: 0.97647065, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -157,8 +738,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -240,8 +821,8 @@ MonoBehaviour: m_Spacing: 30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!114 &7462667075559127990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -249,7 +830,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1307199475213588514} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -378,13 +959,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4701800283118670835} + - {fileID: 1534873004} + - {fileID: 1803862576} m_Father: {fileID: 6860502623395961762} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &927099582113047355 CanvasRenderer: @@ -475,7 +1058,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56e562f2e809ff74f93897fff77286b0, type: 3} + m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -599,7 +1182,7 @@ RectTransform: 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: 68, y: 68} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8965641676818495615 CanvasRenderer: @@ -739,7 +1322,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3137270317384316216} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -789,14 +1372,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.05, y: 1.05, z: 1} - m_Children: [] + m_Children: + - {fileID: 1228194028} m_Father: {fileID: 8712558289116513251} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -92} + m_SizeDelta: {x: 1082, y: 1836} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2896056443869953358 CanvasRenderer: @@ -826,7 +1410,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a1e227c3a82f75a4e9db110116c12a40, type: 3} + m_Sprite: {fileID: 21300000, guid: 75fa9cf5f8bca6043bc78d073803405d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -871,8 +1455,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 90} - m_SizeDelta: {x: 140, y: 121} + m_AnchoredPosition: {x: 40.399902, y: 118.700195} + m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3764903023515750455 CanvasRenderer: @@ -902,7 +1486,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} + m_Sprite: {fileID: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1010,6 +1594,7 @@ RectTransform: - {fileID: 4436808920104979691} - {fileID: 449125269785460153} - {fileID: 7530251338354471463} + - {fileID: 1238966251} m_Father: {fileID: 3822955645159006167} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1098,14 +1683,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100.375} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 632591956} + - {fileID: 858007857} m_Father: {fileID: 6860502623395961762} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2700917426228652630 CanvasRenderer: @@ -1196,7 +1783,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0ae4375e796ee934997142d1bb379d5d, type: 3} + m_Sprite: {fileID: 21300000, guid: a3cc16b83b5bd5448a051df62e723493, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1243,7 +1830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 847, y: -53.1} + m_AnchoredPosition: {x: 1256.9, y: -1100.9} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7151780147543166197 @@ -1389,7 +1976,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 828} + m_AnchoredPosition: {x: -12.5, y: 799.1} m_SizeDelta: {x: 338.5, y: 50.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8575796734053704291 @@ -1413,7 +2000,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32941177, g: 0.78039217, b: 0.5254902, a: 1} + m_Color: {r: 0.96470594, g: 0.9803922, b: 0.9843138, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1421,7 +2008,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1665,8 +2252,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 877.3001} - m_SizeDelta: {x: 758, y: 38} + m_AnchoredPosition: {x: -13.06, y: 809.83} + m_SizeDelta: {x: 407.81, y: 86.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2598806568316143585 CanvasRenderer: @@ -1696,8 +2283,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b8e1c1d9252d25b49b7508b9c7ef0e3a, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 977a6d78e9a6d96478677ddaf76db101, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1763,7 +2350,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9843138, g: 0.77647066, b: 0.6313726, a: 1} + m_Color: {r: 0.98823535, g: 0.89019614, b: 0.32941177, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1771,10 +2358,10 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 @@ -1815,13 +2402,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3062589289564514943} + - {fileID: 1324431727} m_Father: {fileID: 3130817349849997545} 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} - m_AnchoredPosition: {x: 0, y: -106} - m_SizeDelta: {x: 190, y: 49} + m_AnchoredPosition: {x: 3.3, y: -74.45002} + m_SizeDelta: {x: 212.4, y: 62.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5189418491806580653 CanvasRenderer: @@ -1851,7 +2439,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 59a1bb8e275545c40ba3cd1e1e93cce7, type: 3} + m_Sprite: {fileID: 21300000, guid: 977a6d78e9a6d96478677ddaf76db101, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1877,7 +2465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5786904851512713551 RectTransform: m_ObjectHideFlags: 0 @@ -1926,7 +2514,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2a49ffd825f49fc4ab861f968d685eed, type: 3} + m_Sprite: {fileID: 21300000, guid: 977a6d78e9a6d96478677ddaf76db101, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2034,7 +2622,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -906.5} + m_AnchoredPosition: {x: 20, y: -891} m_SizeDelta: {x: 725.1, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8237595920790594449 @@ -2058,7 +2646,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5294118, g: 0.5254902, b: 0.6, a: 1} + m_Color: {r: 0.85098046, g: 0.9568628, b: 0.98823535, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2066,8 +2654,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -2147,11 +2735,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7771551514090905574, guid: 56478c182cadf1c45a188c82202a7b36, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56478c182cadf1c45a188c82202a7b36, type: 3} --- !u!4 &7530251338354471463 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrintAstrology.meta b/Assets/ManagedResources/Prefabs/UI/SoulPrintAstrology.meta deleted file mode 100644 index cb83d7b7c7..0000000000 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrintAstrology.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 711efe8796f710f438003eda3292cc05 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: lz4/prefabs/ui/soulprintastrology - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua index b2b2145330..c250a7955a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua @@ -8,16 +8,16 @@ local _image={"s_shijuezhen_zhanlingbiao","s_shijuezhen_zhanlingbiao_01"}--公 local orginLayer = 0 local orginLayer2 = 0 local d={ --各阵位置信息 - [1]={pos={-33,645}}, - [2]={pos={-364,525}}, - [3]={pos={251,483}}, - [4]={pos={-174,314}}, - [5]={pos={344,188}}, - [6]={pos={0,17}}, - [7]={pos={355,-124}}, - [8]={pos={-342,-231}}, - [9]={pos={291,-576}}, - [10]={pos={-355,-666}}, + [1]={pos={-54,690}}, + [2]={pos={-343,391}}, + [3]={pos={156,147}}, + [4]={pos={-195,75}}, + [5]={pos={250,-127}}, + [6]={pos={-16,-252}}, + [7]={pos={149,-390}}, + [8]={pos={-331,-318}}, + [9]={pos={368,-568}}, + [10]={pos={-102,-592}}, } local preList={} --各阵预设列表 function DeathPosPanel:InitComponent() @@ -116,8 +116,10 @@ function this.RefreshPanel() local guildName=Util.GetGameObject(o,"Guild/mask/GuildName"):GetComponent("Text") local posName=Util.GetGameObject(o,"Name/Text"):GetComponent("Image") local serverName=Util.GetGameObject(o,"serverName/Text"):GetComponent("Text") + local textName=Util.GetGameObject(o,"Name/textName"):GetComponent("Text") serverName.text="" guildName.text="" + textName.text=guildWarConfig[i].Name posName.sprite=this.spLoader:LoadSprite(guildWarConfig[i].Pic)--guildWarConfig[i].Name preList[i].transform.localPosition=Vector2.New(d[i].pos[1],d[i].pos[2]) Util.GetGameObject(o,"Guild"):SetActive(false)