From 3ee4969e6bb968fc66d43cbb4d645e606dbf8cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 21 May 2025 16:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=87=8D=E7=BD=AE=E6=88=BF?= =?UTF-8?q?=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 18 +++++++++++++++++- lua_probject/base_project/Game/Protocol.lua | 2 ++ .../base_project/Game/View/FamilyView.lua | 10 ++++++++-- .../Game/View/Lobby/LobbyShopView.lua | 18 ++++++++++++++---- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 8c3f05f3..9a4087e4 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1483,7 +1483,7 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff, end) end ----comments +---comments 设置亲友圈麻将扑克限制分 ---@param group_id number 亲友圈id ---@param playerId number 如果是亲友圈设置为0 否则为玩家的 ---@param mj_score number 麻将限制分 @@ -1500,3 +1500,19 @@ function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, callback) callback(res) end) end + +---comments 充值房卡到亲友圈 +---@param group_id number 亲友圈id +---@param playerId number 否则为玩家的 +---@param diamo number 重置的数量 +---@param callback function 回调函数 +function M:FG_SetFamilyDiamond(group_id, playerId, diamo, callback) + local _client = ControllerManager.GroupClient + local _data = {} + _data.id = group_id + _data.playerId = playerId + _data.diamo = diamo + _client:send(Protocol.WEB_FG_SET_Family_Diamond, _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 e53a7600..d6073958 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -261,6 +261,8 @@ Protocol = { -- 亲友圈限制分 WEB_FG_SET_JOIN_SCORE = "group/update_join_score", + -- 亲友圈重置房卡 + WEB_FG_SET_Family_Diamond = "group/add_group_diamo", -------------- group-log--------------------- -- 获取奖励日志 WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 1f357b68..e2f8b124 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -1,6 +1,7 @@ local FamilyInviteFamilyView = import('.Family.FamilyInviteFamilyView') local CreatePlayView = import('.Family.CreatePlayView') local GroupGameSettingView = import(".NewGroup.MngView.GroupGameSettingView_jaingxi") +local LobbyShopView = import(".Lobby.LobbyShopView") ---无窗口 local FamilyAllNumbers = import(".Family.FamilyAllNumbers") @@ -99,6 +100,11 @@ function M:AuditNumber() self._child_familyAuditNumber = FamilyAuditNumber.new(self) end +function M:ShowShop() + self._child_familyLobbyShopView = LobbyShopView.new(self, self._group.id) + self._child_familyLobbyShopView:Show() +end + function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) local list_familyNumber = self._view:GetChild('list_familyNumber') list_familyNumber:SetVirtual() @@ -347,7 +353,7 @@ local IDENTITY_LIST = { }, { name = "充值房卡", - Fct = M.ShareWx + Fct = M.ShowShop }, { name = "申请消息", @@ -389,7 +395,7 @@ local IDENTITY_LIST = { }, { name = "充值房卡", - Fct = M.ShareWx + Fct = M.ShowShop }, { name = "申请消息", diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua index 2d89d432..070558fd 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua @@ -20,12 +20,13 @@ local SHOP_LIST = { }, } -function LobbyShopView.new(Fct_UpdateDiamo) +function LobbyShopView.new(Fct_UpdateDiamo, groupID) local self = setmetatable({}, { __index = M }) self.class = 'ShopView' self._close_destroy = true self:init('ui://Lobby/Shop') self.UpdateDiamo = Fct_UpdateDiamo + self.groupID = groupID return self end @@ -34,7 +35,7 @@ function M:init(url) local view = self._view local shopList = view:GetChild("main") - + local fgCtr = ControllerManager.GetController(NewGroupController) for i = 1, #SHOP_LIST do local shopChild = UIPackage.CreateObjectFromURL('ui://Lobby/c_shop_child') shopChild:GetChild('num').text = string.format("%s 张", SHOP_LIST[i].num) @@ -49,9 +50,18 @@ function M:init(url) -- print("===================shop====================") -- print(SHOP_LIST[index].num) -- print(DataManager.SelfUser.diamo) - DataManager.SelfUser.diamo = DataManager.SelfUser.diamo + SHOP_LIST[index].num + -- DataManager.SelfUser.diamo = DataManager.SelfUser.diamo + SHOP_LIST[index].num -- print(DataManager.SelfUser.diamo) - self.UpdateDiamo() + -- self.UpdateDiamo() + --暂时用这个发送协议 + local uid = DataManager.SelfUser.account_id + fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index].num, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "重置房卡失败") + else + + end + end) end end) shopList:AddChild(shopChild)