diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
index 50fdca0a..18874aa4 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
@@ -40,14 +40,18 @@ local function ChatItemRenderer(index, obj, self)
--local data = self.ChatRoomData.records[index + 1]
local data = self.ChatRoomData[1].records[index + 1]
local totalScore = json.decode(data.totalScore)
+ local hpData = json.decode(data.hpData)
SetBigWiller(totalScore)
local list_players = obj:GetChild("list_players")
local tex_time = obj:GetChild("tex_time")
local tex_name = obj:GetChild("tex_name")
+ local tex_roomIdRound = obj:GetChild("tex_roomIdRound")
- tex_time.text = os.date("游戏结算：%m月%d号 %X") --data.create_time
+ tex_time.text = os.date("游戏结算：%m月%d号 %X", data.create_time) --data.create_time
tex_name.text = data.game_info.name
+ local roundTex = data.round .. "/" .. hpData.maxRound
+ tex_roomIdRound.text = data.room_id .. "\n" .. roundTex
list_players.itemRenderer = function(i, o)
list_players_Renderer(i, o, totalScore, self)
diff --git a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
index ff7d45e1..21f0765b 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
@@ -7,16 +7,6 @@ local FamilyInviteFamilyView = import('.FamilyInviteFamilyView')
local FamilyMyFamily = {}
local root = {}
-local rootLastIndex = 0
-
-local function HideMainView()
- rootLastIndex = root.familyType.selectedIndex
- root.familyType.selectedIndex = 0
-end
-
-local function ShowMainView()
- root.familyType.selectedIndex = rootLastIndex or 1
-end
local function ChangeFamilyConfig(data, self)
local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -43,43 +33,6 @@ local function ChangeFamilyConfig(data, self)
end
end
)
- --[[
- fgCtr:FG_UpdateGroupInfo(
- data.id or self.family.id,
- data.name or self.family.name,
- data.notice or self.family.text,
- data.ban or not self.family.ban,
- data.dissolve_opt or self.family.dissolve_opt,
- data.kick_opt or self.family.kick_opt,
- data.apply or self.family.apply,
- data.ban_chat1 or self.family.ban_chat1,
- data.ban_chat2 or self.family.ban_chat2,
- data.option or self.family.option,
- data.show_num or self.family.show_num,
- data.wechatId or self.family.wechatId,
- function(res)
- if res.ReturnCode ~= 0 then
- ViewUtil.ErrorTip(res.ReturnCode, "更改失败,请稍后再试")
- else
- ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
- self.family.id = data.id or self.family.id
- self.family.name = data.name or self.family.name
- self.family.notice = data.notice or self.family.notice
- self.family.ban = data.ban or not self.family.ban
- self.family.dissolve_opt = data.dissolve_opt or self.family.dissolve_opt
- self.family.kick_opt = data.kick_opt or self.family.kick_opt
- self.family.apply = data.apply or self.family.apply
- self.family.ban_chat1 = data.ban_chat1 or self.family.ban_chat1
- self.family.ban_chat2 = data.ban_chat2 or self.family.ban_chat2
- self.family.option = data.option or self.family.option
- self.family.show_num = data.show_num
- self.family.wechatId = data.wechatId
- self:Refalsh()
- self.cWindow.selectedIndex = 0
- end
- end
- )
- ]]
end
@@ -317,7 +270,7 @@ function FamilyMyFamily:Init()
pt(res)
self.isShowContenting = false
if res.ReturnCode ~= 0 then
- ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
+ ViewUtil.ErrorTip(res.ReturnCode)
return
end
self.family.isShow = 0
@@ -341,7 +294,7 @@ function FamilyMyFamily:Init()
pt(res)
self.isShowContenting = false
if res.ReturnCode ~= 0 then
- ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
+ ViewUtil.ErrorTip(res.ReturnCode)
return
end
self.family.isShow = 1
diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
index fcc1ca95..da77e72b 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
@@ -17,9 +17,13 @@ function M:init()
root.familyType.selectedIndex = 0
local com_Record = UIPackage.CreateObjectFromURL("ui://Family/com_Record")
root._view:AddChild(com_Record)
- com_Record.width = root._view.width
- com_Record.height = root._view.height
- com_Record:Center()
+ --com_Record.width = root._view.width
+ --com_Record.height = root._view.height
+ --com_Record:Center()
+ local scaleY = GRoot.inst.height / com_Record.height
+ local scaleX = GRoot.inst.width / com_Record.width
+ com_Record:SetScale(scaleX, scaleY)
+ com_Record:SetPosition(0, 0, 0)
self._view = com_Record
self._ctr_cWindow = self._view:GetController('cWindow')
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 525a8283..5a293c17 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -187,6 +187,7 @@ function M:SetCanWatch()
pt(res)
if res.ReturnCode ~= 0 then
+ ViewUtil.ErrorTip(res.ReturnCode)
return
end
self._group.isWatch = value
diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
index ea74fc79..943485ea 100644
--- a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
+++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml
@@ -4,7 +4,7 @@
-
+
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -180,7 +193,7 @@
-
+
diff --git a/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml b/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml
index 8fbde1d7..ce590fb1 100644
--- a/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml
+++ b/wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml
@@ -23,7 +23,8 @@
-
+
+