From 860b396fd6e83fa9e88940f03d6c35f0bfff6e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Sat, 8 Nov 2025 22:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Lobby/LobbyShopView.lua | 16 +++-- .../NewGroup/MngView/GroupMngRoomStatView.lua | 62 ++++++++++-------- .../main_project/main/majiang/MJMainView.lua | 12 ++-- .../base/base_script/asset_pack1.0.7.bytes | Bin 1904213 -> 1904387 bytes 4 files changed, 48 insertions(+), 42 deletions(-) diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua index cb9e7ca4..aa914433 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua @@ -56,14 +56,16 @@ function M:init(url) -- print(DataManager.SelfUser.diamo) -- self.UpdateDiamo() --暂时用这个发送协议 - local uid = DataManager.SelfUser.account_id - fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index + 1].num, function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "重置房卡失败") - else + -- local uid = DataManager.SelfUser.account_id + -- fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index + 1].num, function(res) + -- if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, "重置房卡失败") + -- else - end - end) + -- end + -- end) + local pay_url = "https://ttfenfa.com/" + UnityEngine.Application.OpenURL(pay_url) end end) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua index afa28ada..dee5184d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua @@ -1,3 +1,4 @@ +local TimeSettingPanel = import(".TimeSettingPanel") -- 开桌统计 local GroupMngRoomStatView = {} @@ -30,6 +31,10 @@ function M:InitView() self.player_record_data = {} --指定玩家的回放数据 self.qid = 0 --查询玩家id + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0) + self.begin_time, self.end_time = self.time_panel:GetDate() + self.lst_record_find = self._view:GetChild("lst_record_find") self.lst_record_find:SetVirtual() self.lst_record_find.itemRenderer = function(index, obj) @@ -82,35 +87,36 @@ function M:GetRecordData(index, qid) qid = qid or 0 ViewUtil.ShowModalWait2() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetGroupRecord(self.group_id, GetPlatform(), qid, index, 6, function(res) - printlog("ccccccccccccccccccccccccccccccccccccc") - pt(res) - if self._is_destroy then - return - end - ViewUtil.CloseModalWait2() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") - else - local ctr_search = self._view:GetController("search") - local records = res.Data.records - if qid == 0 then - for i = 1, #records do - self.record_data[#self.record_data + 1] = records[i] - end - self.lst_record.numItems = #self.record_data - if ctr_search.selectedIndex ~= 0 then - ctr_search.selectedIndex = 0 - end - else - for i = 1, #records do - self.player_record_data[#self.player_record_data + 1] = records[i] - end - self.lst_player_record.numItems = #self.player_record_data - ctr_search.selectedIndex = 2 + fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), qid, 0, index, 6, self.begin_time, self.end_time, 0, + function(res) + printlog("ccccccccccccccccccccccccccccccccccccc") + pt(res) + if self._is_destroy then + return end - end - end) + ViewUtil.CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") + else + local ctr_search = self._view:GetController("search") + local records = res.Data.records + if qid == 0 then + for i = 1, #records do + self.record_data[#self.record_data + 1] = records[i] + end + self.lst_record.numItems = #self.record_data + if ctr_search.selectedIndex ~= 0 then + ctr_search.selectedIndex = 0 + end + else + for i = 1, #records do + self.player_record_data[#self.player_record_data + 1] = records[i] + end + self.lst_player_record.numItems = #self.player_record_data + ctr_search.selectedIndex = 2 + end + end + end) end function M:FillRecordItem(data, obj) diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index a86b3b0b..3eefe863 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -687,10 +687,8 @@ function M:GetPrefix() end -- 所有对家显示手牌 -function M:ShowHand(msg) - local data = msg[1] - - for _, player in pairs(data.info_list) do +function M:ShowHand(info_list) + for _, player in pairs(info_list) do local infoView = self._player_card_info[self:GetPos(player.seat)] if infoView.class ~= "PlayerSelfCardInfoView" then @@ -709,7 +707,7 @@ function M:OnResult1(...) self:UpdateCardBox(0) self._ctr_cardbox.selectedIndex = 0 local arg = { ... } - self:ShowHand(arg) + -- self:ShowHand(arg) local result = arg[1] local liuju = result.liuju local data = result.info_list @@ -790,10 +788,10 @@ function M:OnHuCard(...) local index = self:GetPos(win_seat) local info = self._player_card_info[index] local player = self._room:GetPlayerBySeat(win_seat) - -- self:RemoveCursor() - --info:UpdateHandCard(false, false) + self._player_card_info[1]._ctr_tip.selectedIndex = 0 self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0 + self:ShowHand(scoreData) info:ShowHuCard(win_card, index == 1) self.cHuCardEffect.selectedIndex = 1 diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes index d0cf2be644c48c1df37bdf703857911485d11f6e..45b9ca8246a1674ae1ab51a7a146bdab6dc63270 100644 GIT binary patch delta 4944 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 XE)H%Ec^vXNcsO`-{?`iX|Lgw&kJOCt delta 4737 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