From 0c90268eb7b8047987c2fd5913ce96c351cd1c32 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, 17 May 2025 15:00:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BA=84=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 9 +- .../Game/View/Family/FamilyNumberRecord.lua | 84 +++++++++++++++--- .../base_project/Game/View/FamilyView.lua | 32 ++++--- .../extend/poker2/suoha/ExMainView.lua | 6 ++ .../ART/base/Family/ui/Family_fui.bytes | Bin 44664 -> 49015 bytes .../suoha/ui/Extend_Poker_SuoHa_fui.bytes | Bin 30236 -> 30236 bytes 6 files changed, 105 insertions(+), 26 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 9a6efce5..c011c224 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -872,7 +872,7 @@ function M:FG_GetMemberHpLog(group_id, tag, limit, num, filter, begin_time, end_ end) end --- 获取玩法局数统计 +-- 获取玩法局数统计 --500 function M:FG_GetGameStat(group_id, callback) local _client = ControllerManager.GroupClient local data = {} @@ -908,6 +908,13 @@ function M:FG_GetPropLog(group_id, limit, num, begin_time, end_time, callback) end) end +---comment +---@param group_id any +---@param platform any +---@param qid 用户id +---@param limit any +---@param num any +---@param callback any -- 获取战绩 function M:FG_GetGroupRecord(group_id, platform, qid, limit, num, callback) local _client = ControllerManager.GroupClient diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 9b82219a..9ca3928f 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -16,29 +16,52 @@ function FamilyNumberRecord.New(root) -- end -- end self.familyType.selectedIndex = 5 - self.lastType = 1 self._view:GetChild('text_titleRecord').text = string.format("%s(%s) 成员记录", self._group.name, self._group.id) self._view:GetChild('text_residueDiamond').text = self._group.diamo self._view:GetChild('text_timeRecord').visible = false - local playList = self._group.playList + local games = DataManager.SelfUser.games local comp_gameTypeList = self._view:GetChild('comp_gameTypeList'):GetChild('n0') + local ctr_numberRecordRank = self._view:GetController('numberRecordRank') self._input_IDSerach = self._view:GetChild('input_numberID') + self._viewList_numverRecord = self._view:GetChild('list_numverRecord') + self.ctr_numberRecord = self._view:GetController('numberRecord') - print("lingmengplayList", #playList) - pt(playList) + + print("lingmengplayList", #games) + pt(games) comp_gameTypeList:SetVirtual() comp_gameTypeList.itemRenderer = function(index, obj) - obj.title = playList[index + 1].game_name - obj.data = {} - obj.data.index = index - obj.data.pid = playList[index + 1].id + if index == 0 then + obj.title = "麻将" + obj.data = {} + obj.data.index = index + obj.data.id = -1 + elseif index == 1 then + obj.title = "扑克" + obj.data = {} + obj.data.index = index + obj.data.id = -2 + else + obj.title = games[index - 1].name + obj.data = {} + obj.data.index = index + obj.data.id = games[index - 1].game_id + end end - comp_gameTypeList.numItems = #playList - + comp_gameTypeList.numItems = #games + 2 + self.btn_close.onClick:Set(function() + if self.ctr_numberRecord.selectedIndex > 0 then + self.ctr_numberRecord.selectedIndex = self.ctr_numberRecord.selectedIndex - 1 + else + self:InitCloseClick() + self.familyType.selectedIndex = 1 + end + end) + self:NumverRecordRenderer() self._view:GetChild('btn_clearInput').onClick:Set(function() self._input_IDSerach.text = "" end) @@ -54,20 +77,57 @@ function FamilyNumberRecord.New(root) end) self._view:GetChild('comp_sortTypeList'):GetChild('n0').onClickItem:Set(function(context) self:OnClickSortType(context) + ctr_numberRecordRank.selectedIndex = 0 end) comp_gameTypeList.onClickItem:Set(function(context) - self:OnClickSortType(self._group.id, context.data.data.pid) + self:OnClickSortType(self._group.id, context.data.data.id) + ctr_numberRecordRank.selectedIndex = 0 end) return self end +function M:NumverRecordRenderer() + local numberRecordList = self._viewList_numverRecord + numberRecordList:SetVirtual() + numberRecordList.itemRenderer = function(index, obj) + local info = rank[index + 1] + ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject) + obj:GetChild('text_ID').text = info.uid + obj:GetChild('text_nick').text = info.nick + obj:GetChild('text_score').text = info.score + obj:GetChild('btn_lookRecord').onClick:Set(function() + self.ctr_numberRecord.selectedIndex = 1 + self:OnClickNumberRank(groupId, info.uid, info.round) + end) + end +end + function M:OnClickSortType(groupId, pid) print("lingmengOnClickSortType") local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_GetGroupRecord(groupId, GetPlatform(), pid, 0, 100, function(res) + local numberRecordList = self._viewList_numverRecord + fgCtr:FG_GetMemberRank(groupId, 0, 0, 10, os.time() - 3600 * 120, os.time(), 1, function(res) pt(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("获取排行榜失败" .. res.ReturnCode) + else + local data = res.Data + local rank = data.ranks + numberRecordList.numItems = #rank + end end) end +function M:OnClickNumberRank(groupId, uid, round) + print("lingmengOnClickNumberRank") + local fgCtr = ControllerManager.GetController(NewGroupController) + local numberRecordList = self._viewList_numverRecord + fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, 0, round, os.time() - 3600 * 120, os.time(), 3, + function(res) + pt(res) + pt("resdata", res.Data.records[1].totalScore) + end) +end + return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index f2d5c8c4..f38d8b44 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -31,19 +31,9 @@ function M:init(url) local createOrJoin = view:GetController('createOrJoin') self.familyType = view:GetController('familyType') - local btn_close = view:GetChild('btn_close') - btn_close.onClick:Set(function() - if not self.lastType or self.familyType.selectedIndex == 1 then - ControllerManager.ChangeController(LoddyController) - ViewManager.ChangeView(ViewManager.View_Lobby) - else - self.familyType.selectedIndex = self.lastType - if self.lastType == 3 then - self.lastType = 1 - createOrJoin.selectedIndex = (createOrJoin.selectedIndex + 1) % 2 - end - end - end) + self.btn_close = view:GetChild('btn_close') + + self:InitCloseClick() fgCtr:FG_GroupList(function(res) local groups = res.Data.groups @@ -106,6 +96,22 @@ function M:init(url) -------绑定成员战绩按钮 view:GetChild('btn_family_record').onClick:Set(function() self._child_familyNumberRecord = FamilyNumberRecord.New(self) + self.lastType = 1 + end) +end + +function M:InitCloseClick() + self.btn_close.onClick:Set(function() + if not self.lastType or self.familyType.selectedIndex == 1 then + ControllerManager.ChangeController(LoddyController) + ViewManager.ChangeView(ViewManager.View_Lobby) + else + self.familyType.selectedIndex = self.lastType + if self.lastType == 3 then + self.lastType = 1 + createOrJoin.selectedIndex = (createOrJoin.selectedIndex + 1) % 2 + end + end end) end diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua index 891cab47..c7364d08 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua @@ -325,6 +325,12 @@ function M:EventInit() local playerInfo = _player_info[self:GetPos(i)] playerInfo:FillData(list[i]) playerInfo:Ready(false) + + if i == bank_seat then + playerInfo:MarkBank(true) + else + playerInfo:MarkBank(false) + end end end) 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 997004f34285d89393d0e93e49b0b3adb4408566..985c38d618cf3eeceb2223bb4832b8c6e84c923d 100644 GIT binary patch delta 7700 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 Sd*R?JI+pdoNa8IIe*GUfm)uMM delta 5666 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 UabMvHlW1vOlTv9Iv&U&w3?P6jh5!Hn delta 107 zcmV-x0F?in>;atY0kB6Wljao@59j~>0O$be00000|NsB_lVJoIlTbGWlRysylRzgP z1L^?llVK-N0qm1;As7Sg0Pd5`C%*&l0PvHKD0H(I