diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
index 622df041..ea74fc79 100644
--- a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
+++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
@@ -5,11 +5,7 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
diff --git a/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml b/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml
index 9fab46a5..f52eb93c 100644
--- a/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml
+++ b/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml
@@ -10,11 +10,7 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
diff --git a/wb_new_ui/settings/Publish.json b/wb_new_ui/settings/Publish.json
index fb00db34..71e9772f 100644
--- a/wb_new_ui/settings/Publish.json
+++ b/wb_new_ui/settings/Publish.json
@@ -25,8 +25,8 @@
"paging": true,
"sizeOption": "pot",
"forceSquare": false,
- "allowRotation": false,
- "trimImage": false
+ "allowRotation": true,
+ "trimImage": true
},
"include2x": false,
"include3x": false,
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index 217727d1..becdab14 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index 42bffdeb..122afb54 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png
index 0c3ba2cc..c941a646 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png
index fe2e3307..99d4243f 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png
index 561d9cb6..930f5d09 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png
deleted file mode 100644
index 930f5d09..00000000
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta
deleted file mode 100644
index 9386943e..00000000
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: e1cbb0b09e915db4f97b9470351bb114
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 81aa279c..54f16964 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png
index 7802beee..2ddbeed5 100644
Binary files a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png and b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes
index 98dff783..1a20a42f 100644
Binary files a/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes and b/wb_unity_pro/Assets/ART/base/chat/ui/Chat_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index 27ec62c2..ca2a33a0 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index 5611b5b2..4fad3a40 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png
deleted file mode 100644
index 8187c569..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
deleted file mode 100644
index 9e9bdc4b..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: b27507f8b68c25a48b232b4900183954
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png
deleted file mode 100644
index 3badb78b..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png.meta
deleted file mode 100644
index 4bafa2e5..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: f9ea38489dc364348bc13d202aa4ced8
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png
deleted file mode 100644
index a943172d..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png.meta
deleted file mode 100644
index d0f65dd8..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: bd2d4990f6701d7478a743eaf221ae5d
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png
deleted file mode 100644
index 09f62d71..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png.meta
deleted file mode 100644
index b88e2153..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 402ca17d899206643abedfc3dcde13a6
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png
deleted file mode 100644
index 4fed1f22..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta
deleted file mode 100644
index 080405eb..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 1c9e68a24c2550a4295ea70402a66825
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png
deleted file mode 100644
index 3b9d2e38..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta
deleted file mode 100644
index 55b4928f..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: b91fc03b757a91745bc568274a8aad5a
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png
deleted file mode 100644
index 0257d3a5..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png.meta
deleted file mode 100644
index 06e7d14f..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: da37ff44206a6d94fa35c5ccb09d2aef
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png
deleted file mode 100644
index 304adea6..00000000
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta
deleted file mode 100644
index 0bb99a98..00000000
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 995fab8376370944c8f6fd1bfd49c41e
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
index d0ab49c3..bdd41de6 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
index e9f29dab..cda14a91 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
index 4ae9a5be..edfccc18 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
index 79df794b..a3fd11e8 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
index 89d420a6..9df0dd58 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png
index ac782d2c..df684a79 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
index 62c0a7ae..459982b6 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
index 32f45590..75097a82 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index faf570c5..cf5b3dc2 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index 825ff70c..f0340b70 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png
index 93af6062..73802c9a 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png
index b4042815..7aec7449 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png
index 791eaf54..8a20e592 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png
index 128d811e..68f2e760 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png
index 06b07b9c..1cdfb0e0 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png
index c3bd79b4..a5e77d34 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index 811ce681..eb7ec5d2 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png
index 893565ff..94e763e7 100644
Binary files a/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png and b/wb_unity_pro/Assets/ART/base/login/ui/Login_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes
index fff4781a..42c51504 100644
Binary files a/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes and b/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0.png
index c6fac71a..fccfecee 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_1.png
index 65b7de3a..86989ab5 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_2.png
index 38101e21..17a095bf 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_3.png
index dcf05514..f1734131 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png
deleted file mode 100644
index ab6bce2a..00000000
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png.meta b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png.meta
deleted file mode 100644
index 2e4b4afc..00000000
--- a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_atlas0_4.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 5298507cf1d0239489b2230a95a9495e
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- 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: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/main_pokemajiang/5ffb7612746446311d7fb33d58b4daa3
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_fui.bytes
index b2c48a29..8b2fbc4c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_pokemajiang/ui/Main_PokeMaJiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png
index 258f4b28..820a64c2 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes
index f4b86f3a..f00ab020 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
index aed1a7de..23c97558 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
index 5b4641b2..7b7d9e4e 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
index 726f6b68..1111e726 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index ec9d37a9..794355fd 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png
index aa41fb6b..1f1c4075 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png
index 447f3ef1..0c51f0c9 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png
index a220ee7d..5b650829 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes
index aa1b0492..92b2184b 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png
index 141e74d6..a52bbdc7 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes
index 0ad0ee45..712ca048 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index 03738651..d88f8ed1 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index d8426f99..6841f8dd 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png
index af3c97e2..ba9d6b83 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png
index a8ee0829..70cce5e6 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 3e4463a6..354636d7 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/rank/ui/Rank_atlas0.png b/wb_unity_pro/Assets/ART/base/rank/ui/Rank_atlas0.png
index dec87932..90ff66b5 100644
Binary files a/wb_unity_pro/Assets/ART/base/rank/ui/Rank_atlas0.png and b/wb_unity_pro/Assets/ART/base/rank/ui/Rank_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/rank/ui/Rank_fui.bytes b/wb_unity_pro/Assets/ART/base/rank/ui/Rank_fui.bytes
index 0525254b..6ac4a756 100644
Binary files a/wb_unity_pro/Assets/ART/base/rank/ui/Rank_fui.bytes and b/wb_unity_pro/Assets/ART/base/rank/ui/Rank_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0.png
index 8a626410..69b30e8e 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_fui.bytes
index 7476410a..faefb44b 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_atlas0.png
index 11aee779..12bd2cdd 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_fui.bytes
index e11e5681..98a1d45a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Info_MJ_ChangSha_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png
index 96eccbfe..3446b576 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png
index 81ba7380..f77fc323 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png
index 7f3f703d..10dde1ea 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes
index 02959887..7e9a86f6 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_atlas0.png
index 5d41ad1e..9de36bcc 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes
index 78d6fc9d..88329245 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png
index 6a091542..d2b39c15 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png
index 9b509716..cd71e712 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes
index eb788d91..c00ab6b5 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_atlas0.png
index 5d41ad1e..9de36bcc 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes
index 59825391..11af4d99 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png
index 49dbda3c..bb877338 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png
index c51eaf13..31939fe9 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta
index 458b96ff..c0d2d5e0 100644
--- a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: extend/majiang/lichuan/8dba1742414c996765e2bd85d1b4bea7
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes
index faeb650d..3aa13246 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_atlas0.png
index eceea89f..746aad09 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes
index 6452895b..5b4df80a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png
index ac666a41..d0fa7666 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png
index 9b509716..cd71e712 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes
index ee53bfed..8232417c 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_atlas0.png
index 5d41ad1e..9de36bcc 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes
index 24797202..0c348411 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0.png
index 3a77f500..02341ec5 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png
index b21e3da1..4b87c3f5 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png.meta
index 30141e71..908271a7 100644
--- a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_atlas0_1.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: extend/poker/chuntian/8f2a9eeddae7bdd6699208ed03c6055a
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_fui.bytes
index db86dc9b..78a8dbca 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Extend_Poker_ChunTian_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_atlas0.png
index 5e2f4c74..7b5eab6b 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_fui.bytes
index 37c53644..875673d6 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/chuntian/ui/Info_Poker_ChunTian_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index 7dde9838..58c52115 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index c0002597..9124ff99 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta
index 871ac089..40ef6461 100644
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 9a74e401..2781ce8f 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png
index 88920317..0e9c0e7d 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes
index 6e984d74..ce014879 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png
index 89a75edd..4afd0df1 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes
index 575a579b..3f4ece32 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Extend_Poker_SuoHaNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png
index 74e07756..419f1c3a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes
index 576020db..08f90f55 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/suoha/ui/Info_Poker_SuoHaNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png
index 875c0130..b6ff362a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes
index d1253e28..912f33d0 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes differ
diff --git a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png
index ecec408d..af3992bc 100644
Binary files a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png and b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_atlas0.png differ
diff --git a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes
index 4fa8d5a5..37aba57b 100644
Binary files a/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes and b/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes differ
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index af385fff..dbe4feae 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
@@ -1,109 +1,109 @@
[
{
"lua_path": "/tolua_project,/base_project,/main_project",
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "common",
"check": true,
"bundle": "base/common",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "login",
"check": true,
"bundle": "base/login",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "Family",
"check": true,
"bundle": "base/Family",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "chat",
"check": true,
"bundle": "base/chat",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "rank",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/rank"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "main_majiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/main_majiang"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "main_poker",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/main_poker"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "main_zipai",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/main_zipai"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "static",
"check": true,
"bundle": "base/static",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
- "version": "1.0.8"
+ "version": "1.0.6"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "main_pokemajiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/main_pokemajiang"
},
{
- "ver": "1.0.8",
+ "ver": "1.0.6",
"name": "main_zipaimajiang",
"check": true,
- "version": "1.0.8",
+ "version": "1.0.6",
"bundle": "base/main_zipaimajiang"
}
]
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..379d2b5a
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes
deleted file mode 100644
index 81bd1fe7..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
similarity index 95%
rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
index 6e2ab764..39902a0b 100644
Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..59f6c15e
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes
deleted file mode 100644
index 7aa3920e..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
similarity index 60%
rename from wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
index 05e44f28..c6d737b9 100644
Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
similarity index 93%
rename from wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
index 1df712f7..016bfd31 100644
Binary files a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
similarity index 53%
rename from wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
index db6c39fb..933aadc5 100644
Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..eeaefe30
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes
deleted file mode 100644
index 6378704c..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
similarity index 63%
rename from wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes
rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
index 2389165b..f7b7d800 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes
deleted file mode 100644
index 2389165b..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
similarity index 57%
rename from wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
index 61a3b1ca..870f56db 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..11215723
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes
deleted file mode 100644
index 89edab4f..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
similarity index 75%
rename from wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
index 7485b27b..b2a87d70 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
similarity index 75%
rename from wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
index 9b37ed12..7ad4db59 100644
Binary files a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..8888e654
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes
deleted file mode 100644
index 42d297f6..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..79eef24e
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes
deleted file mode 100644
index 12a32b93..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
similarity index 72%
rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes
rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
index 19bb143b..12046647 100644
Binary files a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes
deleted file mode 100644
index 51ccbb1a..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.14.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes
deleted file mode 100644
index c6ea6e51..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.15.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes
deleted file mode 100644
index 476b4003..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.20.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes
deleted file mode 100644
index 42321299..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.19.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes
deleted file mode 100644
index 065df509..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.26.bytes and /dev/null differ