diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png new file mode 100644 index 0000000000..40c488042f Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png.meta new file mode 100644 index 0000000000..314866298e --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_lianxuchongzhiz_dazi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 9c08e81f542103c4582d14bc14b6a5b9 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b8eb75db9c5f03141973e51784eae2b4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png new file mode 100644 index 0000000000..8ade7b0147 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png.meta new file mode 100644 index 0000000000..3ad9ce40bf --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/c_czlb_meiyuan.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 1e2d84c75cd281242a2bf1f69edfec36 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 74d46f875416fc34e9a408384ae10746 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png b/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png new file mode 100644 index 0000000000..ecf00ec22a Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png.meta new file mode 100644 index 0000000000..430434ff26 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/r_lianxuchongzhiz_meiyuan.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e5ae86d5bb54abd40986c361c56e505e +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 798f038fa7b4c484e9016b03f2b5346c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta b/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta new file mode 100644 index 0000000000..27e5af2050 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TreasureOfHeaven.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8caebb1f24cd114ebc6fd41468c2df2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: lz4/atlas/treasureofheaven + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Fonts/ArtFont_2.meta b/Assets/ManagedResources/Fonts/ArtFont_2.meta new file mode 100644 index 0000000000..659a95d914 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b7b8d1c9d7984641b043b3c86d0fac1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt new file mode 100644 index 0000000000..f29ad71a22 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt @@ -0,0 +1,15 @@ +info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=26 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="ArtFont_2_0.png" +chars count=11 +char id=46 x=468 y=162 width=39 height=39 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=48 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=49 x=114 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 +char id=50 x=0 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 +char id=51 x=0 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 +char id=52 x=229 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 +char id=53 x=118 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 +char id=54 x=0 y=0 width=120 height=161 xoffset=0 yoffset=0 xadvance=120 page=0 chnl=15 +char id=55 x=351 y=162 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 +char id=56 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=57 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt.meta b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt.meta new file mode 100644 index 0000000000..2783c8ed44 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2.fnt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0d13c9dd5d0ba244ada1945529ba2de +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png new file mode 100644 index 0000000000..bcc9fc457f Binary files /dev/null and b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png differ diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png.meta b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png.meta new file mode 100644 index 0000000000..ee82e3744b --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_0.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e0bc8509dcc29654986bbc11fd0251b6 +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: -1 + 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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b048e1823e43b084f90305254118054a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings new file mode 100644 index 0000000000..f1453e2da9 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!128 &12800000 +Font: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ArtFont_2_cfont + serializedVersion: 5 + m_LineSpacing: 0.1 + m_DefaultMaterial: {fileID: 0} + m_FontSize: 0 + m_Texture: {fileID: 0} + m_AsciiStartOffset: 0 + m_Tracking: 1 + m_CharacterSpacing: 0 + m_CharacterPadding: 1 + m_ConvertCase: 0 + m_CharacterRects: [] + m_KerningValues: [] + m_PixelScale: 0.1 + m_FontData: + m_Ascent: 0 + m_Descent: 0 + m_DefaultStyle: 0 + m_FontNames: [] + m_FallbackFonts: [] + m_FontRenderingMode: 0 + m_UseLegacyBoundsCalculation: 0 + m_ShouldRoundAdvanceValue: 1 diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings.meta b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings.meta new file mode 100644 index 0000000000..d9e233ec92 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_cfont.fontsettings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f614569e1ed88b4395b3f2aedfe301f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 12800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat new file mode 100644 index 0000000000..efb476bc6f --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ArtFont_2_mat + m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: e0bc8509dcc29654986bbc11fd0251b6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat.meta b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat.meta new file mode 100644 index 0000000000..159fce23f7 --- /dev/null +++ b/Assets/ManagedResources/Fonts/ArtFont_2/ArtFont_2_mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ba607cfaaf6d264783de17812ec358a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 8aefa7b031..a591f7d3b1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -114,6 +114,7 @@ RectTransform: - {fileID: 981423755} - {fileID: 1428344098} - {fileID: 1955721502} + - {fileID: 1158344053} m_Father: {fileID: 8152144759320975811} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -296,6 +297,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &218052762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 218052763} + - component: {fileID: 218052765} + - component: {fileID: 218052764} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &218052763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218052762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_Children: [] + m_Father: {fileID: 1158344053} + 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: 91, y: -73} + m_SizeDelta: {x: 38, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &218052765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218052762} + m_CullTransparentMesh: 0 +--- !u!114 &218052764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218052762} + 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: e5ae86d5bb54abd40986c361c56e505e, 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 &391347276 GameObject: m_ObjectHideFlags: 0 @@ -4935,7 +5010,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5148,6 +5223,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4FBF\u53EF\u9886\u53D6\u8D85\u503C\u5927\u5956" LanguageIndex: 10464 +--- !u!1 &696558578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 696558579} + - component: {fileID: 696558581} + - component: {fileID: 696558580} + m_Layer: 5 + m_Name: title1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &696558579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696558578} + 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: 1158344053} + 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: 54, y: 171} + m_SizeDelta: {x: 64.6, y: 403.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &696558581 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696558578} + m_CullTransparentMesh: 0 +--- !u!114 &696558580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696558578} + 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: 1, g: 0.88235295, b: 0.65882355, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.9 + m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n0.99\n\u7F8E\n\u5143" --- !u!1 &890389064 GameObject: m_ObjectHideFlags: 0 @@ -5417,6 +5571,176 @@ RectTransform: m_AnchoredPosition: {x: -1247.5, y: -626} m_SizeDelta: {x: 910, y: 207.85} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1158344052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1158344053} + - component: {fileID: 1158344055} + - component: {fileID: 1158344054} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1158344053 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158344052} + 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: + - {fileID: 1426793720} + - {fileID: 218052763} + - {fileID: 696558579} + m_Father: {fileID: 78449122} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221, y: -444} + m_SizeDelta: {x: 228, y: 958} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1158344055 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158344052} + m_CullTransparentMesh: 0 +--- !u!114 &1158344054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158344052} + 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: 9c08e81f542103c4582d14bc14b6a5b9, 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 &1426793719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426793720} + - component: {fileID: 1426793723} + - component: {fileID: 1426793722} + - component: {fileID: 1426793721} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1426793720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426793719} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 1158344053} + 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: -50, y: -66} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1426793723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426793719} + m_CullTransparentMesh: 0 +--- !u!114 &1426793722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426793719} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 5f614569e1ed88b4395b3f2aedfe301f, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 300 +--- !u!114 &1426793721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426793719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -30.97 --- !u!1 &1428344097 GameObject: m_ObjectHideFlags: 0 @@ -10998,7 +11322,7 @@ ParticleSystem: --- !u!199 &8269989015897928235 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17680,7 +18004,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22725,7 +23049,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28018,7 +28342,7 @@ ParticleSystem: --- !u!199 &8172747630816523828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33615,7 +33939,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40574,7 +40898,7 @@ ParticleSystem: --- !u!199 &5182616553912855096 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45782,7 +46106,7 @@ ParticleSystem: --- !u!199 &1665420556181248851 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50480,7 +50804,7 @@ ParticleSystem: --- !u!199 &1665420556270140816 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55223,7 +55547,7 @@ ParticleSystem: --- !u!199 &1665420556318434860 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59921,7 +60245,7 @@ ParticleSystem: --- !u!199 &1665420556480315772 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64773,7 +65097,7 @@ ParticleSystem: --- !u!199 &1665420557183870184 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69471,7 +69795,7 @@ ParticleSystem: --- !u!199 &1665420557442100854 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75035,7 +75359,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80414,7 +80738,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88062,7 +88386,7 @@ ParticleSystem: --- !u!199 &8002697237469934562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93193,7 +93517,7 @@ ParticleSystem: --- !u!199 &4647271210351463199 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98711,7 +99035,7 @@ ParticleSystem: --- !u!199 &2732029073257886603 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -103409,7 +103733,7 @@ ParticleSystem: --- !u!199 &2732029073361489975 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -108100,7 +108424,7 @@ ParticleSystem: --- !u!199 &2732029073447250446 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -112798,7 +113122,7 @@ ParticleSystem: --- !u!199 &2732029073496925335 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -117797,7 +118121,7 @@ ParticleSystem: --- !u!199 &2732029073630788459 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -123159,7 +123483,7 @@ ParticleSystem: --- !u!199 &2732029074424178366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127902,7 +128226,7 @@ ParticleSystem: --- !u!199 &2732029074462339123 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132814,7 +133138,7 @@ ParticleSystem: --- !u!199 &2732029074543128336 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -137512,7 +137836,7 @@ ParticleSystem: --- !u!199 &2732029074581835668 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143711,7 +144035,7 @@ ParticleSystem: --- !u!199 &5645528949248127811 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -148643,7 +148967,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -153469,7 +153793,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -158702,7 +159026,7 @@ ParticleSystem: --- !u!199 &4345958962194761493 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -163917,7 +164241,7 @@ ParticleSystem: --- !u!199 &5649841810504860395 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -169996,7 +170320,7 @@ ParticleSystem: --- !u!199 &8701586039666722231 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178395,7 +178719,7 @@ ParticleSystem: --- !u!199 &4286648956890202447 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183165,7 +183489,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -187890,7 +188214,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -196335,7 +196659,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -201302,7 +201626,7 @@ ParticleSystem: --- !u!199 &2371784830157723926 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -206617,7 +206941,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -211315,7 +211639,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -221064,7 +221388,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225762,7 +226086,7 @@ ParticleSystem: --- !u!199 &1880871930879455302 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -231231,7 +231555,7 @@ ParticleSystem: --- !u!199 &3849193643953981627 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -238717,7 +239041,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -243489,7 +243813,7 @@ ParticleSystem: --- !u!199 &4273224563307442407 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -248728,7 +249052,7 @@ ParticleSystem: --- !u!199 &7064382681511126860 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253426,7 +253750,7 @@ ParticleSystem: --- !u!199 &7064382682025668050 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -258734,7 +259058,7 @@ ParticleSystem: --- !u!199 &4023387214391709434 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -267623,7 +267947,7 @@ ParticleSystem: --- !u!199 &5952208990652577683 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -272921,7 +273245,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -278454,7 +278778,7 @@ ParticleSystem: --- !u!199 &563405714354991503 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -286106,7 +286430,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -290804,7 +291128,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index 4da0a22c5c..25319c0aa0 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -20661,7 +20661,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u5145\u503C100\u5143" + m_Text: "\u7D2F\u5145\u503C 15$" LanguageIndex: 10595 --- !u!1 &716075875710792845 GameObject: @@ -23471,7 +23471,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9996\u5145\u6EE16\u5143" + m_Text: "\u9996\u5145\u6EE1 1$" LanguageIndex: 10594 --- !u!1 &7918755099623686241 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 1dab852b8e..16f151adc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -340,7 +340,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: -60, y: 0} - m_SizeDelta: {x: 46, y: 46} + m_SizeDelta: {x: 22, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &384446963 CanvasRenderer: @@ -370,7 +370,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: 9be77c95f87e3ec4bab0ebe49fbc9a85, type: 3} + m_Sprite: {fileID: 21300000, guid: 1e2d84c75cd281242a2bf1f69edfec36, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1831,8 +1831,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.55002, y: 0} - m_SizeDelta: {x: 211.1, y: 61.53} + m_AnchoredPosition: {x: -2.1, y: 0} + m_SizeDelta: {x: 37, y: 61.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2128156393 CanvasRenderer: @@ -1872,8 +1872,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: '***' --- !u!1 &5527223328565838 @@ -3957,8 +3957,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: 0} - m_SizeDelta: {x: 185, y: 61.53} + m_AnchoredPosition: {x: 4.01, y: 0} + m_SizeDelta: {x: 36.01, y: 61.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3203508168965021441 CanvasRenderer: @@ -3995,13 +3995,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 4 m_MaxSize: 45 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: '648 ' + m_Text: 648 --- !u!1 &1505358539907469629 GameObject: m_ObjectHideFlags: 0 @@ -5705,7 +5705,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 0 + m_Text: --- !u!114 &4148450475228044834 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6527,7 +6527,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.00001998531, y: 0} + m_AnchoredPosition: {x: -0.000010519653, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -10786,8 +10786,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: 0} - m_SizeDelta: {x: 185, y: 61.53} + m_AnchoredPosition: {x: 4.4, y: 0} + m_SizeDelta: {x: 36.8, y: 61.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7950473084535735699 CanvasRenderer: @@ -10824,13 +10824,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 4 m_MaxSize: 45 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: '648 ' + m_Text: 648 --- !u!1 &7430380415413111635 GameObject: m_ObjectHideFlags: 0 @@ -12563,6 +12563,60 @@ PrefabInstance: propertyPath: m_Name value: freeBtn objectReference: {fileID: 0} + - target: {fileID: 1094093250584210, guid: 584f6c7286705c645ab8323012566269, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1708856882303358, guid: 584f6c7286705c645ab8323012566269, type: 3} + propertyPath: m_Name + value: UI_effect_TanSuo_Box + objectReference: {fileID: 0} + - target: {fileID: 114761016256353280, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66a42b5e6f23e0a4ab71bf77c6b3754b, + type: 3} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 14.6 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_SizeDelta.x + value: 779.2 + objectReference: {fileID: 0} + - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, + type: 3} + propertyPath: m_SizeDelta.y + value: 1029.2 + objectReference: {fileID: 0} - target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, type: 3} propertyPath: m_LocalPosition.x @@ -12678,60 +12732,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 14.6 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_SizeDelta.x - value: 779.2 - objectReference: {fileID: 0} - - target: {fileID: 224669491156715612, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_SizeDelta.y - value: 1029.2 - objectReference: {fileID: 0} - - target: {fileID: 1708856882303358, guid: 584f6c7286705c645ab8323012566269, type: 3} - propertyPath: m_Name - value: UI_effect_TanSuo_Box - objectReference: {fileID: 0} - - target: {fileID: 1094093250584210, guid: 584f6c7286705c645ab8323012566269, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114761016256353280, guid: 584f6c7286705c645ab8323012566269, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 66a42b5e6f23e0a4ab71bf77c6b3754b, - type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 584f6c7286705c645ab8323012566269, type: 3} --- !u!1 &3812896437756706176 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index b25fae164b..2e7deef671 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -1,5 +1,84 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &44226012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 44226013} + - component: {fileID: 44226015} + - component: {fileID: 44226014} + m_Layer: 5 + m_Name: title1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &44226013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44226012} + 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: 1754761289} + 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: 54, y: 171} + m_SizeDelta: {x: 64.6, y: 403.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &44226015 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44226012} + m_CullTransparentMesh: 0 +--- !u!114 &44226014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44226012} + 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: 1, g: 0.88235295, b: 0.65882355, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.9 + m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n0.99\n\u7F8E\n\u5143" --- !u!1 &101217395 GameObject: m_ObjectHideFlags: 0 @@ -289,6 +368,173 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444703402} m_CullTransparentMesh: 0 +--- !u!1 &495729717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 495729718} + - component: {fileID: 495729720} + - component: {fileID: 495729719} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &495729718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495729717} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_Children: [] + m_Father: {fileID: 1754761289} + 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: 91, y: -73} + m_SizeDelta: {x: 38, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &495729720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495729717} + m_CullTransparentMesh: 0 +--- !u!114 &495729719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495729717} + 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: e5ae86d5bb54abd40986c361c56e505e, 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 &815268242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 815268243} + - component: {fileID: 815268246} + - component: {fileID: 815268245} + - component: {fileID: 815268244} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &815268243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815268242} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: [] + m_Father: {fileID: 1754761289} + 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: -50, y: -66} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &815268246 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815268242} + m_CullTransparentMesh: 0 +--- !u!114 &815268245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815268242} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 5f614569e1ed88b4395b3f2aedfe301f, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 300 +--- !u!114 &815268244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815268242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -30.97 --- !u!1 &863016052 GameObject: m_ObjectHideFlags: 0 @@ -527,6 +773,83 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A 62\uFF1A55\uFF1A43" +--- !u!1 &1754761288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1754761289} + - component: {fileID: 1754761291} + - component: {fileID: 1754761290} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1754761289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754761288} + 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: + - {fileID: 815268243} + - {fileID: 495729718} + - {fileID: 44226013} + m_Father: {fileID: 897629116163733771} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221, y: -444} + m_SizeDelta: {x: 228, y: 958} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1754761291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754761288} + m_CullTransparentMesh: 0 +--- !u!114 &1754761290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754761288} + 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: 9c08e81f542103c4582d14bc14b6a5b9, 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 &1214298891291768 GameObject: m_ObjectHideFlags: 0 @@ -8049,7 +8372,7 @@ ParticleSystem: --- !u!199 &5769909884604089405 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -12791,7 +13114,7 @@ ParticleSystem: --- !u!199 &8873181679571788139 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17832,7 +18155,7 @@ ParticleSystem: --- !u!199 &4026277983322118074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22907,7 +23230,7 @@ ParticleSystem: --- !u!199 &1309976723092944450 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27617,7 +27940,7 @@ ParticleSystem: --- !u!199 &7862827307386917793 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32359,7 +32682,7 @@ ParticleSystem: --- !u!199 &1474953326918406438 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38753,7 +39076,7 @@ ParticleSystem: --- !u!199 &5535976391633867577 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44689,7 +45012,7 @@ ParticleSystem: --- !u!199 &1075499567092313740 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49783,7 +50106,7 @@ ParticleSystem: --- !u!199 &1335144838161731503 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55040,7 +55363,7 @@ ParticleSystem: --- !u!199 &7674418144062191771 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61039,7 +61362,7 @@ ParticleSystem: --- !u!199 &3478638013891207890 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66074,7 +66397,7 @@ ParticleSystem: --- !u!199 &1329051646654101902 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71476,7 +71799,7 @@ ParticleSystem: --- !u!199 &7935500073970882351 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71947,7 +72270,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000030517578} m_SizeDelta: {x: 0, y: 223.7} m_Pivot: {x: 0, y: 1} --- !u!222 &5657471360167891251 @@ -77396,7 +77719,7 @@ ParticleSystem: --- !u!199 &5976314214847845844 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82847,7 +83170,7 @@ ParticleSystem: --- !u!199 &189997647891759117 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88917,7 +89240,7 @@ ParticleSystem: --- !u!199 &3610771200624960058 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93990,7 +94313,7 @@ ParticleSystem: --- !u!199 &3723196636064024250 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98762,7 +99085,7 @@ ParticleSystem: --- !u!199 &6752594429674840321 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105029,7 +105352,7 @@ ParticleSystem: --- !u!199 &5282335297282974710 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109727,7 +110050,7 @@ ParticleSystem: --- !u!199 &3319074951465041593 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -114702,7 +115025,7 @@ ParticleSystem: --- !u!199 &288384786443457950 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -120343,7 +120666,7 @@ ParticleSystem: --- !u!199 &8026587331831747561 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126082,7 +126405,7 @@ ParticleSystem: --- !u!199 &1887912736600313456 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -131233,7 +131556,7 @@ ParticleSystem: --- !u!199 &6046371778974065579 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136077,7 +136400,7 @@ ParticleSystem: --- !u!199 &8895669547597748607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -138654,6 +138977,7 @@ RectTransform: - {fileID: 3514029640391821508} - {fileID: 5515808590348377691} - {fileID: 3478638014035431743} + - {fileID: 1754761289} m_Father: {fileID: 224326955275377428} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index ee4a3ae9b4..dd6904a89c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1114,11 +1114,11 @@ ConditionType = { CarBon = 15 --通关副本 } IndexValueDef = { - [1] = 6,--首充6元 - [2] = 100, --首充100元 - [15] = 100, --首充100元 - [6] = 1, - [100] = 2, + [1] = 1,--首充6元 + [2] = 15, --首充100元 + -- [15] = 100, --首充100元 + -- [6] = 1, + [15] = 2, } --功能开启 diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua index 3c522c9646..b541b027a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -7,7 +7,7 @@ this.MT = 1 function this.Initialize() - this.MT = 1--ConfigManager.GetConfigData(ConfigName.SpecialConfig, 79).Value + this.MT = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 79).Value local er = ConfigManager.GetConfig(ConfigName.ExchangeRate) for _, v in ConfigPairs(er) do this.RMB2O[v.Price_1] = v diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 36e500c1a8..29d98c8e65 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -109,7 +109,7 @@ function this.SingleDataShow(pre,value) local shows = shopItemData.RewardShow buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..Language[10538] + price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 9158df68eb..530a36f020 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -108,7 +108,7 @@ function this.SingleDataShow(pre,value) local shows = shopItemData.RewardShow buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..Language[10538] + price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index 7d64ae2955..2c1b5c4de5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -87,13 +87,13 @@ function this.SingleDataShow(go, data) LimitText.text = shopItemData.Limit buyInfo:SetActive( shopItemData.IsDiscount ~= 0 ) if shopItemData.IsDiscount and shopItemData.IsDiscount > 0 then - buyInfo:GetComponent("Text").text = Language[10537]..shopItemData.Price / (shopItemData.IsDiscount/10)..Language[10538] + buyInfo:GetComponent("Text").text = Language[10537]..shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() end if goodData then endTime = goodData.endTime end if shopItemData.Limit - boughtNum > 0 then - price.text = shopItemData.Price..Language[10538] + price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua index 433719b243..bc3ee4b364 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/HeroStarFeedPage.lua @@ -198,7 +198,7 @@ function HeroStarFeedPage:SetGfitShow() _ItemViewList[i].gameObject:SetActive(true) end self.times.text = Language[10535]..curGiftList[curIndex].dynamicBuyTimes..Language[10054] - self.price.text = RechargeConfig[curGiftId].Price..Language[10538] + self.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName() end diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua index 1e535f11aa..9aa41e03bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftFiveView.lua @@ -82,7 +82,7 @@ function this.SetShow(root,data) stateBtn:GetComponent("Button").interactable=data.server.buyTimes< data.native.Limit if data.server.buyTimes< data.native.Limit then--未购买 stateBtnImage.sprite=Util.LoadSprite(StateImageName[1]) - stateBtnText.text=data.native.Price..Language[10538] + stateBtnText.text=data.native.Price..MoneyUtil.GetMoneyUnitName() else Util.SetGray(stateBtn,true) stateBtnText.text=Language[10638] diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua index e2efe2d3fb..9aaf69301d 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftOneView.lua @@ -48,8 +48,8 @@ function this.OnShowPanelData() conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,ids[1] ) shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,conFigData.Id) if shopItemData == nil then return end - this.oldPurchaseText.text = Language[10537]..conFigData.Price/(conFigData.IsDiscount/10)..Language[10538] - this.curPurchaseText.text = Language[10640]..conFigData.Price..Language[10538] + this.oldPurchaseText.text = Language[10537]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() + this.curPurchaseText.text = Language[10640]..conFigData.Price..MoneyUtil.GetMoneyUnitName() this.buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit if shopItemData.buyTimes <= 0 then this.buyText.text = Language[10641] diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua index 4ed78b24c7..e93d5c251e 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/View/FindFairy_GiftTwoView.lua @@ -60,11 +60,11 @@ function this.OnShowPanelData(i) local itemRewardParent=Util.GetGameObject(preGrid[i],"itemRewardParent") local buyBtn=Util.GetGameObject(preGrid[i],"BuyBtn") local buyNumText=Util.GetGameObject(preGrid[i],"buyNumText"):GetComponent("Text") - oldPurchaseText.text = Language[10643]..conFigData.Price/(conFigData.IsDiscount/10)..Language[10538] + oldPurchaseText.text = Language[10643]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit -- Log("购买次数 "..shopItemData.buyTimes) if shopItemData.buyTimes <= 0 then - curPurchaseText.text = conFigData.Price..Language[10538] + curPurchaseText.text = conFigData.Price..MoneyUtil.GetMoneyUnitName() buyBtn:GetComponent("Button").enabled = true Util.SetGray(buyBtn, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/MapChoose.meta b/Assets/ManagedResources/~Lua/Modules/MapChoose.meta new file mode 100644 index 0000000000..bab8457fe3 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/MapChoose.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46443a67ca89fda478e8c99134e8aedd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 2a29e32cf1..bc4e36afa0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -218,7 +218,7 @@ function UpperMonthCard:SetBuyState() self.boughtPanel:SetActive(isBought) self.buyPanel:SetActive(not isBought) Util.SetGray(self.btnBuy, not isActive) - self.textBuy.text = isActive and self.panelType .. Language[10538] or self.panelType .. Language[10538] + self.textBuy.text = isActive and self.panelType .. MoneyUtil.GetMoneyUnitName() or self.panelType .. MoneyUtil.GetMoneyUnitName() if not isBought then self:SetBuyPanelInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua index bdf754afd8..5da9047470 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua @@ -146,7 +146,7 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data) Util.SetGray(btnBuy,not isCanBuy) icon:GetComponent("Image").enabled=isCanBuy if isCanBuy then - price.text = finalNum..Language[10538] + price.text = finalNum..MoneyUtil.GetMoneyUnitName() buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum else price.alignment="MiddleCenter" diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index 7babaace03..416e755fd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -480,28 +480,30 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex) icon:GetComponent("Image").sprite = SetIcon(shopItemData.Cost[1][1]) price.alignment="MiddleRight" --根据数字位数做效果适配 - local str="" - local index= string.len(tostring(finalNum)) - if index<2 then - str=" " - elseif index>=2 and index<4 then - str=" " - else - str=" " - end - price.text = finalNum..str + -- local str="" + -- local index= string.len(tostring(finalNum)) + -- if index<2 then + -- str=" " + -- elseif index>=2 and index<4 then + -- str=" " + -- else + -- str=" " + -- end + price.alignment = "MiddleLeft" + price.text = finalNum--..str else--直购类按钮上的文字位置（空格慎调整！！！） - local str="" - local index= string.len(tostring(finalNum)) - if index<2 then - str=" " - elseif index>=2 and index<4 then - str=" " - else - str=" " - end + -- local str="" + -- local index= string.len(tostring(finalNum)) + -- if index<2 then + -- str=" " + -- elseif index>=2 and index<4 then + -- str=" " + -- else + -- str=" " + -- end + price.alignment = "MiddleCenter" icon:SetActive(false) - price.text = finalNum..Language[10538]..str + price.text = finalNum..MoneyUtil.GetMoneyUnitName()--..str end buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum else diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua index 3d3c9a83d1..4eebb6cfec 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyRewardPageV2.lua @@ -280,7 +280,7 @@ function TreasureOfSomebodyRewardPageV2:InitUnlockCost() if not TreasureOfSomebodyManagerV2.hadBuyTreasure then local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) -- self.unlockCostIcon.sprite = SetIcon(gameSettingConfig.TreasurePrice[1]) - self.unlockCostValue.text = gameSettingConfig.TreasurePrice[2]..Language[10538] + self.unlockCostValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName() end end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua index 4f9b5be383..713dd97c48 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/UnlockExtraRewardPanel.lua @@ -140,7 +140,7 @@ function UnlockExtraRewardPanel:SetCostValues() local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) local propId = gameSettingConfig.TreasurePrice[1] -- self.costIcon.sprite = SetIcon(propId) - self.costValue.text = gameSettingConfig.TreasurePrice[2]..Language[10538] + self.costValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName() self.enoughStatus = BagManager.GetItemCountById(propId) >= gameSettingConfig.TreasurePrice[2] end diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index e59e9674c1..a4f36e8eec 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -200,7 +200,7 @@ function this:SetGfitShow(rechargeData) _ItemViewList[i].gameObject:SetActive(true) end this.times.text = Language[10535]..rechargeData.dynamicBuyTimes..Language[10054] - this.price.text = RechargeConfig[curGiftId].Price..Language[10538] + this.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName() --this.oriPrice.gameObject:SetActive(activityType[curType].price) end diff --git a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs index 71a0c504c3..ba3662d47e 100644 --- a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs +++ b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs @@ -490,7 +490,7 @@ namespace ResUpdate /// List GetNewResourceFiles() { - AssetBundle bundle = AssetBundle.LoadFromFile(UpdateConfigs.PersistentDataPath + UpdateConfigs.FILES, 0, AppConst.EncyptBytesLength); + AssetBundle bundle = AssetBundle.LoadFromFile(UpdateConfigs.PersistentDataPath + UpdateConfigs.FILES);//, 0, AppConst.EncyptBytesLength); ResourceFiles files = bundle.LoadAsset("game"); List list = files.files; bundle.Unload(true); diff --git a/FontArt/ArtFont_1/ArtFont_1.fnt b/FontArt/ArtFont_1/ArtFont_1.fnt index 9da0c6107f..78cfdf8532 100644 --- a/FontArt/ArtFont_1/ArtFont_1.fnt +++ b/FontArt/ArtFont_1/ArtFont_1.fnt @@ -1,7 +1,8 @@ info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 common lineHeight=32 base=26 scaleW=256 scaleH=128 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 page id=0 file="ArtFont_1_0.png" -chars count=10 +chars count=11 +char id=46 x=235 y=0 width=12 height=16 xoffset=0 yoffset=0 xadvance=12 page=0 chnl=15 char id=48 x=0 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 char id=49 x=47 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 char id=50 x=94 y=0 width=46 height=46 xoffset=0 yoffset=0 xadvance=46 page=0 chnl=15 diff --git a/FontArt/ArtFont_1/ArtFont_1_0.png b/FontArt/ArtFont_1/ArtFont_1_0.png index 0d1bb28e5e..eecc7f07ec 100644 Binary files a/FontArt/ArtFont_1/ArtFont_1_0.png and b/FontArt/ArtFont_1/ArtFont_1_0.png differ diff --git a/FontArt/ArtFont_1/c_czlb_dian.png b/FontArt/ArtFont_1/c_czlb_dian.png new file mode 100644 index 0000000000..ec04c80fbc Binary files /dev/null and b/FontArt/ArtFont_1/c_czlb_dian.png differ diff --git a/FontArt/ArtFont_1/config.bmfc b/FontArt/ArtFont_1/config.bmfc index e69de29bb2..791d4064a1 100644 --- a/FontArt/ArtFont_1/config.bmfc +++ b/FontArt/ArtFont_1/config.bmfc @@ -0,0 +1,70 @@ +# AngelCode Bitmap Font Generator configuration file +fileVersion=1 + +# font settings +fontName=Arial +fontFile= +charSet=0 +fontSize=32 +aa=1 +scaleH=100 +useSmoothing=1 +isBold=0 +isItalic=0 +useUnicode=1 +disableBoxChars=1 +outputInvalidCharGlyph=0 +dontIncludeKerningPairs=0 +useHinting=1 +renderFromOutline=0 +useClearType=1 +autoFitNumPages=0 +autoFitFontSizeMin=0 +autoFitFontSizeMax=0 + +# character alignment +paddingDown=0 +paddingUp=0 +paddingRight=0 +paddingLeft=0 +spacingHoriz=1 +spacingVert=1 +useFixedHeight=0 +forceZero=0 +widthPaddingFactor=0.00 + +# output file +outWidth=256 +outHeight=128 +outBitDepth=32 +fontDescFormat=0 +fourChnlPacked=0 +textureFormat=png +textureCompression=0 +alphaChnl=1 +redChnl=0 +greenChnl=0 +blueChnl=0 +invA=0 +invR=0 +invG=0 +invB=0 + +# outline +outlineThickness=0 + +# selected chars + + +# imported icon images +icon="c_czlb_0.png",48,0,0,0 +icon="c_czlb_1.png",49,0,0,0 +icon="c_czlb_2.png",50,0,0,0 +icon="c_czlb_3.png",51,0,0,0 +icon="c_czlb_4.png",52,0,0,0 +icon="c_czlb_5.png",53,0,0,0 +icon="c_czlb_6.png",54,0,0,0 +icon="c_czlb_7.png",55,0,0,0 +icon="c_czlb_8.png",56,0,0,0 +icon="c_czlb_9.png",57,0,0,0 +icon="c_czlb_dian.png",46,0,0,0 diff --git a/FontArt/ArtFont_2/ArtFont_2.fnt b/FontArt/ArtFont_2/ArtFont_2.fnt new file mode 100644 index 0000000000..f29ad71a22 --- /dev/null +++ b/FontArt/ArtFont_2/ArtFont_2.fnt @@ -0,0 +1,15 @@ +info face="Arial" size=32 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=32 base=26 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 +page id=0 file="ArtFont_2_0.png" +chars count=11 +char id=46 x=468 y=162 width=39 height=39 xoffset=0 yoffset=0 xadvance=39 page=0 chnl=15 +char id=48 x=121 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=49 x=114 y=324 width=95 height=159 xoffset=0 yoffset=0 xadvance=95 page=0 chnl=15 +char id=50 x=0 y=324 width=113 height=159 xoffset=0 yoffset=0 xadvance=113 page=0 chnl=15 +char id=51 x=0 y=162 width=117 height=161 xoffset=0 yoffset=0 xadvance=117 page=0 chnl=15 +char id=52 x=229 y=162 width=121 height=159 xoffset=0 yoffset=0 xadvance=121 page=0 chnl=15 +char id=53 x=118 y=162 width=110 height=160 xoffset=0 yoffset=0 xadvance=110 page=0 chnl=15 +char id=54 x=0 y=0 width=120 height=161 xoffset=0 yoffset=0 xadvance=120 page=0 chnl=15 +char id=55 x=351 y=162 width=116 height=159 xoffset=0 yoffset=0 xadvance=116 page=0 chnl=15 +char id=56 x=240 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 +char id=57 x=359 y=0 width=118 height=161 xoffset=0 yoffset=0 xadvance=118 page=0 chnl=15 diff --git a/FontArt/ArtFont_2/ArtFont_2_0.png b/FontArt/ArtFont_2/ArtFont_2_0.png new file mode 100644 index 0000000000..bcc9fc457f Binary files /dev/null and b/FontArt/ArtFont_2/ArtFont_2_0.png differ diff --git a/FontArt/ArtFont_2/config.bmfc b/FontArt/ArtFont_2/config.bmfc new file mode 100644 index 0000000000..8b5c397ad2 --- /dev/null +++ b/FontArt/ArtFont_2/config.bmfc @@ -0,0 +1,70 @@ +# AngelCode Bitmap Font Generator configuration file +fileVersion=1 + +# font settings +fontName=Arial +fontFile= +charSet=0 +fontSize=32 +aa=1 +scaleH=100 +useSmoothing=1 +isBold=0 +isItalic=0 +useUnicode=1 +disableBoxChars=1 +outputInvalidCharGlyph=0 +dontIncludeKerningPairs=0 +useHinting=1 +renderFromOutline=0 +useClearType=1 +autoFitNumPages=0 +autoFitFontSizeMin=0 +autoFitFontSizeMax=0 + +# character alignment +paddingDown=0 +paddingUp=0 +paddingRight=0 +paddingLeft=0 +spacingHoriz=1 +spacingVert=1 +useFixedHeight=0 +forceZero=0 +widthPaddingFactor=0.00 + +# output file +outWidth=256 +outHeight=128 +outBitDepth=32 +fontDescFormat=0 +fourChnlPacked=0 +textureFormat=png +textureCompression=0 +alphaChnl=1 +redChnl=0 +greenChnl=0 +blueChnl=0 +invA=0 +invR=0 +invG=0 +invB=0 + +# outline +outlineThickness=0 + +# selected chars + + +# imported icon images +icon="r_lianxuchongzhizi_0.png",48,0,0,0 +icon="r_lianxuchongzhizi_01.png",49,0,0,0 +icon="r_lianxuchongzhizi_02.png",50,0,0,0 +icon="r_lianxuchongzhizi_03.png",51,0,0,0 +icon="r_lianxuchongzhizi_04.png",52,0,0,0 +icon="r_lianxuchongzhizi_05.png",53,0,0,0 +icon="r_lianxuchongzhizi_06.png",54,0,0,0 +icon="r_lianxuchongzhizi_07.png",55,0,0,0 +icon="r_lianxuchongzhizi_08.png",56,0,0,0 +icon="r_lianxuchongzhizi_09.png",57,0,0,0 +icon="r_lianxuchongzhizi_dian.png",46,0,0,0 diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_0.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_0.png new file mode 100644 index 0000000000..035bbf2e3f Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_0.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_01.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_01.png new file mode 100644 index 0000000000..1c632d2c02 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_01.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_02.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_02.png new file mode 100644 index 0000000000..7310d44fc2 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_02.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_03.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_03.png new file mode 100644 index 0000000000..82339afce9 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_03.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_04.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_04.png new file mode 100644 index 0000000000..c421949f82 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_04.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_05.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_05.png new file mode 100644 index 0000000000..4f0009cb63 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_05.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_06.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_06.png new file mode 100644 index 0000000000..6fce601e49 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_06.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_07.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_07.png new file mode 100644 index 0000000000..3f94ff8f70 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_07.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_08.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_08.png new file mode 100644 index 0000000000..b143e60d40 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_08.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_09.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_09.png new file mode 100644 index 0000000000..72bc7ff811 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_09.png differ diff --git a/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png b/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png new file mode 100644 index 0000000000..70c6076810 Binary files /dev/null and b/FontArt/ArtFont_2/r_lianxuchongzhizi_dian.png differ