diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 381729b7..d8d50922 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -362,8 +362,11 @@ end -- 网络状态更新 function M:OnEventOnlineState(evt_data) + printlog("lingmeng OnEventOnlineState") self._cacheEvent:Enqueue( function() + printlog("lingmeng OnEventOnlineState1") + local playerid = evt_data['aid'] local online = evt_data['online'] local player = DataManager.CurrenRoom:GetPlayerById(playerid) diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index b4771503..43209518 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -162,6 +162,7 @@ function M:connect(host, groupId, callback) group.ban_chat2 = res.Data.ban_chat2 group.isvip = res.Data.isvip group.isWatch = res.Data.isWatch + group.messageCount = res.Data.messageCount group.joinsData = {} else self.code = SocketCode.ExceptionOnConnect @@ -648,7 +649,7 @@ function M:OnRefNumberBan(evt_data) local group = DataManager.groups:get(self.groupId) group:addMember(tem) - pt("lingmeng ccc OnRefNumberBan1",evt_data) + pt("lingmeng ccc OnRefNumberBan1", evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnRefNumberBan, evt_data) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua index da77e72b..c2790fd2 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua @@ -99,6 +99,15 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj) for i = 1, #rdata do local obj2 = list:AddItemFromPool() obj2:GetChild('title').text = rdata[i].score + if allDate.applyDismisUserId and allDate.applyDismisUserId ~= "" then + if round == tonumber(allDate.round) then + obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2 + end + end + end + if round == tonumber(allDate.round) then + obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "") and + 1 or 0 end local btn_play = obj:GetChild("n10") diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index 174d8b0f..d5b583a2 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -326,8 +326,7 @@ end function M:RemindCardRender(data, obj) local room = DataManager.CurrenRoom - obj.icon = string.format("ui://Main_Majiang/b202_%d", data) - print("lingmeng icon", obj.icon) + obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data) if room.jing == data then obj:GetController('jing').selectedIndex = 1 end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua index 48795fb4..74eb2856 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua @@ -245,6 +245,10 @@ function M:OnEventFzTips(evt_data) -- end tiplist:AddTip(tip) end + --排序规则,胡杠碰 + tiplist:SortList(function(a, b) + return a.type < b.type + end) DispatchEvent(self._dispatcher, TX_GameEvent.FZTips, tiplist, weight) end) end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index b76b9b8e..74c28773 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -59,7 +59,9 @@ function M:InitView(url) --]] local config = ExtendManager.GetExtendConfig(room.game_id) local mode = config:GetGameInfo() - local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), json.encode(room.room_config.hpData)) + pt("lingmeng", room) + local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config), + json.encode(room.room_config.config.hpData)) self._view:GetChild('wanfa_text').text = gamePlay self.jing = self._view:GetChild('jing') @@ -177,9 +179,11 @@ function M:UpdatePlayerInfoView() local list = self._room.player_list for i = 1, self._room.room_config.people_num do - local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) - _player_info[i] = PlayerInfoView.new(tem, self) - _player_info[i]:FillData(list[i]) + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) end end @@ -315,6 +319,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) + self:PlayMJSound("end_music.mp3") MJMainView.OnResult1(self, ...) --[[ self._popEvent = false @@ -456,6 +461,18 @@ function M:EventInit() end self.showNextList.numItems = #cardSet end) + + --替换mianview的事件 + _gamectr:AddEventListener( + GameEvent.PlayerState, + function(...) + printlog("lingmeng OnEventOnlineState") + local arg = { ... } + local p = arg[1] + local info = self._player_info[self:GetPos(p.seat)] + info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0 + end + ) end function M:OutCard(card) @@ -542,20 +559,21 @@ function M:__FangziTip(tip, weight) local _lit_fanzi = _chipeng_tip:GetChild("list") --_lit_fanzi:SetVirtual() - local _tlist = tip.tip_map_id + local _tlist = tip.tip_sortList _lit_fanzi.itemRenderer = function(index, obj) local type = obj:GetController('type') if index == tip.tip_num then type.selectedIndex = 0 obj.onClick:Set(function() - --测试暂时取消过提示 - -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗?", MsgWindow.MsgMode.OkAndCancel) - -- guo_msg.onOk:Add(function() - _gamectr:SendAction(0) _ctr_tips.selectedIndex = 0 - -- guo_msg:Close() - -- end) - -- guo_msg:Show() + if tip.is_hu then + info._ctr_showGuoHu.selectedIndex = 1 + info._viewBtn_guoHu.onClick:Set(function() + _gamectr:SendAction(0) + end) + else + _gamectr:SendAction(0) + end end) else index = index + 1 @@ -798,7 +816,7 @@ function M:ReloadRoom(bskip) end end - + self:ShowJing() for i = 1, #room.player_list do local p = room.player_list[i] local info = self._player_card_info[self:GetPos(p.seat)] diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index 7cefc9f6..3c3c528c 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -76,7 +76,6 @@ function M:SendOutCard(card, callback) pt(p.card_list) table.sort(p.card_list, self.HandCardSortAndJing) - p.hand_left_count = p.hand_left_count - 1 if not p.outcard_list then p.outcard_list = {} end p.outcard_list[#p.outcard_list + 1] = card diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 1e052db1..a7a0aa72 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -167,6 +167,7 @@ function M:InitPlayerInfoView() local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) _player_info[i] = PlayerInfoView.new(tem, self) tem.visible = false + printlog("lingmeng _player_info init", tem, i) end end @@ -176,9 +177,11 @@ function M:UpdatePlayerInfoView() local list = self._room.player_list for i = 1, self._room.room_config.people_num do - local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1)) - _player_info[i] = PlayerInfoView.new(tem, self) - _player_info[i]:FillData(list[i]) + local seat = self:GetPos(list[i].seat) + local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1)) + _player_info[seat] = PlayerInfoView.new(tem, self) + _player_info[seat]:FillData(list[i]) + printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name) end end @@ -289,6 +292,7 @@ function M:EventInit() self._tex_LeftCard.text = string.format("余%d张", arg[3]) -- self:UpdateRoomInfo() local info = self._player_card_info[self:GetPos(seat)] + print("lingmeng log GetCard", self:GetPos(seat)) info:UpdateHandCard(true) end) @@ -485,6 +489,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) + self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 self:UpdateCardBox(0) @@ -551,6 +556,18 @@ function M:EventInit() end self.showNextList.numItems = #cardSet end) + + --替换mianview的事件 + _gamectr:AddEventListener( + GameEvent.PlayerState, + function(...) + printlog("lingmeng OnEventOnlineState") + local arg = { ... } + local p = arg[1] + local info = self._player_info[self:GetPos(p.seat)] + info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0 + end + ) end function M:OutCard(card) @@ -564,6 +581,7 @@ function M:OutCard(card) info:UpdateHandCard() info:UpdateOutCardList(nil, card, self._cursor) + info._ctr_tip.selectedIndex = 0 self:PlaySound("LiChuan_MJ", self._room.self_player.self_user.sex, tostring(card)) self:PlayMJSound("chupai.mp3") -- self:ShowHuTip() @@ -811,7 +829,8 @@ function M:OnFangziAction(...) local fs_info = _player_card_info[self:GetPos(fz.from_seat)] fs_info:UpdateOutCardList() end - info:UpdateFzList(fz, index, true) + local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1 + info:UpdateFzList(fz, index, true, seat) local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi printlog(getcard) info:UpdateHandCard(getcard) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 253db6ad..0adf33a9 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -7,6 +7,7 @@ local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView") local SettingView = import(".EXSettingView") local TableBG = require("Game.Data.TableBG") local WitnessView = require("Game.View.WitnessView") +local MJMainView = require("main.majiang.MJMainView") local Record_Event = import(".RecordEvent") diff --git a/wb_new_ui/assets/Family/Record/Component/Item_record.xml b/wb_new_ui/assets/Family/Record/Component/Item_record.xml index b0081e24..f99b2c33 100644 --- a/wb_new_ui/assets/Family/Record/Component/Item_record.xml +++ b/wb_new_ui/assets/Family/Record/Component/Item_record.xml @@ -1,5 +1,6 @@ + @@ -8,11 +9,14 @@ - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Record/Component/Item_score.xml b/wb_new_ui/assets/Family/Record/Component/Item_score.xml index 91b5f6a0..5a97a8a8 100644 --- a/wb_new_ui/assets/Family/Record/Component/Item_score.xml +++ b/wb_new_ui/assets/Family/Record/Component/Item_score.xml @@ -1,5 +1,6 @@ + @@ -7,5 +8,11 @@ + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Record/Image/guanliyuanjiesan.png b/wb_new_ui/assets/Family/Record/Image/guanliyuanjiesan.png new file mode 100644 index 00000000..4dfb5975 Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/guanliyuanjiesan.png differ diff --git a/wb_new_ui/assets/Family/Record/Image/同意.png b/wb_new_ui/assets/Family/Record/Image/同意.png new file mode 100644 index 00000000..f6133645 Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/同意.png differ diff --git a/wb_new_ui/assets/Family/Record/Image/解散.png b/wb_new_ui/assets/Family/Record/Image/解散.png new file mode 100644 index 00000000..9e3ab792 Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/解散.png differ diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index ff0fd6ad..c5c30793 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -398,6 +398,9 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml index 4dd25571..cf93668c 100644 --- a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml +++ b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml @@ -137,5 +137,6 @@ + \ No newline at end of file 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 c745f04f..0130b3bc 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 a1009e1d..8e4ef347 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 8ce30330..e1c3357c 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 99d4243f..696ef1a1 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 930f5d09..4b08989e 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 new file mode 100644 index 00000000..930f5d09 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png 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 new file mode 100644 index 00000000..9dda29fb --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7ff3ac2be65b7b5459c85281dc00cf59 +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 2c7308c8..468629aa 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/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 fa20150d..0df8eceb 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/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..be123cbd 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.6.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes index f31435a7..ae5f0c6c 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.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.8.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes new file mode 100644 index 00000000..626b8d67 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/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..dbd71849 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/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..016bfd31 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/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..b49698cd 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/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..dc49fb3b 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/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..5e575530 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_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..91dd3958 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_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..11215723 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_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..20e6d905 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_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..23c0ef0f 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/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..b374a750 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/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..79eef24e 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/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..b1c41db1 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/extend/majiang/fuzhou/asset_pack1.0.18.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.18.bytes new file mode 100644 index 00000000..99c2e152 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.18.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes new file mode 100644 index 00000000..13248a44 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes new file mode 100644 index 00000000..e1ed27b7 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes new file mode 100644 index 00000000..bd89cf00 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes new file mode 100644 index 00000000..4658b0a6 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes new file mode 100644 index 00000000..69526901 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes new file mode 100644 index 00000000..04708fa4 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes differ