From c3fea3ad7379d684bedbb6835e7716776fb9c920 Mon Sep 17 00:00:00 2001
From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com>
Date: Tue, 8 Jul 2025 20:29:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=AE=B6=E6=97=8F=E6=88=BF?=
=?UTF-8?q?=E5=8D=A1=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Game/Controller/NewGroupController.lua | 12 ++++
lua_probject/base_project/Game/Protocol.lua | 3 +
.../Game/View/Common/BaseView.lua | 8 +++
.../Game/View/Family/FamilyRoomCard.lua | 49 ++++++++------
.../base_project/Game/View/FamilyView.lua | 2 +-
wb_new_ui/assets/Family/com_roomCard.xml | 4 +-
.../ART/base/Family/ui/Family_fui.bytes | Bin 116483 -> 116490 bytes
.../Assets/StreamingAssets/init2_1.json | 60 +++++++++---------
wb_unity_pro/Assets/start.unity | 6 +-
.../ProjectSettings/GraphicsSettings.asset | 1 -
10 files changed, 90 insertions(+), 55 deletions(-)
diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index c7e604a5..4954cc9a 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -45,6 +45,7 @@ function M:FG_GroupList(callback)
group.isOpenChatRoom = tem.isOpenChatRoom
group.isWatch = tem.isWatch
group.wechatId = tem.wechatId
+ group.groupDiamo = tem.groupDiamo
l_groups:add(group)
end
end
@@ -1662,3 +1663,14 @@ function M:SetCanWatch(groupId, value, callback)
callback(res)
end)
end
+
+-- 亲友圈充值房卡
+function M:FG_Recharge_Diamo(groupId, diamo, callback)
+ local _data = {}
+ _data.id = groupId
+ _data.diamo = diamo
+ local _client = ControllerManager.GroupClient
+ _client:send(Protocol.WEB_FG_RECHARGE_DIAMO, _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 0e289007..d0de4a3c 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -275,6 +275,9 @@ Protocol = {
-- 亲友圈聊天室
WEB_FG_GETCHATROOM = "group/get_chat_rooms",
+ -- 亲友圈房卡充值
+ WEB_FG_RECHARGE_DIAMO = "group/recharge_diamo",
+
-------------- group-log---------------------
-- 获取奖励日志
WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",
diff --git a/lua_probject/base_project/Game/View/Common/BaseView.lua b/lua_probject/base_project/Game/View/Common/BaseView.lua
index 723d04b9..faa707ac 100644
--- a/lua_probject/base_project/Game/View/Common/BaseView.lua
+++ b/lua_probject/base_project/Game/View/Common/BaseView.lua
@@ -11,6 +11,8 @@ BaseView = {
_is_destroy = false,
--关闭摧毁
_close_destroy = false,
+ --缩放全屏
+ _scale = false,
-- 全屏
_full = false,
--全屏偏移
@@ -53,6 +55,12 @@ function M:Show()
self._contentPane.height = GRoot.inst.height
self._contentPane.x = offset
end
+
+ if self._scale then
+ local scaleY = GRoot.inst.height / self._contentPane.height
+ local scaleX = GRoot.inst.width / self._contentPane.width
+ self._contentPane:SetScale(scaleX, scaleY)
+ end
end
end
diff --git a/lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua b/lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua
index 8f580cec..d51fc281 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua
@@ -1,27 +1,41 @@
local data = {
- {num = 50,colorIndex = 0},
- {num = 200,colorIndex = 1},
- {num = 1000,colorIndex = 2},
+ { num = 50, colorIndex = 0 },
+ { num = 200, colorIndex = 1 },
+ { num = 1000, colorIndex = 2 },
}
--#region
-local FamilyRoomCard ={}
+local FamilyRoomCard = {}
-local function charge(num)
- print('充值',num)
+local function charge(num, self)
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ fgCtr:FG_Recharge_Diamo(self.groupId, num, function(res)
+ print("收到充值房卡回调")
+ pt(res)
+ if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode, "操作失败")
+ return
+ end
+ local groupDiamo = res.Data.groupDiamo
+ local playerDiamo = res.Data.userDiamo
+ self.tex_curCard.text = "当前帐号房卡：" .. playerDiamo
+ self.tex_famliyCard.text = "亲友圈房卡：" .. groupDiamo
+ self.group.groupDiamo = groupDiamo
+ DataManager.SelfUser.diamo = playerDiamo
+ end)
end
--#endregion
-function FamilyRoomCard:TryShow()
+function FamilyRoomCard:TryShow(groupId)
local Instance = self.New()
- Instance:Show()
+ Instance:Show(groupId)
end
function FamilyRoomCard.New()
- setmetatable(FamilyRoomCard, {__index = BaseWindow})
- local Instance = setmetatable({}, {__index = FamilyRoomCard})
+ setmetatable(FamilyRoomCard, { __index = BaseWindow })
+ local Instance = setmetatable({}, { __index = FamilyRoomCard })
BaseWindow.init(Instance, "ui://Family/com_roomCard")
Instance._close_destroy = true
@@ -35,16 +49,14 @@ function FamilyRoomCard.New()
end)
Instance.list_bayCrad.itemRenderer = function(index, obj)
- local _idx = index +1
+ local _idx = index + 1
local num = data[_idx].num
obj:GetChild("tex_cardNum").text = num
obj:GetController("cColor").selectedIndex = data[_idx].colorIndex
obj.onClick:Set(function()
-
- charge(num)
- print('房卡',num)
+ charge(num, Instance)
end)
end
@@ -53,13 +65,14 @@ function FamilyRoomCard.New()
return Instance
end
-function FamilyRoomCard:Show()
+function FamilyRoomCard:Show(groupId)
+ self.groupId = groupId
+ self.group = DataManager.groups:get(self.groupId)
self.tex_curCard.text = "当前帐号房卡：" .. DataManager.SelfUser.diamo
-
- --self.tex_famliyCard.text = "亲友圈房卡：" ..
+ self.tex_famliyCard.text = "亲友圈房卡：" .. self.group.groupDiamo
BaseWindow.Show(self)
end
-return FamilyRoomCard
\ No newline at end of file
+return FamilyRoomCard
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index eeed7eee..ee84f5b2 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -249,7 +249,7 @@ function M:ShowShop()
--self._child_familyLobbyShopView = LobbyShopView.new(self, self._group.id)
--self._child_familyLobbyShopView:Show()
- FamilyRoomCard:TryShow()
+ FamilyRoomCard:TryShow(self._group.id)
end
function M:ShowAllRank()
diff --git a/wb_new_ui/assets/Family/com_roomCard.xml b/wb_new_ui/assets/Family/com_roomCard.xml
index 1ab2fd51..10b68fc4 100644
--- a/wb_new_ui/assets/Family/com_roomCard.xml
+++ b/wb_new_ui/assets/Family/com_roomCard.xml
@@ -5,8 +5,8 @@
-
-
+
+