diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua index 52587bc0..360cf348 100644 --- a/lua_probject/base_project/Game/Controller/RoomController.lua +++ b/lua_probject/base_project/Game/Controller/RoomController.lua @@ -117,8 +117,10 @@ function M:CreateRoom(game_id, _data, callback) end local join_room_frame = 0 + function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) printlog("公共进入房间接口=============PublicJoinRoom") + print("test,亲友圈ID是:",group_id) -- 同一帧不重复调用 local last_frame = join_room_frame join_room_frame = Time.frameCount @@ -127,6 +129,7 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) end -- 防止游戏没有离开控制器 ControllerManager.ChangeController(LoddyController) + local _data = {} if cmd == Protocol.WEB_FG_MATCH_ROOM then _data["is_null"] = tem diff --git a/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/lua_probject/base_project/Game/View/Common/BaseWindow.lua index 41a41df6..a6553c20 100644 --- a/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -65,10 +65,10 @@ function M:init(url) else ctr_hide_bg.selectedIndex = 0 end - printlog(url) + --printlog(url) self._view = UIPackage.CreateObjectFromURL(url) - printlog(self._view) - -- self._view.fairyBatching = true + --printlog(self._view) + --self._view.fairyBatching = true local btn_close = self._view:GetChild("btn_close") if (btn_close) then btn_close.onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index fcf695b0..b1b9904e 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1132,7 +1132,7 @@ function M:Show() Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self) Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self) - self.Reflash() + --self.Reflash() BaseView.Show(self) self:Reflash() diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml index 0551859e..eb8f76a6 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml @@ -2,7 +2,7 @@ - + @@ -30,9 +30,9 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index ff9d9d0d..922aef5c 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,6 +1,6 @@ - + @@ -125,23 +125,23 @@ - + - - + + - + - + - + @@ -243,7 +243,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml index eb2e95f7..fb503bad 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml @@ -38,5 +38,6 @@ + \ No newline at end of file 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 index 7444ddbe..61fa59a4 100644 --- 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 @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png index 20e57143..f52bd4d8 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index 03725362..593ac357 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png index 472012ca..17e19bff 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png index bf6bb308..11280d0f 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png index ceb1b755..7f66c9e0 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png new file mode 100644 index 00000000..bc537328 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta new file mode 100644 index 00000000..4e440b60 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f5dfe2527407f0847b118e5033b6d3ca +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_majiang/d2fa434d27dc07bf09395dc32491060b + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index ab73e1a3..fe24241e 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta index 9ba6a215..dcda3ed7 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf.meta @@ -11,7 +11,15 @@ TrueTypeFontImporter: fontName: Alibaba PuHuiTi 3.0 fontNames: - Alibaba PuHuiTi 3.0 - fallbackFontReferences: [] + fallbackFontReferences: + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} + - {instanceID: 0} customCharacters: fontRenderingMode: 0 ascentCalculationMode: 1 diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/FZCuYuan-M03.TTF.meta b/wb_unity_pro/Assets/ART/base/static/fonts/FZCuYuan-M03.TTF.meta index 82e4f838..c597030d 100644 --- a/wb_unity_pro/Assets/ART/base/static/fonts/FZCuYuan-M03.TTF.meta +++ b/wb_unity_pro/Assets/ART/base/static/fonts/FZCuYuan-M03.TTF.meta @@ -11,7 +11,8 @@ TrueTypeFontImporter: fontName: FZCuYuan-M03 fontNames: - FZCuYuan-M03 - fallbackFontReferences: [] + fallbackFontReferences: + - {fileID: 12800000, guid: 545e9f78c59b7c94ca8552daa0397675, type: 3} customCharacters: fontRenderingMode: 0 ascentCalculationMode: 1 diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index dbe4feae..ab54858e 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.6", + "ver": "1.0.9", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "rank", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/rank" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_majiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_majiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_poker", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_poker" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipai", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipai" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.6" + "version": "1.0.9" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_pokemajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.6", + "ver": "1.0.9", "name": "main_zipaimajiang", "check": true, - "version": "1.0.6", + "version": "1.0.9", "bundle": "base/main_zipaimajiang" } ] 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 new file mode 100644 index 00000000..ed7176e1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes new file mode 100644 index 00000000..ed7176e1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes 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.8.bytes new file mode 100644 index 00000000..0eed766b Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.9.bytes new file mode 100644 index 00000000..971c4eef Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.9.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 new file mode 100644 index 00000000..c6d21cb4 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.9.bytes new file mode 100644 index 00000000..c6d21cb4 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.9.bytes 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.8.bytes new file mode 100644 index 00000000..b0ab2ff1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.bytes new file mode 100644 index 00000000..b0ab2ff1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.9.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.8.bytes new file mode 100644 index 00000000..1d44f333 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.9.bytes new file mode 100644 index 00000000..1d44f333 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.9.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.8.bytes new file mode 100644 index 00000000..337d9a06 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.9.bytes new file mode 100644 index 00000000..1afbc297 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.9.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 new file mode 100644 index 00000000..09178764 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.9.bytes new file mode 100644 index 00000000..09178764 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.9.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 new file mode 100644 index 00000000..24029367 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.9.bytes new file mode 100644 index 00000000..39a86851 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.9.bytes 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.8.bytes new file mode 100644 index 00000000..e992b33e Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.9.bytes new file mode 100644 index 00000000..e992b33e Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.9.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 new file mode 100644 index 00000000..8fa6fc8a Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.9.bytes new file mode 100644 index 00000000..8fa6fc8a Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.9.bytes 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.8.bytes new file mode 100644 index 00000000..843e36c9 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.9.bytes new file mode 100644 index 00000000..843e36c9 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.9.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.8.bytes new file mode 100644 index 00000000..cc313266 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.9.bytes new file mode 100644 index 00000000..cc313266 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.9.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 new file mode 100644 index 00000000..f2881c0d Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.9.bytes new file mode 100644 index 00000000..f2881c0d Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.9.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 new file mode 100644 index 00000000..bc382ca4 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.9.bytes new file mode 100644 index 00000000..bc382ca4 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.9.bytes 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.8.bytes new file mode 100644 index 00000000..9b2aee8a Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.9.bytes new file mode 100644 index 00000000..b890a259 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.9.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.15.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.15.bytes new file mode 100644 index 00000000..ec6d66ca Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.15.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.16.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.16.bytes new file mode 100644 index 00000000..1b7d1305 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.16.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.30.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.30.bytes new file mode 100644 index 00000000..1ae2ee2b Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.30.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.29.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.29.bytes new file mode 100644 index 00000000..2b9e9a4f Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.29.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.3.bytes b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.3.bytes new file mode 100644 index 00000000..6bcb59f0 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.3.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes new file mode 100644 index 00000000..4bd973f1 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.4.bytes b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.4.bytes new file mode 100644 index 00000000..6c0c8f79 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.4.bytes differ