diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index d4d30d5e..11a817fe 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -15,7 +15,7 @@ end local _LocalConfigAllGame = { -- 10, 33, -- 90, - -- 22, + 22, 55, 66,90 ,91,93 diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 475ff1de..e5da4b4e 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1799,3 +1799,24 @@ function M:FG_Get_Diamond_Msg(groupId, callback) callback(res) end) end + +-- 战绩记录 +function M:FG_GetGroupRecordsNoRead(group_id,callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + _client:send(Protocol.WEB_FG_GET_RECORDS_NOREAD, data, function(res) + callback(res) + end) +end + +-- 确认战绩记录 +function M:FG_GetGroupRecordsConfrimRead(group_id,military,callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.military = military + _client:send(Protocol.WEB_FG_GET_CONFRIM_READ, data, function(res) + callback(res) + end) +end \ No newline at end of file diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index f24376ba..c2ae0f6c 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -390,6 +390,10 @@ Protocol = { WEB_FG_GET_PLAYER_DAILY_COUNT = "group/log/get_hpconsume_count", -- 体力值日志牌局明细 WEB_FG_HPLOG_DETAIL_INFO = "group/log/get_hplog_detail_info", + -- 获取所有未处理账单 + WEB_FG_GET_RECORDS_NOREAD = "group/log/get_records_noread", + -- 确认处理处理账单 + WEB_FG_GET_CONFRIM_READ = "group/log/group_confirm_read", ------------- group-room ------------ -- 圈子匹配房间 WEB_FG_MATCH_ROOM = "group/room/match_room", diff --git a/lua_probject/base_project/Game/View/FamilyViewZuo.lua b/lua_probject/base_project/Game/View/FamilyViewZuo.lua index 92eccdda..e50c9b1f 100644 --- a/lua_probject/base_project/Game/View/FamilyViewZuo.lua +++ b/lua_probject/base_project/Game/View/FamilyViewZuo.lua @@ -4,6 +4,9 @@ local FamilyManagerView = import(".FamilyZuo.FamilyManagerView") local FamilyPlayListView = import(".FamilyZuo.FamilyPlayListView") local FamilyRoomCardView = import(".FamilyZuo.FamilyRoomCardView") local FamilyEventView = import(".FamilyZuo.FamilyEventView") +local FamilyPayRecordView = import(".FamilyZuo.FamilyPayRecordView") + +local FamilyRecord = import(".Family.FamilyRecord") FamilyViewZuo = {} @@ -90,6 +93,25 @@ function M:init(url) view:GetChild('btn_chongFangka').onClick:Set(function() FamilyRoomCardView.new({}) end) + + --战绩页面 + view:GetChild('btn_record').onClick:Set(function() + FamilyManagerView.new({ pageType = 3 }) + end) + + --展示用于显示未支付账单 + view:GetChild('btn_showPay').onClick:Set(function() + FamilyPayRecordView.new({}) + end) + + --临时展示旧页面 + view:GetChild('btn_temp').onClick:Set(function() + if not self._ViewChild_Record or not self._ViewChild_Record.ShouRanks then + self._ViewChild_Record = FamilyRecord.New(self, DataManager.CurrenGroup.id) + return + end + self._ViewChild_Record:ShouRanks() + end) end --列表渲染类函数-- diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua index 45f5a279..6069860e 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua @@ -13,6 +13,7 @@ local ManagerMenberChild_DisInviteView = import(".ManagerMenberChild_DisInviteVi local ManagerMenberChild_DisSameDeskView = import(".ManagerMenberChild_DisSameDeskView") --战绩 local ManagerRecordChild_BattleStatsView = import(".ManagerRecordChild_BattleStatsView") +local ManagerRecordChild_LeaderboardView = import(".ManagerRecordChild_LeaderboardView") local FamilyManagerTable = {} @@ -34,6 +35,7 @@ M.ManagerTable = { { id = 11, title = "禁止Ta进房", view = ManagerMenberChild_DisSameDeskView }, --战绩页面 { id = 12, title = "战绩统计", view = ManagerRecordChild_BattleStatsView }, + { id = 13, title = "战绩统计", view = ManagerRecordChild_LeaderboardView }, } M.ManagerShow = { @@ -49,7 +51,7 @@ M.ManagerMenberShow = { } M.ManagerRecordShow = { - { 12 }, --群主 + { 12,13 }, --群主 {}, --代理 {} --用户 } @@ -57,7 +59,7 @@ M.ManagerRecordShow = { M.ManagerManger = { {id=1,url="ui://Family/FamilyManager",table = M.ManagerShow}, {id=2,url="ui://Family/FamilyManagerMenber",table = M.ManagerMenberShow}, - {id=3,url="ui://Family/FamilyManagerRecord",table = M.ManagerManger}, + {id=3,url="ui://Family/FamilyManagerRecord",table = M.ManagerRecordShow}, } return M diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyPayRecordView.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyPayRecordView.lua new file mode 100644 index 00000000..95c854f4 --- /dev/null +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyPayRecordView.lua @@ -0,0 +1,123 @@ +local FamilyPayRecordView = {} + +local M = FamilyPayRecordView + +function FamilyPayRecordView.new(data, callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "FamilyPayRecordView" + self._data = data + self._callback = callback + self._close_destroy = true + self._full = true + self._full_offset = false + self:init("ui://Family/FamilyPayRecord") + return self +end + +function M:init(url) + getmetatable(M).__index.init(self, url) + + local view = self._view + self._viewList_menber = view:GetChild('list_menber') + self._viewList_menber:SetVirtual() + self._viewList_menber.itemRenderer = handler(self, self.MenberRenderer) + + self:FillData() +end + +function M:FillData() + local textList = { "未处理" } + local list = self._view:GetChild('list_left') + for i = 1, list.numItems do + local obj = list:GetChildAt(i - 1) + obj:GetChild('text_down').text = textList[i] + obj:GetChild('text_up').text = textList[i] + end + + self:GetRecords() + self:Show() +end + +function M:MenberRenderer(index, obj) + local info = self.records[index + 1] + obj:GetChild('text_gameName').text = info.game_info.name + obj:GetChild('text_playName').text = info.pname + obj:GetChild('text_time').text = os.date("%Y-%m-%d\n%H:%M", tonumber(info.create_time)) + obj:GetChild('btn_assent').onClick:Set(function() + self:SendRead(info.military_id) + end) + if info[string.format("is_read_%s", DataManager.SelfUser.account_id)] and info[string.format("is_read_%s", DataManager.SelfUser.account_id)] == '0' then + obj:GetController('isShow').selectedIndex = 1 + end + if type(info.totalScore) == "string" then + info.totalScore = json.decode(info.totalScore) + end + local list = obj:GetChild('list') + list:RemoveChildrenToPool() + list.itemRenderer = function(index1, obj1) + local info1 = info.totalScore[index1 + 1] + obj1:GetChild('text_name').text = info1.nick + obj1:GetChild('text_score').text = info1.score >= 0 and string.format("+%s", info1.score) or info1.score + obj1:GetController('colour').selectedIndex = info1.score >= 0 and 1 or 0 + ImageLoad.Load(info1.portrait, obj1:GetChild('btn_head')._iconObject) + if info1.accId == DataManager.SelfUser.account_id then + obj:GetChild('btn_assent').text = info1.score >= 0 and "确认收款" or "确认付款" + end + end + list.numItems = #info.totalScore +end + +function M:GetRecords() + ViewUtil.ShowModalWait2() + local fgCtr = ControllerManager.GetController(NewGroupController) + + fgCtr:FG_GetGroupRecordsNoRead(DataManager.CurrenGroup.id, + function(res) + ViewUtil.CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "查看为处理战绩失败，请联系管理人员") + return + else + self.records = res.Data.records + self._viewList_menber.numItems = #self.records + end + end) +end + +function M:SendRead(id) + ViewUtil.ShowModalWait2() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetGroupRecordsConfrimRead(DataManager.CurrenGroup.id, id, + function(res) + ViewUtil.CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置失败") + return + else + for i, v in ipairs(self.records) do + if v.military_id == id then + table.remove(self.records, i) + self._viewList_menber.numItems = #self.records + end + end + end + end) +end + +-- 打开窗口 +function M:Show() + getmetatable(M).__index.Show(self) +end + +-- 关闭窗口 +function M:Close() + getmetatable(M).__index.Close(self) +end + +-- 销毁窗口 +function M:Destroy() + getmetatable(M).__index.Destroy(self) +end + +return M diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyPlayListView copy.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyPlayListView copy.lua index 5e347279..e26c3ef0 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyPlayListView copy.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyPlayListView copy.lua @@ -2,7 +2,7 @@ local FamilyPlayListView = {} local M = FamilyPlayListView -function FamilyPlayListView.new(data,callback) +function FamilyPlayListView.new(data, callback) setmetatable(M, { __index = BaseWindow }) local self = setmetatable({}, { __index = M }) self.class = "FamilyPlayListView" @@ -14,13 +14,15 @@ function FamilyPlayListView.new(data,callback) end function M:init(url) - getmetatable(M).__index.init(self,url) + getmetatable(M).__index.init(self, url) local view = self._view + + self:FillData() end function M:FillData() - + self:Show() end -- 打开窗口 diff --git a/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_GamePlayView.lua b/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_GamePlayView.lua index 0802b138..6a355222 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_GamePlayView.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_GamePlayView.lua @@ -25,6 +25,7 @@ function M:init(url) local group = DataManager.CurrenGroup self._view = view view:GetChild('list_gameName').itemRenderer = handler(self, self.GamePlayRenderer) + view:GetChild('list_gameName'):SetVirtual() view:GetChild('list_gameName').onClickItem:Set(handler(self, self.GamePlayClick)) view:GetChild('btn_addPlay').onClick:Set(function() FamilyGamePlay.new({},handler(self,self.FillData)) diff --git a/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_LeaderboardView.lua b/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_LeaderboardView.lua new file mode 100644 index 00000000..22fc3d79 --- /dev/null +++ b/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_LeaderboardView.lua @@ -0,0 +1,45 @@ +local ManagerRecordChild_LeaderboardView = {} + +local M = ManagerRecordChild_LeaderboardView + +function ManagerRecordChild_LeaderboardView.new(data, callback) + local self = setmetatable({}, { __index = M }) + self.class = "ManagerRecordChild_LeaderboardView" + self._data = data or {} + self._callback = callback + self:init("ui://Family/ManagerRecordChild_Leaderboard") + return self +end + +function M:init(url) + local root = self._data.root + if not root then + ViewUtil:ErrorTip("点击太快，请重新打开页面") + return + end + local page = root._view:GetChild('page') + ViewUtil.LoadPage(page, url, function(view) + self._view = view + end) +end + +function M:FillData() + +end + +-- 打开窗口 +function M:Show() + getmetatable(M).__index.Show(self) +end + +-- 关闭窗口 +function M:Close() + getmetatable(M).__index.Close(self) +end + +-- 销毁窗口 +function M:Destroy() + getmetatable(M).__index.Destroy(self) +end + +return M diff --git a/lua_probject/extend_project/extend/poker/duoduo/EXGameController.lua b/lua_probject/extend_project/extend/poker/duoduo/EXGameController.lua index f4fbc201..138c44d1 100644 --- a/lua_probject/extend_project/extend/poker/duoduo/EXGameController.lua +++ b/lua_probject/extend_project/extend/poker/duoduo/EXGameController.lua @@ -264,11 +264,26 @@ function M:OnPassSucc(evt_data) local seat = evt_data["seat"] self._cacheEvent:Enqueue( function() - print("lingmeng OnPassSucc", seat) local p = self._room:GetPlayerBySeat(seat) p.out_card_list = { 0 } - DispatchEvent(self._dispatcher, EXGameEvent.OnPassSucc, p) - print("lingmeng OnPassSuccend", seat) + local otherPlayer = {} + for i = 1, 4 do + local oseat = seat+i + if oseat > 4 then + oseat = oseat - 4 + end + local op = self._room:GetPlayerBySeat(oseat) + if op.ranking == 0 then + break + end + if not self:GetIsPass(op.out_card_list) then + op.out_card_list = { 0 } + table.insert(otherPlayer,op) + end + end + + + DispatchEvent(self._dispatcher, EXGameEvent.OnPassSucc, p,otherPlayer) end ) end @@ -757,6 +772,8 @@ end function M:OnShowRank(evt_data) self._cacheEvent:Enqueue( function() + local p = self._room:GetPlayerBySeat(evt_data.player) + p.ranking = evt_data.ranking DispatchEvent(self._dispatcher, EXGameEvent.OnShowRank, evt_data) end ) diff --git a/lua_probject/extend_project/extend/poker/duoduo/EXMainView.lua b/lua_probject/extend_project/extend/poker/duoduo/EXMainView.lua index 15b50a8c..498ddf13 100644 --- a/lua_probject/extend_project/extend/poker/duoduo/EXMainView.lua +++ b/lua_probject/extend_project/extend/poker/duoduo/EXMainView.lua @@ -464,7 +464,7 @@ function M:EventInit() local round = arg[1] local cardlist = arg[2] self._popEvent = false - + self._view:GetChild('text_baseScore').text = 0 if self.destory_win ~= nil then coroutine.stop(self.destory_win) end @@ -554,31 +554,12 @@ function M:EventInit() _gamectr:AddEventListener(EXGameEvent.OnIndexMove, function(...) local arg = { ... } local seat = arg[1] - local isNewBout = arg[2] + local removeRankOut = arg[2] local index = self:GetPos(seat) - self.ctr_time.selectedIndex = index - -- for i = 1, #self._player_info do - -- if index == i then - -- -- body - -- local head_info = self._player_info[index] - -- head_info:MarkBank(true) - -- else - -- local head_info = self._player_info[i] - -- head_info:MarkBank(false) - -- end - -- end - - -- if index == 1 then local card_info = self._player_card_info[index] - -- if self.MypokerList ~= nil then - -- -- body - -- card_info:Clear() - -- card_info:InitPoker(self.MypokerList, false) - -- self.MypokerList = nil - -- end - -- end + self._leftClock_continue = coroutine.start(function() coroutine.wait(0.02) card_info:SetOutCardInfo(nil, false) @@ -726,6 +707,12 @@ function M:EventInit() self._popEvent = false local arg = { ... } local p = arg[1] + local ops = arg[2] + + for i, v in ipairs(ops) do + local card_info = self._player_card_info[self:GetPos(v.seat)] + card_info:SetOutCardInfo(nil, false) + end self.ctr_time.selectedIndex = 0 local card_info = self._player_card_info[self:GetPos(p.seat)] @@ -1147,6 +1134,7 @@ function M:EventInit() local data = arg[1] local index = self:GetPos(data.player) local head_info = self._player_info[index] + local card_info = self._player_card_info[index] head_info._ctr_rank.selectedIndex = data.ranking end ) diff --git a/lua_probject/extend_project/extend/poker/duoduo/EXPlayer.lua b/lua_probject/extend_project/extend/poker/duoduo/EXPlayer.lua index 19d812c6..85d14ef2 100644 --- a/lua_probject/extend_project/extend/poker/duoduo/EXPlayer.lua +++ b/lua_probject/extend_project/extend/poker/duoduo/EXPlayer.lua @@ -8,6 +8,7 @@ local EXPlayer = { out_card_list = {}, hand_list = {}, isOneCard= false, -- 报单 + ranking = 0, } local M = EXPlayer @@ -20,6 +21,7 @@ function M.new() self.out_card_list = {} self.hand_list = {} self.isOneCard = false + self.ranking = 0 return self end @@ -30,6 +32,7 @@ function M:Clear() self.out_card_list = {} self.hand_list = {} self.isOneCard = false + self.ranking = 0 end return M \ No newline at end of file diff --git a/lua_probject/extend_project/extend/poker/duoduo/EXPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/duoduo/EXPlayerSelfPokerInfoView.lua index c1fb4906..046f293d 100644 --- a/lua_probject/extend_project/extend/poker/duoduo/EXPlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/duoduo/EXPlayerSelfPokerInfoView.lua @@ -600,6 +600,15 @@ function M:DeleteHandCards(cardlist) if tmpNum then if tmpNum == 1 then self.newCard_list[cardlist[i] % 100][math.floor(cardlist[i] / 100)] = nil + local allNot = true + for k = 1, 4 do + if self.newCard_list[cardlist[i] % 100][k] then + allNot = false + end + end + if allNot then + self.newCard_list[cardlist[i] % 100] = nil + end else self.newCard_list[cardlist[i] % 100][math.floor(cardlist[i] / 100)] = tmpNum - 1 end @@ -607,11 +616,11 @@ function M:DeleteHandCards(cardlist) ViewUtil:ErrorTip("牌型出错，重新加载页面") ViewManager.refreshGameView() end - if i == #cardlist then - if #self.newCard_list[cardlist[i] % 100] == 0 then - self.newCard_list[cardlist[i] % 100] = nil - end - end + -- if i == #cardlist then + -- if #self.newCard_list[cardlist[i] % 100] == 0 then + -- self.newCard_list[cardlist[i] % 100] = nil + -- end + -- end end self:UpdateHandCardsPos() end @@ -645,6 +654,7 @@ function M:UpdateHandCardsPos() btn_card.data = card_view tmpHeight = tmpHeight + 1 self:AddCardTouchEvent(card_view) + self:SetBtnCardColor(card_view, 0) end end local index = ViewUtil.BinarySearch(sortTable, allCardNum, 1) @@ -654,12 +664,15 @@ function M:UpdateHandCardsPos() maxHeight = tmpHeight end end - if #self.newCard_list > 0 then - self._view:GetChild('btn_back').y = math.min(self._view_handCard.height - - (self.scaleH + (self.scaleH + self.linegap) * (maxHeight - 1)) - 30, 100) - self._view_Out.y = math.min(self._view_handCard.height - - (self.scaleH + (self.scaleH + self.linegap) * (maxHeight - 1)) - self._view_Out.height + self.scaleH * 0.3, - 50) + if maxHeight > 0 then + local setHeight = 466 + local tmpHeight = self._view_handCard.height-(self.scaleH + self.linegap)*(maxHeight) - self._view_Out.height -30 + if tmpHeight < setHeight then + setHeight = tmpHeight + end + self._view:GetChild('btn_back').y = setHeight + self._view_Out.height - self._view:GetChild('btn_back').height + + self._view_Out.y = setHeight end end diff --git a/lua_probject/extend_project/extend/poker/duoduo/EXResultView.lua b/lua_probject/extend_project/extend/poker/duoduo/EXResultView.lua index ee331543..691e8403 100644 --- a/lua_probject/extend_project/extend/poker/duoduo/EXResultView.lua +++ b/lua_probject/extend_project/extend/poker/duoduo/EXResultView.lua @@ -80,7 +80,7 @@ function M:init(url, data, over, win_seat) if not b.ranking or b.ranking == 0 then b.ranking = 4 end - return (a.ranking or 4) > (b.ranking or 4) + return a.ranking < b.ranking end) over0List.itemRenderer = function(index, obj) local info = data[index + 1] diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua b/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua index 60de2689..d35de8a7 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua @@ -25,6 +25,6 @@ local EXGameEvent = { OnShowDipais = "OnShowDipais", OnGetZhu = "OnGetZhu", OnNewBout = "OnNewBout", - OnGetScore = "OnNewBout", + OnGetScore = "OnGetScore", } return EXGameEvent diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua b/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua index 8a050b27..117b77aa 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua @@ -1225,8 +1225,8 @@ function M:EventInit() local arg = { ... } local data = arg[1] - self._room.yufen = self._room.yufen - data.score - self._room.getfen = self._room.getfen + data.score + self._room.yufen = 200 + (data.overageScore or 0) + self._room.getfen = data.score or 0 self._viewText_get.text = self._room.getfen self._viewText_yu.text = self._room.yufen end) diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua index 5e5266c4..4c35cbfe 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua @@ -739,7 +739,7 @@ function M:DeleteHandCards(cardlist) local card_code_number = cardlist[i] for j = 1, #self.card_list do local card = self.card_list[j] - if card_code_number == card.card_code_number or card_code_number == card.card_code_flower then + if card_code_number == card.card_code_number then list_remove(self.card_list, card) self._view_handCard:RemoveChild(card.btn_card, true) break @@ -909,10 +909,12 @@ function M:BtnEvent() self._btn_maipai_Sned.onClick:Set(function() local send_card = {} + local del_card = {} for i = 1, #self.card_list do local card = self.card_list[i] if card.btn_card.selected then send_card[#send_card + 1] = card.card_code_flower + del_card[#del_card + 1] = card.card_code_number end end @@ -920,7 +922,7 @@ function M:BtnEvent() self:ErrorTip('请选择要出的牌') else self.gameCtr:SenMaipai(send_card) - self:DeleteHandCards(send_card) + self:DeleteHandCards(del_card) self._ctr_maipai.selectedIndex = 0 self._cardList_di = nil end diff --git a/wb_new_ui/assets/Extend_Poker_DuoDuo/EXMain_New_4.xml b/wb_new_ui/assets/Extend_Poker_DuoDuo/EXMain_New_4.xml index 08ed5d65..896f469c 100644 --- a/wb_new_ui/assets/Extend_Poker_DuoDuo/EXMain_New_4.xml +++ b/wb_new_ui/assets/Extend_Poker_DuoDuo/EXMain_New_4.xml @@ -1,8 +1,8 @@ - + - + @@ -32,20 +32,20 @@ - - + + - + - + - + - + @@ -71,44 +71,44 @@ - + - + - + - + - + - - + + - + - + - + - + diff --git a/wb_new_ui/assets/Extend_Poker_DuoDuo/Main_New/Component/Btn_ListOneCard.xml b/wb_new_ui/assets/Extend_Poker_DuoDuo/Main_New/Component/Btn_ListOneCard.xml index dad60d23..3e20a1bd 100644 --- a/wb_new_ui/assets/Extend_Poker_DuoDuo/Main_New/Component/Btn_ListOneCard.xml +++ b/wb_new_ui/assets/Extend_Poker_DuoDuo/Main_New/Component/Btn_ListOneCard.xml @@ -1,14 +1,10 @@ - + - + - - - -