diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua index 8a224292..423d10b7 100644 --- a/lua_probject/base_project/Game/Controller/RoomController.lua +++ b/lua_probject/base_project/Game/Controller/RoomController.lua @@ -17,6 +17,7 @@ local function __ConntectGameServer(cmd, room, host, _data, callback) local _game_client = NetClient.new(host, "game") _game_client:connect() ControllerManager.SetGameNetClient(_game_client) + _game_client.onconnect:Add(function(code) if (code == SocketCode.Connect) then _game_client:send(cmd, _data, function(response) @@ -274,24 +275,24 @@ function M:PublicWitnessRoom(cmd, roomid, group_id, callback, game_id, pid) if (res1.ReturnCode ~= 0) then if (callback) then callback(res1) end else - -- ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData - -- local _s2croom = res1.Data - -- room.owner_id = _s2croom["owner"] - -- if _s2croom.createTime then - -- room.create_time = _s2croom["createTime"] - -- end - -- if _s2croom.manor then - -- room.banker_seat = _s2croom.manor - -- end - -- room.agent = _s2croom.agent == 1 and true or false - -- -- ControllerManager.SetGameNetClient(game_net) - -- local extend = ExtendManager.GetExtendConfig(room.game_id) - -- extend:FillRoomData(_s2croom) - -- ControllerManager.ChangeController(GameController) - -- local gamectr = ControllerManager.GetCurrenController() - -- gamectr.tmpRoomID = room.room_id - -- gamectr.tmpGroupID = room.group_id - -- if callback then callback(res1) end + ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData + local _s2croom = res1.Data + room.owner_id = _s2croom["owner"] + if _s2croom.createTime then + room.create_time = _s2croom["createTime"] + end + if _s2croom.manor then + room.banker_seat = _s2croom.manor + end + room.agent = _s2croom.agent == 1 and true or false + -- ControllerManager.SetGameNetClient(game_net) + local extend = ExtendManager.GetExtendConfig(room.game_id) + extend:FillWitnessData(_s2croom) + ControllerManager.ChangeController(GameController) + local gamectr = ControllerManager.GetCurrenController() + gamectr.tmpRoomID = room.room_id + gamectr.tmpGroupID = room.group_id + if callback then callback(res1) end end end) else diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index d2a8dc3b..5c850954 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -258,7 +258,7 @@ function M:UpdateFamilyRoom(fgCtr, id) -- ViewManager.ChangeView(ViewManager.View_Lobby) return else - ViewManager.ChangeView(ViewManager.View_Main, gameId) + ViewManager.ChangeView(ViewManager.View_Witness, gameId) end end, gameId, diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 2942fb04..83e85002 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -246,6 +246,25 @@ function M:InitView(url, isHideIpAdds) end) end + self._chat_Talk = _view:GetChild('btn_sendTalk') + if self._chat_Talk then + self._ctr_voice = _view:GetController('voice') + + self._chat_Talk.onTouchBegin:Set(function() + if record_baned == 1 then + self:__SetRecordEnable() + else + self._record_time = 0 + GameApplication.Instance.StopMusic = GameApplication.Instance.StopMusic + 1 + self._chat_Talk.onTouchEnd:Set(self.__RecordTouchEnd, self) + -- Voice.BeginRecord() + self._ctr_voice.selectedIndex = 1 + self.__runwait_record = nil + self.__runwait_record = coroutine.start(self.__WaitRecord, self) + end + end) + end + local btn_ready = _view:GetChild('btn_ready') if btn_ready ~= nil then btn_ready.onClick:Set(function() @@ -575,7 +594,7 @@ function M:__RecordTouchEnd() self.__runwait_record = nil self._ctr_voice.selectedIndex = 0 GameApplication.Instance.StopMusic = GameApplication.Instance.StopMusic - 1 - self._btn_record.onTouchEnd:Remove(self.__RecordTouchEnd, self) + self._chat_Talk.onTouchEnd:Remove(self.__RecordTouchEnd, self) local room = self._room Voice.EndRecord( room.room_id, @@ -1062,7 +1081,10 @@ function M:OnUpdate() end if self._view:GetChild('gcm_chat') then self._record_time = self._record_time + deltaTime + elseif self._record_time then + self._record_time = self._record_time + deltaTime end + local _left_time = self._left_time if (_left_time > 0) then _left_time = _left_time - deltaTime diff --git a/lua_probject/base_project/Game/ViewManager.lua b/lua_probject/base_project/Game/ViewManager.lua index 1a0e3c7d..fd023aa4 100644 --- a/lua_probject/base_project/Game/ViewManager.lua +++ b/lua_probject/base_project/Game/ViewManager.lua @@ -8,11 +8,13 @@ ViewManager = { View_Lobby = 2, - View_Main = 3, + View_Family = 3, - View_PlayBack = 4, + View_Main = 4, - View_Family = 5, + View_PlayBack = 5, + + View_Witness = 6, } @@ -151,7 +153,7 @@ end function ViewManager.OnApplicationPause() -- print("game pause") - if (_currenView ~= nil) then + if (_currenView ~= nil) then _currenView:OnApplicationPause() end end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua new file mode 100644 index 00000000..8bb06723 --- /dev/null +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -0,0 +1,388 @@ +local EXRoomConfig = import(".EXRoomConfig") +local EXClearingView = import(".EXClearingView") +local TX_GameEvent = import(".GameEvent") + +local Record_Event = import(".RecordEvent") + + +local M = {} + +--- Create a new +function M.new() + setmetatable(M, { __index = BaseView }) + local self = setmetatable({}, { __index = M }) + self.class = "EXMJWitness" + self:init() + + return self +end + +function M:init() + self._gamectr = ControllerManager.GetController(GameController) + self._room = DataManager.CurrenRoom + self._room.Witness = true + UIPackage.AddPackage('base/chat/ui/Chat') + UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang") + self._eventmap = {} + -- self._full = true + self._put_map = false + self._new_hide = false + self._queue = false + self._style = 1 + self:InitView() +end + +function M:InitView(url) + local room = self._room + UIPackage.AddPackage("extend/majiang/lichuan/ui/Extend_MJ_LiChuan") + BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num)) + self:EventInit() + + local _cardbox = self._view:GetChild("cardbox") + --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false + self._ctr_cardbox = _cardbox:GetController("c1") + self._tex_round = self._view:GetChild("tex_round") + self._tex_LeftCard = self._view:GetChild("remaining_card") + self._anchor = self._view:GetChild("mask_tips") +end + +function M:FillRoomData(data) + +end + +function M:EventInit() + -- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong") + MainView.EventInit(self) + local _room = self._room + local _view = self._view + local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard") + local _player_info = self._player_info + local _gamectr = self._gamectr + + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) + local arg = { ... } + print("lingmeng witness SendLaiZi") + end) + + _gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...) + local arg = { ... } + print("lingmeng witness SendGangZi") + end) + + _gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...) + local arg = { ... } + print("lingmeng witness EventBuGang") + end) + + _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) + print("lingmeng witness SendCards") + end) + _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) + print("lingmeng witness EventTurn") + end) + + _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) + print("lingmeng witness OutHint") + end) + + local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" + _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) + print("lingmeng witness OutCard") + end) + _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...) + print("lingmeng witness GetCard") + end) + + _gamectr:AddEventListener(TX_GameEvent.FZTips, function(...) + print("lingmeng witness FZTips") + end) + + _gamectr:AddEventListener(TX_GameEvent.FangziAction, function() + print("lingmeng witness FangziAction") + end) + + _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...) + print("lingmeng witness ZPHuCard") + end) + + _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...) + print("lingmeng witness EventNiao") + end) + + _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) + print("lingmeng witness ZPResult1") + end) + + _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) + print("lingmeng witness ZPResult2") + end) + + _gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function() + print("lingmeng witness EvnetPiaoTip") + end) + + _gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...) + print("lingmeng witness EvnetPiao") + end) + + _gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...) + print("lingmeng witness EventResidueCard") + end) +end + +function M:ShowStep(index) + local step = self._step[index + 1] + self:UpdateLeftCard(step.left_card) + -- self._ctr_cardbox.selectedIndex = step.current_out_seat + self:UpdateCardBox(self:GetPos(step.current_out_seat)) + self:UpdateStep(index + 1) + if step.cmd ~= Record_Event.Evt_OutCard then + self:RemoveCursor() + end + for i = 1, #step.player_card_data do + local p = self._room:GetPlayerBySeat(i) + local info = self._player_card_info[self:GetPos(i)] + p.card_list = step.player_card_data[i].card_list + p.outcard_list = step.player_card_data[i].outcard_list + p.fz_list = step.player_card_data[i].fz_list + p.hand_left_count = #p.card_list + info:Clear() + info:ResetFzList() + p.piao_niao = step.player_card_data[i].piao_niao + local head_info = self._player_info[self:GetPos(i)] + if p.piao_niao and p.piao_niao > 0 then + head_info._view:GetChild("mask_piao").title = "飘分 " .. p.piao_niao + head_info._view:GetController("piao_niao").selectedIndex = 1 + else + head_info._view:GetController("piao_niao").selectedIndex = 0 + end + if step.cmd == Record_Event.Evt_OutCard and i == step.last_out_seat then + local card = p.outcard_list[#p.outcard_list] + info:UpdateOutCardList(nil, nil, self._cursor) + else + info:UpdateOutCardList() + end + if step.cmd == Record_Event.Evt_GetCard and p.seat == step.current_out_seat then + info:UpdateHandCard(true, true) + else + info:UpdateHandCard(false, true) + end + end + if step.cmd == Record_Event.Evt_Win then + self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡") + local info = self._player_card_info[self:GetPos(step.win)] + info._mask_liangpai:AddChild(self._win_pic) + self._win_pic:Center() + else + if self._win_pic then + self._win_pic:Dispose() + end + end + if step.cmd == Record_Event.Evt_Niao then + local niao_list = step.niao + self._niao = UIPackage.CreateObjectFromURL("ui://Extend_MJ_LiChuan/Panel_Birds") + local list = self._niao:GetChild("Lst_birds") + list:RemoveChildrenToPool() + for i = 1, #niao_list do + local item = list:AddItemFromPool() + item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. niao_list[i].card) + if niao_list[i].score > 0 then + item:GetController("bg").selectedIndex = 2 + end + end + self._view:AddChild(self._niao) + self._view:AddChild(self._view:GetChild("panel_record")) + self._niao:Center() + else + if self._niao then + self._niao:Dispose() + end + end + if step.cmd == Record_Event.Evt_Result then + if not self.result then + self.result = EXClearingView.new(self._root_view, true) + self.result:InitData(0, self._room, step.result_data) + self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5 + self.result._view.width = GRoot.inst.width + self.result._view.height = GRoot.inst.height + self.result._view:GetChild("btn_confirm").visible = false + self._anchor:AddChild(self.result._view) + self.result._view.x = self._anchor.x * -1 + self.result._view.y = self._anchor.y * -1 + else + self.result._view.visible = true + end + -- self.result._view:Center() + else + if self.result then + self.result._view.visible = false + end + end +end + +function M:GenerateAllStepData(data) + local cmdList = self.cmdList + self._step = {} + local step = {} + local info = data.info + step.cmd = "" + step.left_card = info.left_card + step.last_out_seat = 0 + step.current_out_seat = 1 + step.win = 0 + step.niao = 0 + + step.player_card_data = {} + for i = 1, #self._room.player_list do + local p = info.playerData[i] + local u = {} + u.seat = p.seat + u.card_list = p.hand_card + u.hand_left_count = #u.card_list + u.fz_list = {} + u.outcard_list = {} + u.piao_niao = p.piao_niao + step.player_card_data[u.seat] = u + end + self._step[#self._step + 1] = step + + for i = 1, #cmdList do + local tem = cmdList[i] + self._cmdmap[tem.cmd](self, tem, i) + end +end + +function M:CmdGetCard(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.current_out_seat = cmd.seat + data.left_card = cmd.data.left_count + local u = data.player_card_data[cmd.seat] + u.card_list[#u.card_list + 1] = cmd.data.card +end + +function M:CmdOutCard(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.last_out_seat = cmd.seat + local u = data.player_card_data[cmd.seat] + list_remove(u.card_list, cmd.data.card) + table.sort(u.card_list, self.HandCardSortAndJing) + u.outcard_list[#u.outcard_list + 1] = cmd.data.card +end + +function M:CmdAction(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.last_out_seat = 0 + data.current_out_seat = cmd.seat + local u = data.player_card_data[cmd.seat] + for i = 1, #cmd.data.opcard do + list_remove(u.card_list, cmd.data.opcard[i]) + end + local fz = {} + fz.type = cmd.data.type + fz.card = cmd.data.card + fz.opcard = cmd.data.opcard + local uf = data.player_card_data[cmd.data.from_seat] + if fz.type ~= FZType.Gang_An and fz.type ~= FZType.Gang_Peng then + table.remove(uf.outcard_list, #uf.outcard_list) + end + if fz.type ~= FZType.Gang_Peng then + u.fz_list[#u.fz_list + 1] = fz + else + for i = 1, #u.fz_list do + if u.fz_list[i].type == FZType.Peng and u.fz_list[i].card == fz.card then + u.fz_list[i].type = FZType.Gang_Peng + end + end + end +end + +function M:CmdWin(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.win = cmd.seat +end + +function M:CmdNiao(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.niao = cmd.data.niao +end + +function M:CmdPiao(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.player_card_data[cmd.seat].piao_niao = cmd.data.num +end + +function M:CmdResult(cmd, index) + local data = self:CopyLastStep(index) + data.cmd = cmd.cmd + data.result_data = cmd.data +end + +function M:CopyLastStep(index) + local step = {} + local last_step = self._step[index] + step = membe_deep_clone(last_step) + self._step[#self._step + 1] = step + step.result_data = nil + return step +end + +function M:UpdateLeftCard(num) + self._tex_LeftCard.text = "剩余 " .. num .. " 张牌" +end + +function M:UpdateCardBox(seat) + local index = seat + local people_num = self._room.room_config.people_num + if people_num == 2 and seat == 2 then + index = 3 + elseif people_num == 3 and seat == 3 then + index = 4 + end + self._ctr_cardbox.selectedIndex = index +end + +function M:UpdateRound(round) + self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局" +end + +function M:UpdateStep(step) + self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" +end + +function M.HandCardSortAndJing(a, b) + local jing = DataManager.CurrenRoom.jing + if a == jing or b == jing then + if a == b then + return a < b + end + return a == jing + else + if a < 200 then + a = a + 1000 + elseif a < 300 then + a = a + 3000 + elseif a < 400 then + a = a + 2000 + else + a = a + 4000 + end + if b < 200 then + b = b + 1000 + elseif b < 300 then + b = b + 3000 + elseif b < 400 then + b = b + 2000 + else + b = b + 4000 + end + return a < b + end +end + +return M diff --git a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua index 489d1059..2e3b6ea2 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua @@ -5,6 +5,7 @@ local EXMainView = import(".EXMainView") local EXGameController = import(".EXGameController") local EXRoomConfig = import(".EXRoomConfig") local EXPlayBackView = import(".EXPlayBackView") +local EXWitnessView = import(".EXWitnessView") local MJRoom = require("main.majiang.MJRoom") local ExtendConfig = {} @@ -20,6 +21,7 @@ function ExtendConfig.new() self._viewMap = {} self._viewMap[ViewManager.View_Main] = EXMainView self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView + self._viewMap[ViewManager.View_Witness] = EXWitnessView return self end @@ -180,6 +182,61 @@ function M:FillPlayBackData(pd_data) room.cmdList = pd_data["cmdList"] end +function M:FillWitnessData(pd_data) + local room = DataManager.CurrenRoom + local _tableInfo = pd_data["tableInfo"] + + local _config = _tableInfo["config"] + room.room_id = _tableInfo.roomid + room.room_config = EXRoomConfig.new(_config) + room.owner_id = _config["ownerid"] + local active_seat = _tableInfo["active_seat"] + local bank_seat = _tableInfo["banker_seat"] + room.left_count = _tableInfo["left_card"] + room.banker_seat = bank_seat + room.curren_turn_seat = active_seat + room.curren_round = _tableInfo["round"] + + local _info_list = _tableInfo["playerData"] + for i = 1, #_info_list do + local _jp = _info_list[i] + local p = room:NewPlayer() + p.seat = _jp["seat"] + local online = _jp["online"] + p.line_state = online + p.ready = _jp["ready"] == 1 and true or false + local pid = _jp["aid"] + p.piao_niao = _jp["piao_niao"] + -- -- print(DataManager.SelfUser.account_id,pid) + -- if (278 == pid) then + -- room.self_player = p + -- p.self_user = DataManager.SelfUser + -- else + if p.seat == 1 then room.self_player = p end + local u = User.new() + u.account_id = pid + p.self_user = u + u.nick_name = _jp["nick"] + u.head_url = _jp["portrait"] + u.sex = _jp["sex"] + -- end + p.self_user.host_ip = p.self_user.host_ip + local _hand_card = _jp["hand_card"] + p.card_list = _hand_card + --room.self_player.card_list = _hand_card + -- table.sort(_hand_card, self.HandCardSortAndJing) + p.total_score = _jp["score"] + -- p.hand_left_count = #_hand_card + -- if _jp.hp_info then + -- room.room_config.isNonnegative = 1 + -- p.cur_hp = _jp.hp_info.cur_hp + -- end + + room:AddPlayer(p) + end + room.cmdList = pd_data["cmdList"] +end + function M.HandCardSortAndJing(a, b) local jing = DataManager.CurrenRoom.jing if a == jing or b == jing then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index b9d25e34..ecac3d92 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -217,9 +217,6 @@ function M:InitView(url) -- self._view:GetChild('Btn_GamePlay').onClick:Set(function() -- ViewUtil.ErrorMsg(self._view, "", "该功能还未开放") -- end) - self._view:GetChild('Btn_Message').onClick:Set(function() - ViewUtil.ErrorMsg(self._view, "", "该功能还未开放") - end) self._view:GetChild('Btn_Invite').onClick:Set(function() ViewUtil.ErrorMsg(self._view, "", "该功能还未开放") end) diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml index 8d851e78..bc837cd8 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml @@ -1,11 +1,12 @@ - + - + + @@ -35,7 +36,7 @@ - + @@ -152,12 +153,12 @@ - + - + - + @@ -191,6 +192,12 @@ + + + + + + diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 528142ab..6fed985f 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -1,6 +1,6 @@ - + @@ -88,7 +88,7 @@ - + @@ -328,16 +328,16 @@ - - - + + + - + 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 af76cdd9..1bef0ac2 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 @@ -43,8 +43,10 @@ - - + + + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml index 1524fa7f..fc64768c 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml @@ -38,8 +38,8 @@ - - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml new file mode 100644 index 00000000..91f86d62 --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 6ef923fb..0995ca5c 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,31 +1,31 @@ - + - + - + - - + + - + - - + + @@ -117,9 +117,9 @@ - + -