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 @@ - + @@ -158,10 +158,15 @@ - - + + + + + + + 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 6f7d8749..458bf0ee 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