From 1c566ac71aa91bfa76ff1752068a4e10efcdec17 Mon Sep 17 00:00:00 2001
From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com>
Date: Mon, 7 Jul 2025 17:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Game/View/Family/FamilyChatRoom.lua       |  11 ++++++++---
 .../Game/View/Family/FamilyJoinAndCreate.lua  |   2 +-
 wb_new_ui/assets/Family/Main.xml              |  11 ++++++++---
 .../ART/base/Family/ui/Family_fui.bytes       | Bin 113666 -> 113685 bytes
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
index e770b07e..50fdca0a 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
@@ -37,7 +37,8 @@ end
 
 local function ChatItemRenderer(index, obj, self)
 
-    local data = self.ChatRoomData.records[index + 1]
+    --local data = self.ChatRoomData.records[index + 1]
+    local data = self.ChatRoomData[1].records[index + 1]
     local totalScore = json.decode(data.totalScore)
     SetBigWiller(totalScore)
 
@@ -111,9 +112,13 @@ function FamilyChatRoom:Close()
 end
 
 function FamilyChatRoom:Refalsh()
+    --local data = string.sub(self.ChatRoomData[1].records, 1, -2)
+    --data = data .. ']'
     pt(self.ChatRoomData[1])
-    self.records = json.decode(self.ChatRoomData[1].records)
-    self.list_chat.numItems = #self.records or 0
+    --pt(data)
+    --self.records = json.decode(self.ChatRoomData[1].records)
+    --self.records = json.decode(self.ChatRoomData[1].records)
+    self.list_chat.numItems = #self.ChatRoomData[1].records or 0
 end
 
 function FamilyChatRoom:Show()
diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
index 94673006..fac5e0c1 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua
@@ -32,7 +32,7 @@ function FamilyJoinAndCreate:init(root)
             return
         end
 
-        self:JoinRoom(self.tex_num.text)
+        --self:JoinRoom(self.tex_num.text)
     end)
 
     self._view:GetChild('btn_c').onClick:Add(function()
diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml
index 312c9329..02478fee 100644
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
+  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="6"/>
   <controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
   <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
@@ -158,10 +158,15 @@
     <image id="n281_jrro" name="text_titleAuditNumber" src="c8pn7cz4" fileName="Main/Image/Group 327.png" xy="969,24" size="593,99" group="n349_jrro">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n282_jrro" name="n282" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="228,168" size="2076,960" group="n284_jrro"/>
-    <image id="n283_jrro" name="n283" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="246,186" size="2040,924" group="n284_jrro"/>
+    <image id="n282_jrro" name="n282" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="228,168" size="2076,960" group="n284_jrro">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n283_jrro" name="n283" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="246,186" size="2040,924" group="n284_jrro">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <group id="n284_jrro" name="bg_auditNumber" xy="228,168" size="2076,960" group="n349_jrro"/>
     <list id="n351_jrro" name="list_auditNumberList" xy="272,215" size="1987,854" group="n349_jrro" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rjrro7cxz" align="center" autoClearItems="true">
+      <relation target="" sidePair="height-height"/>
       <item/>
       <item/>
       <item/>
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 6f7d8749307b34cc2b4a13ab9a2d5739f66a66d9..458bf0eeb2ab33802f57d0516542f3c2ac987e0b 100644
GIT binary patch
delta 120
zcmZqr!8Y{=+XNfVr3@gzn5(|gmG7vLE;I8Z=EuyM|Nk*EFmOI$U|^X9lob==04Y)e
zVtt_6P6h_iKS2B!C?ha^9w(#N=GjNL@K1MfVHBR6bk%UWvKOP=<W*OVCZBasoBaE#
R9xLPj|BU>bHLu-#3IL1RB((ql

delta 118
zcmbRGgRSWY+XNfVNem#sm@Bf;mG7vL6f^T9=EuyM|Nk*EFmOI$U|<2si~i>TDN+Jr
zeW2P-pvX%geg(vTr*GtB6x%%e=obFTW;=u@CtWq1e0YcW<c(L2SU`HF8@Mw{Pv*R)
Kx7p^}&8GmK0VE*+