diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 64a63868..282f9d1e 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -49,6 +49,7 @@ function M:FG_GroupList(callback) group.groupDiamo = tem.groupDiamo group.messageCount = tem.messageCount group.joins = tem.joins + group.notice = tem.notice l_groups:add(group) end end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index c3b5dbe1..568acc5b 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -41,6 +41,8 @@ Protocol = { WEB_SET_GROUP_INVITATED = "acc/set_group_invitation", ---赠送房卡 WEB_RECHARGE_DIAMO = "acc/recharge_diamo", + ---赠送房卡 + WEB_GET_SERVICES = "acc/get_services", ----index---- -- 获取公告 WEB_UPDATE_NOTICE = "index/get_notice", diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua index c0636a67..1615fca0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua @@ -178,6 +178,7 @@ function FamilyMyFamily:Init() self.tex_playerName = self._view:GetChild("tex_playerName") self.tex_changeTitle = self._view:GetChild("tex_changeTitle") + self.btn_jiesanFamily = self._view:GetChild("btn_jiesanFamily") self.btn_quitFamily = self._view:GetChild("btn_quitFamily") self.btn_playSet = self._view:GetChild("btn_playSet") self.btn_invite = self._view:GetChild("btn_invite") @@ -266,6 +267,10 @@ function FamilyMyFamily:Init() QuitFamily(self) end) + self.btn_jiesanFamily.onClick:Set(function() + QuitFamily(self) + end) + self.btn_quitNotice.onClick:Set(function() self.cWindow.selectedIndex = 0 end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyNotice.lua b/lua_probject/base_project/Game/View/Family/FamilyNotice.lua new file mode 100644 index 00000000..c8c06b99 --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyNotice.lua @@ -0,0 +1,38 @@ +local FamilyNotice = {} + +local M = FamilyNotice + +function M.New(data, callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "FamilyNotice" + self._close_destroy = true + self._close_zone = false + self._data = data + self._callback = callback + self:init("ui://Family/com_FamilyNotice") + return self +end + +function M:init(url) + BaseWindow.init(self, url) + + local group = self._data.group + + self._view:GetChild('text_familyName').text = string.format("%s(%s)", group.name, group.id) + self._view:GetChild('label_detial').text = group.notice +end + +function M.TryShow(data, callback) + local group = data.group + local noticeTime = Utils.LoadLocalFile(string.format("Family_%s_notice_time", group.id)) or 0 + local noticeText = Utils.LoadLocalFile(string.format("Family_%s_notice_text", group.id)) or "" + if tonumber(os.date("%Y%m%d", tonumber(noticeTime))) - tonumber(os.date("%Y%m%d", os.time())) < -1 and group.notice and #group.notice > 0 and noticeText ~= group.notice then + Utils.SaveLocalFile(string.format("Family_%s_notice_time", group.id), os.time()) + Utils.SaveLocalFile(string.format("Family_%s_notice_text", group.id), group.notice) + local my = M.New(data, callback) + my:Show() + end +end + +return M diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 6caf9cde..25148872 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -13,7 +13,6 @@ function FamilyNumberRecord.New(root, page) self.group_id = root._group.id root.familyType.selectedIndex = 0 local comp_numberRecord = UIPackage.CreateObjectFromURL("ui://Family/comp_numberRecord") - root._view:AddChild(comp_numberRecord) --[[ comp_numberRecord.width = root._view.width comp_numberRecord.height = root._view.height @@ -99,7 +98,7 @@ function FamilyNumberRecord.New(root, page) self.PKScore = tonumber(res.Data.pk_score) self.text_score_majiang.text = 0 - self.MJScore self.text_score_poker.text = 0 - self.PKScore - self.ctr_limitDay_isReverting = true + self.ctr_limitDay_isReverting = ctr_limitDay.selectedIndex ~= res_data.dayType - 1 ctr_limitDay.selectedIndex = res_data.dayType - 1 end end) @@ -293,10 +292,11 @@ function FamilyNumberRecord.New(root, page) self.PKScore = tonumber(res.Data.pk_score) self.text_score_majiang.text = 0 - self.MJScore self.text_score_poker.text = 0 - self.PKScore - self.ctr_limitDay_isReverting = true + self.ctr_limitDay_isReverting = ctr_limitDay.selectedIndex ~= res_data.dayType - 1 ctr_limitDay.selectedIndex = res_data.dayType - 1 end end) + root._view:AddChild(comp_numberRecord) return self end diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 85266a7c..d2956254 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -6,6 +6,7 @@ local FamilAllRank = import(".Family.FamilAllRank") local FamilyNumberRecord = import(".Family.FamilyNumberRecord") local FamilyRecord = import(".Family.FamilyRecord") local FamilyMsgDiamond = import(".Family.FamilyMsgDiamond") +local FamilyNotice = import(".Family.FamilyNotice") ---无窗口 local FamilyAllNumbers = import(".Family.FamilyAllNumbers") @@ -279,6 +280,7 @@ function M:Reflash() end local btn = self.list_family:GetChildAt(chooseIndex - 1) btn.onClick:Call() + FamilyNotice.TryShow({ group = DataManager.groups.groupList[chooseIndex] }) else self:JoinFamily(true) self.btn_chatRoom.visible = false diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyGiftDiamond.lua b/lua_probject/base_project/Game/View/Lobby/LobbyGiftDiamond.lua index 00143b05..a0c8c607 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyGiftDiamond.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyGiftDiamond.lua @@ -2,11 +2,13 @@ local LobbyGiftDiamond = {} local M = LobbyGiftDiamond -function M.new() +function M.new(data, callback) setmetatable(M, { __index = BaseWindow }) - local self = setmetatable({}, { __index = M }) - self.class = "LobbyGiftDiamond" + local self = setmetatable({}, { __index = M }) + self.class = "LobbyGiftDiamond" self._close_destroy = true + self._data = data + self._callback = callback self:init("ui://Lobby/GiftDiamond") return self end @@ -21,6 +23,8 @@ function M:init(url) local lobbyCtr = ControllerManager.GetController(LoddyController) lobbyCtr:GiftDiamond({ tagId = tonumber(text_id), diamo = tonumber(text_num) }, function(res) if res.ReturnCode == 0 then + DataManager.SelfUser.diamo = DataManager.SelfUser.diamo - text_num + self._callback() self:Destroy() ViewUtil.ErrorTip(-1, "赠送房卡成功") else diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyService.lua b/lua_probject/base_project/Game/View/Lobby/LobbyService.lua new file mode 100644 index 00000000..01db724c --- /dev/null +++ b/lua_probject/base_project/Game/View/Lobby/LobbyService.lua @@ -0,0 +1,36 @@ +local LobbyService = {} + +local M = LobbyService + +function M.new() + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "LobbyService" + self._close_destroy = true + self:init("ui://Lobby/service") + return self +end + +function M:init(url) + BaseWindow.init(self, url) + + self._listView_main = self._view:GetChild('list') + self._listView_main.itemRenderer = function(index, obj) + local info = self._data_services[index + 1] + obj.text = info.wx + obj:GetChild('text_title').text = string.format("%s：", info.title) + obj:GetChild('btn_copy').onClick:Set(function() + GameApplication.Instance:CopyToClipboard(info.wx) --湘北 + ViewUtil.ErrorTip(-1, "复制成功") + end) + end + + self:GetService() +end + +function M:GetService() + self._data_services = { { title = "游戏客服", wx = "youxikefuweixing" }, { title = "黎川代理", wx = "lichuandaili" } } + self._listView_main.numItems = #self._data_services +end + +return M diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index d5485cc4..f0821b54 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -20,6 +20,8 @@ local PhoneBindView = import(".Lobby.PhoneBindView") local RealAddressView = import(".Lobby.RealAddressView") local LobbyHeadView = import(".Lobby.LobbyHeadView") local LobbyGiftDiamond = import(".Lobby.LobbyGiftDiamond") +local LobbyService = import(".Lobby.LobbyService") + LobbyView = {} @@ -66,9 +68,9 @@ function M:InitView(url) local btn_authenticate = self._view:GetChild("btn_authenticate") btn_authenticate.onClick:Add(handler(self, function() - -- local authenticateView = LobbyAuthenticateView.new() - -- authenticateView:Show() - ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待") + local authenticateView = LobbyAuthenticateView.new() + authenticateView:Show() + -- ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待") end)) local btn_notice = self._view:GetChild("btn_notice") @@ -152,20 +154,13 @@ function M:InitView(url) local btn_diamo = self._view:GetChild("btn_diamo") btn_diamo.onClick:Add(function() - if DataManager.SelfUser.type == 1 then - local lobbyGiftDiamond = LobbyGiftDiamond.new() - lobbyGiftDiamond:Show() - end + end) local btn_customerService = self._view:GetChild("btn_customerService") btn_customerService.onClick:Add(function() - ViewUtil.ShowModalWait2(self._root_view, 0.01) - coroutine.start(function() - coroutine.wait(3) - ViewUtil.CloseModalWait2() - ViewUtil.ErrorTip(-1, "微信跳转失败") - end) + local lobbyService = LobbyService.new() + lobbyService:Show() end) local btn_invite = self._view:GetChild("btn_invite") @@ -342,6 +337,17 @@ function M:InitView(url) self._message = message:GetChild("message") self._tex_message = message:GetChild("text") self:__GetMessage() + + local btn_giftDiamond = self._view:GetChild('btn_giftDiamond') + if btn_giftDiamond then + btn_giftDiamond.visible = DataManager.SelfUser.type == 1 + btn_giftDiamond.onClick:Set(function() + local lobbyGiftDiamond = LobbyGiftDiamond.new(nil, function() + view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo) + end) + lobbyGiftDiamond:Show() + end) + end end function M:OnJoinRoomAction(context) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 045e616f..52c8bb1b 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -525,6 +525,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else + self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 3e2f3cc2..7cf7677a 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -527,6 +527,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else + self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 861dc81c..360aa05d 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -526,6 +526,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else + self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 51d12b6a..b4101faf 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -526,6 +526,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else + self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua index ded1ac52..f59647d2 100644 --- a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua +++ b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua @@ -186,6 +186,8 @@ function M:CheckCards() return end + print("lingmeng self.lastMinCard", self.lastMinCard) + print("lingmengCheckAloneOrLong") if self:CheckAloneOrLong() then return true @@ -196,8 +198,18 @@ function M:CheckCards() return true end print("lingmengCheckSanDai") - if self:CheckSanDai() then + if self._flag_fristCard then + return true + end + local a, b, c = self:CheckSanDai() + self.type = a + if b then + self.specilCard = b + end + if c then + return c > (self.lastMinCard or 0) + end return true end print("lingmengCheckZha") diff --git a/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua b/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua index 780105ed..4b993274 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua @@ -329,6 +329,7 @@ function M:EventInit() -- end -- end self._leftClock_continue = coroutine.start(function() + coroutine.wait(0.02) card_info:SetOutCardInfo(nil, false) for i = 1, #self._player_card_info do local card_info = self._player_card_info[i] diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua index 261b83d1..10b4aeac 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -53,6 +53,7 @@ function M:RegisterEvt() self._eventmap[RunFast_Protocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard self._eventmap[RunFast_Protocol.RunFast_Bomb_Score_New] = self.OnBompScoreNew + self._eventmap[RunFast_Protocol.RunFast_CheckCard_Succ] = self.OnCheckCard end -- function M:Oener(evt_data) @@ -133,6 +134,19 @@ function M:SendCard(cards, currentCard) _client:send(RunFast_Protocol.RunFast_Send_Card, _data) end +function M:SendCheckCard() + local _data = {} + local _client = ControllerManager.GameNetClinet + _client:send(RunFast_Protocol.RunFast_CheckCard, _data) +end + +function M:SendCheckCardSend(data) + local _data = {} + _data = data + local _client = ControllerManager.GameNetClinet + _client:send(RunFast_Protocol.RunFast_CheckCard_Send, _data) +end + function M:SendPiao(piao) local _data = {} _data["id"] = piao @@ -716,13 +730,19 @@ function M:OnBompScoreNew(evt_data) for i = 1, #scoreList do local score = scoreList[i].pomSore local player = self._room:GetPlayerBySeat(scoreList[i].seat) - print("lingmeng log20011", player.total_score) player.total_score = player.total_score + score - print("lingmeng log20012", player.total_score) end DispatchEvent(self._dispatcher, RunFast_GameEvent.OnBompScoreNew, scoreList) end ) end +function M:OnCheckCard(evt_data) + self._cacheEvent:Enqueue( + function() + DispatchEvent(self._dispatcher, RunFast_GameEvent.OnCheckCard, evt_data) + end + ) +end + return M diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua index 492aa41a..1023076b 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua @@ -19,6 +19,7 @@ local RunFast_GameEvent = { Game_TuoGuan = "Game_TuoGuan", EventXiPai = "EventXiPai", OnPassSuccCheckCard = "OnPassSuccCheckCard", - OnBompScoreNew = "OnBompScoreNew" + OnBompScoreNew = "OnBompScoreNew", + OnCheckCard = "OnCheckCard" } return RunFast_GameEvent 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 9ecd631f..7a348c93 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -113,6 +113,13 @@ function M:InitView(url) self._view:GetChild("roominfo_panel1"):GetChild("tex_beishu").text = "" end + self._view_click = self._view:GetChild('click') + if self._view_click then + self._view_click.onClick:Set(function() + self._gamectr:SendCheckCard() + end) + end + self.ctr_state = self._view:GetController("state") self._ctr_action = self._view:GetController("action") -- self._tex_leftTime = self._view:GetChild("time"):GetChild("title") @@ -587,6 +594,7 @@ function M:EventInit() -- end -- end self._leftClock_continue = coroutine.start(function() + coroutine.wait(0.02) card_info:SetOutCardInfo(nil, false) for i = 1, #self._player_card_info do local card_info = self._player_card_info[i] @@ -704,7 +712,45 @@ function M:EventInit() end) end end) - + _gamectr:AddEventListener(RunFast_GameEvent.OnCheckCard, function(...) + local arg = { ... } + local evt_data = arg[1] + local list = self._view:GetChild('comp_checkCard'):GetChild('list') + list:RemoveChildrenToPool() + for k, v in pairs(evt_data) do + local obj = list:AddItemFromPool() + table.sort(v, function(a, b) + if a % 100 == b % 100 then + return math.floor(a / 100) > math.floor(b / 100) + else + return a % 100 > b % 100 + end + end) + local titleText = "" + if k == "first" then + titleText = "手牌1：" + elseif k == "second" then + titleText = "手牌2：" + elseif k == "three" then + titleText = "手牌3：" + end + obj.text = titleText + obj:GetChild('click').onClick:Set(function() + evt_data.choic = k + self._gamectr:SendCheckCardSend(evt_data) + self._view:GetController('check').selectedIndex = 0 + end) + obj:GetChild('List_Out').itemRenderer = function(index, obj) + local code = v[index + 1] + if code % 100 == 15 then + code = math.floor(code / 100) * 100 + 2 + end + obj:GetChild('icon').url = string.format("ui://Main_Poker/%s", code) + end + obj:GetChild('List_Out').numItems = #v + end + self._view:GetController('check').selectedIndex = 1 + end) _gamectr:AddEventListener(RunFast_GameEvent.OnPassSuccCheckCard, function(...) self._popEvent = false @@ -979,7 +1025,7 @@ function M:EventInit() if player.seat ~= win_seat then card_info.ctr_outpoker.selectedIndex = 0 end - if player.seat ~= self._room.self_player.seat then + if win_seat == self._room.self_player.seat and player.seat ~= self._room.self_player.seat then local oneTime = 7 / 60 -- card_info:UpdateHandPoker(player.cards, false, true) @@ -1032,20 +1078,6 @@ function M:EventInit() btn_confirm.onClick:Call() end ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - -- local _actionView = UIPackage.CreateObject("Common", "Btn_Yellow") - -- _actionView.icon = "ui://Common/btn_comfirm" - -- _actionView.onClick:Set(function () - -- --local _gamectr = ControllerManager.GetController(GameController) - -- _gamectr:ConformToNextGame() - -- _actionView:Dispose() - -- end) - -- _actionView.xy = Vector2(900, 625) - -- self._view:AddChild(_actionView) - -- else - -- coroutine.wait(4) - -- self.result_view = RunFast_ResultView.new(self._root_view,info,self._room.room_id) - -- self.result_view:Show() - -- end end) if over == 1 then -- body diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index bf32e463..098300f0 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -831,6 +831,7 @@ function M:UpdateHandCardsColor() self:SetBtnCardColor(card_view, 0) else card_view.btn_card.touchable = false + card_view.btn_card.selected = false self:SetBtnCardColor(card_view, 1) end if card_view.btn_card.selected and card_view.btn_card.touchable then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua index a53a681a..6a92dbad 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua @@ -39,6 +39,10 @@ local RunFast_Protocol = { GAME_EVENT_XIPAI = "20837", GAME_EVENT_NOTIFY_XIPAI = "20838", GAME_EVT_CARDINHAND = "202022", + + RunFast_CheckCard = "8881", + RunFast_CheckCard_Succ = "8882", + RunFast_CheckCard_Send = "888" } return RunFast_Protocol diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml index ac9b4a8f..9cb4964c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml @@ -1,9 +1,9 @@ - + - + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/checkthiscard.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/checkthiscard.png new file mode 100644 index 00000000..ffdce763 Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/checkthiscard.png differ diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCard.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCard.xml new file mode 100644 index 00000000..2dde1e0d --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCard.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCardOne.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCardOne.xml new file mode 100644 index 00000000..251e9897 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCardOne.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + +