diff --git a/Assets/ManagedResources/ArtFont_vi/x_xbmz_baizi1_vi.png b/Assets/ManagedResources/ArtFont_vi/x_xbmz_baizi1_vi.png new file mode 100644 index 0000000000..d9c9388aff Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/x_xbmz_baizi1_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/x_xbmz_slogan_vi.png b/Assets/ManagedResources/ArtFont_vi/x_xbmz_slogan_vi.png new file mode 100644 index 0000000000..a653ea36f7 Binary files /dev/null and b/Assets/ManagedResources/ArtFont_vi/x_xbmz_slogan_vi.png differ diff --git a/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_slogan.png b/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_slogan_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_slogan.png rename to Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_slogan_zh.png diff --git a/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_xunbaozi.png.meta b/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_xunbaozi.png.meta index 259cac7a84..1929d75e80 100644 --- a/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_xunbaozi.png.meta +++ b/Assets/ManagedResources/Atlas/XunBaoMiZong/ArtFont/x_xbmz_xunbaozi.png.meta @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 7db1dce7c3f3c7043b29a48e8899f031 + spriteID: 635b3e6cd773a8f438e5ef9563f4baa7 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/XunBaoMiZong/x_xbmz_baizi1.png b/Assets/ManagedResources/Atlas/XunBaoMiZong/x_xbmz_baizi1_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/XunBaoMiZong/x_xbmz_baizi1.png rename to Assets/ManagedResources/Atlas/XunBaoMiZong/x_xbmz_baizi1_zh.png diff --git a/Assets/ManagedResources/BG/ArtFont/r_meiriqiandaobeijing.jpg.meta b/Assets/ManagedResources/BG/ArtFont/r_meiriqiandaobeijing.jpg.meta new file mode 100644 index 0000000000..ada9f3c4d5 --- /dev/null +++ b/Assets/ManagedResources/BG/ArtFont/r_meiriqiandaobeijing.jpg.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 82ce5779344458c489d4facdef7e27b8 +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: 4ab6d6e8a6c6d8a4e8f738b39596c813 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab index d1a0f8b966..e747335874 100644 --- a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab @@ -3843,7 +3843,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: e31e84bc0f6b9f4408f2b8c50cbaca7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a5a07a4f98fcc04181428f98128e390, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5430,6 +5430,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5715261237029566118} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5490,16 +5500,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &8298585180819362860 stripped @@ -5515,6 +5515,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7747215893760334104} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5575,16 +5585,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7783773276201446485 stripped @@ -5600,6 +5600,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 882096712974553120} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5660,16 +5670,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7862799739177442004 stripped @@ -5685,6 +5685,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5642248290089047899} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5745,16 +5755,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7676859068974349745 stripped @@ -5770,6 +5770,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8611135082760516920} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5830,16 +5840,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &2170780910033458949 stripped @@ -5855,6 +5855,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 65352753708653099} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5915,16 +5925,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &2252215818400473861 stripped @@ -5940,6 +5940,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2444616474785577406} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -6000,16 +6010,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &812851419482674323 stripped @@ -6025,6 +6025,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7819138320611175682} m_Modifications: + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_Name + value: Effect_UI_ZhuCheng_xuanzhong + objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -6085,16 +6095,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_Name - value: Effect_UI_ZhuCheng_xuanzhong - objectReference: {fileID: 0} - - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab index 53c4cdd735..aeb5704c73 100644 --- a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab @@ -1977,7 +1977,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: 3e2a6bbdbf7647d49bf11f004c27b90d, type: 3} + m_Sprite: {fileID: 21300000, guid: 975ad57a12e9ad24dae5d2aafffba88c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2581,7 +2581,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: a7e90e4d6bfefed449aafdcbba950789, type: 3} + m_Sprite: {fileID: 21300000, guid: 51e82d44767236548a0605e0690b0049, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1