diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 6a2f4804..8c3f05f3 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1482,3 +1482,21 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff, callback(res) end) end + +---comments +---@param group_id number 亲友圈id +---@param playerId number 如果是亲友圈设置为0 否则为玩家的 +---@param mj_score number 麻将限制分 +---@param pk_score number 扑克限制分 +---@param callback function 回调函数 +function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.id = group_id + _data.playerId = playerId + _data.mj_score = mj_score + _data.pk_score = pk_score + _client:send(Protocol.WEB_FG_SET_JOIN_SCORE, _data, function(res) + callback(res) + end) +end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 1c416cf1..e53a7600 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -258,6 +258,9 @@ Protocol = { GET_BANK_HP = "group/get_bank_hp", --获取银行信息 TAKE_BANK_HP = "group/take_bank_hp", SAVE_BANK_HP = "group/save_bake_hp", + + -- 亲友圈限制分 + WEB_FG_SET_JOIN_SCORE = "group/update_join_score", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", @@ -449,5 +452,5 @@ Protocol = { GAME_EVT_CANCEL_READY_ENTRUST = "22011", --关闭托管倒计时 - GAME_AUTO_CARD = "1303", --开启游戏托管 + GAME_AUTO_CARD = "1303", --开启游戏托管 } diff --git a/lua_probject/base_project/Game/View/Family/FamilyChooseTimeView.lua b/lua_probject/base_project/Game/View/Family/FamilyChooseTimeView.lua new file mode 100644 index 00000000..e69de29b diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 203253c6..9ca0c8e0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -1,5 +1,8 @@ +local FamilyChooseTimeView = import(".FamilyChooseTimeView") + local FamilyNumberRecord = { - military = { size = 0, list = {} } + military = { size = 0, list = {} }, + rankNumber = {}, } local M = FamilyNumberRecord @@ -19,15 +22,24 @@ function FamilyNumberRecord.New(root) -- end self.familyType.selectedIndex = 5 + local group_id = self._group.id + local MJScore = 0 + local PKScore = 0 local fgCtr = ControllerManager.GetController(NewGroupController) local comp_gameTypeList = self._view:GetChild('comp_gameTypeList'):GetChild('n0') local input_IDSerach = self._view:GetChild('input_numberID') - local ctr_numberRecordRank = self._view:GetController('numberRecordRank') local text_recordGameType = self._view:GetChild('text_recordGameType') local text_recordSortType = self._view:GetChild('text_recordSortType') local text_allRound = self._view:GetChild('text_allRound') local text_winNum = self._view:GetChild('text_winNum') local text_useDiamond = self._view:GetChild('text_useDiamond') + local btn_chooseTimeBegin = self._view:GetChild('btn_chooseTimeBegin') + local btn_chooseTimeEnd = self._view:GetChild('btn_chooseTimeEnd') + local text_score_poker = self._view:GetChild('text_score_poker') + local text_score_majiang = self._view:GetChild('text_score_majiang') + local ctr_numberRecordRank = self._view:GetController('numberRecordRank') + local ctr_chooseTime = self._view:GetController('showChooseTime') + self._viewList_numberRankRead = self._view:GetChild('comp_numberRecordByGameTypelooked'):GetChild('n3') @@ -39,20 +51,30 @@ function FamilyNumberRecord.New(root) self.ctr_numberRecord = self._view:GetController('numberRecord') - self._text_groupTitle = string.format("%s(%s)", self._group.name, self._group.id) + self._text_groupTitle = string.format("%s(%s)", self._group.name, group_id) + btn_chooseTimeBegin.text = os.date('%Y-%m-%d', os.time()) + btn_chooseTimeEnd.text = os.date('%Y-%m-%d', os.time()) + text_score_majiang.text = MJScore + text_score_poker.text = PKScore self._viewText_titleRecord.text = string.format("%s 成员记录", self._text_groupTitle) self._view:GetChild('text_residueDiamond').text = self._group.diamo self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d %H:%M', os.time()) - self:NumverRecordRenderer(self._group.id) - self:NumverRankRenderer(self._group.id) + self:NumverRecordRenderer(group_id) + self:NumverRankRenderer(group_id) self:GameTypeListRenderer(comp_gameTypeList) self:NumberRecordDetailRender() + btn_chooseTimeBegin.onClick:Set(function() + ctr_chooseTime.selectedIndex = 1 + end) + btn_chooseTimeEnd.onClick:Set(function() + ctr_chooseTime.selectedIndex = 1 + end) comp_gameTypeList.onClickItem:Set(function(context) input_IDSerach.text = "" - self:OnClickSortType(self._group.id, context.data.data.id) + self:OnClickSortType(group_id, context.data.data.id) ctr_numberRecordRank.selectedIndex = 0 text_recordGameType.text = context.data.title end) @@ -94,24 +116,46 @@ function FamilyNumberRecord.New(root) end end) self._view:GetChild('btn_changeMJScore').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + ViewUtil.ShowOneInput("修改麻将进入限制分", function(text) + print("lingmeng修改扑克进入限制分", text) + fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), MJScore, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) + else + MJScore = tonumber(text) + text_score_majiang.text = MJScore + end + end) + end) end) self._view:GetChild('btn_changePKScore').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + ViewUtil.ShowOneInput("修改扑克进入限制分", function(text) + print("lingmeng修改扑克进入限制分", text) + fgCtr:FG_SetJoinScore(group_id, 0, MJScore, tonumber(text), function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode) + else + PKScore = tonumber(text) + text_score_poker.text = PKScore + end + end) + end) end) self._view:GetChild('btn_allChoose').onClick:Set(function() self._flag_allChoose = self.records[self.gameTypeNum][self.readStatusNum].childNum self._viewlist_numberRecordDetail:RefreshVirtualList() end) self._view:GetChild('btn_allChooseRead').onClick:Set(function() - fgCtr:FG_SetGroupRecordReadStatus(self._group.id, GetPlatform(), self.military.list, 2 - self.readStatusNum, + local newReadType = 3 - self.readStatusNum + fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, function(res) pt(res) if res.ReturnCode ~= 0 then - ViewUtil.ShowOneChooose("获取排行榜失败" .. res.ReturnCode) + ViewUtil.ShowOneChooose("修改战绩阅读状态失败" .. res.ReturnCode) else - + self.ctr_numberRecord.selectedIndex = 1 + self:OnClickNumberRank(group_id, self.rankNumber.uid, self.rankNumber.round) end end) end) @@ -122,15 +166,23 @@ function FamilyNumberRecord.New(root) self._view:GetChild('comp_sortTypeList'):GetChild('n0').onClickItem:Set(function(context) input_IDSerach.text = "" local sortType = tonumber(context.data.text) - self:OnClickSortType(self._group.id, 0, sortType) + self:OnClickSortType(group_id, 0, sortType) ctr_numberRecordRank.selectedIndex = 0 text_recordSortType.text = sortType == 1 and "正数榜" or "负数榜" end) - self:OnClickSortType(self._group.id) + self:OnClickSortType(group_id) - fgCtr:FG_GetConsumeStat(self._group.id, os.time() - 3600 * 1200, os.time(), function(res) + fgCtr:FG_GetConsumeStat(group_id, os.time() - 3600 * 1200, os.time(), function(res) pt(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("获取总信息失败" .. res.ReturnCode) + else + MJScore = tonumber(res.Data.mj_score) + PKScore = tonumber(res.Data.pk_score) + text_score_majiang.text = MJScore + text_score_poker.text = PKScore + end end) return self end @@ -262,6 +314,8 @@ function M:NumverRankRenderer(groupId) self._view:GetChild('text_numberRecordName').text = info.nick self._view:GetChild('text_numberRecordID').text = info.uid ImageLoad.Load(info.portrait, self._view:GetChild('btn_numberRecordHead')._iconObject) + self.rankNumber.uid = info.uid + self.rankNumber.round = info.round 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 25f8ac76..0d198ee1 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ