同步

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1762,3 +1762,13 @@ function M:FG_Get_Msg(groupId, callback)
         callback(res)
     end)
 end
+
+-- 获取亲友圈房卡记录
+function M:FG_Get_Diamond_Msg(groupId, callback)
+    local _data = {}
+    _data.id = groupId
+    local _client = ControllerManager.GroupClient
+    _client:send(Protocol.WEB_FG_Get_Diamond_Mssages, _data, function(res)
+        callback(res)
+    end)
+end

lua_probject/base_project/Game/Protocol.lua

@@ -304,6 +304,9 @@ Protocol = {
 
     -- 获取消息记录
     WEB_FG_Get_Mssages              = "group/get_messages",
+
+    -- 获取亲友圈房卡记录
+    WEB_FG_Get_Diamond_Mssages      = "group/get_diamo_messages",
     -------------- group-log---------------------
     -- 获取奖励日志
     WEB_FG_GET_REWARDS_LOG          = "group/log/get_reward_log",

lua_probject/base_project/Game/View/Common/MsgWindow.lua

@@ -15,24 +15,24 @@ MsgWindow.RES_LIST = {
 local M = MsgWindow
 
 
-function MsgWindow.new(blur_view,tip,mode,url,showCheck)
+function MsgWindow.new(blur_view, tip, mode, url, showCheck)
-    setmetatable(M, {__index = BaseWindow})
+    setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = "MsgWindow"
     self._blur_view = blur_view
     self._close_destroy = true
     self._tip = tip
     self._mode = mode
-    self.onOk = event("onOk",true)
+    self.onOk = event("onOk", true)
-    self.onCancel = event("onCancel",true)
+    self.onCancel = event("onCancel", true)
     self.showCheck = showCheck
-    local self_url = url and url or "ui://Common/"..MsgWindow.RES_LIST[self._mode]
+    local self_url = url and url or "ui://Common/" .. MsgWindow.RES_LIST[self._mode]
     self:init(self_url)
     return self
 end
 
 function M:init(url)
-    BaseWindow.init(self,url)
+    BaseWindow.init(self, url)
     self._close_destroy = true
     self._close_zone = false
     local view = self._view
@@ -45,15 +45,15 @@ function M:init(url)
     tex_message.emojies = EmojiDitc.EmojiesDitc
     if (self._tip) then tex_message.text = self._tip end
 
-    local btn_close = view:GetChild('btn_close1')
+    -- local btn_close = view:GetChild('btn_close1')
-    if (btn_close~=nil) then
+    -- if (btn_close~=nil) then
-        btn_close.onClick:Add(
+    --     btn_close.onClick:Add(
-            function()
+    --         function()
-                self:CloseEvent()
+    --             self:CloseEvent()
-            end
+    --         end
 
-        )
+    --     )
-    end
+    -- end
     self.btnCheck = view:GetChild("btnCheck")
     if self.btnCheck then
         self.btnCheck.visible = false
@@ -66,7 +66,7 @@ end
 
 function M:Close()
     BaseWindow.Close(self)
-    if(self._mode == MsgWindow.MsgMode.OkAndCancel) then
+    if (self._mode == MsgWindow.MsgMode.OkAndCancel) then
         self.onCancel()
     end
 end

lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua

@@ -0,0 +1,56 @@
+local FamilyMsgDiamond = {}
+
+local M = FamilyMsgDiamond
+
+--类型字段，1为进入游戏预扣，2为结束游戏返还
+local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您" }
+
+function M.New(data, callback)
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self._full = true
+    self.class = "com_FamilyMsgRecord"
+    BaseWindow.init(self, 'ui://Family/com_FamilyMsgRecord')
+    self.data = data
+    self:Init()
+    self.closeCallback = callback
+
+    return self
+end
+
+function M:Init()
+    local list_msg = self._view:GetChild('list_msg')
+    list_msg.itemRenderer = function(index, obj)
+        self:msgRenderer(index, obj)
+    end
+
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_Get_Diamond_Msg(self.data.groupId, function(res)
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败")
+        else
+            self.msgData = res.Data.messages
+            list_msg.numItems = #self.msgData
+        end
+    end)
+end
+
+function M:msgRenderer(index, obj)
+    local data = self.msgData
+    obj:GetChild('tex_time').text = os.date("%Y-%m-%d  %H:%M:%S", math.floor(data[index + 1].m_time / 1000))
+    obj:GetChild('tex_msg').text = string.format("%s%d房卡，剩余%d房卡", TypeTable[data[index + 1].diamo_type + 1],
+        data[index + 1].diamo_num, data[index + 1].diamo_cur)
+end
+
+function M:Show(groupId)
+    getmetatable(M).__index.Show(self)
+end
+
+function M:Close()
+    if self.closeCallback then
+        self.closeCallback()
+    end
+    getmetatable(M).__index.Close(self)
+end
+
+return M

lua_probject/base_project/Game/View/FamilyView.lua

@@ -5,6 +5,7 @@ local LobbyShopView = import(".Lobby.LobbyShopView")
 local FamilAllRank = import(".Family.FamilAllRank")
 local FamilyNumberRecord = import(".Family.FamilyNumberRecord")
 local FamilyRecord = import(".Family.FamilyRecord")
+local FamilyMsgDiamond = import(".Family.FamilyMsgDiamond")
 
 ---无窗口
 local FamilyAllNumbers = import(".Family.FamilyAllNumbers")
@@ -304,6 +305,11 @@ function M:MsgView()
     view:Show(self._group.id)
 end
 
+function M:MsgDiamondView()
+    local view = FamilyMsgDiamond.New({ groupId = self._group.id })
+    view:Show()
+end
+
 function M:SetIsOpenChatRoom()
     local mgr_ctr = ControllerManager.GetController(GroupMgrController)
 
@@ -586,9 +592,9 @@ function M:UpdateFamilyRoom(fgCtr, id)
     list_room:SetVirtual()
     --local list_gamePlay = self._view:GetChild('list_gamePlay')
     --list_gamePlay:SetVirtual()
-    self._view:GetChild('n364').text = string.format("已开启%s桌游戏", self._group.room_num)
     local playList = self._group.playList
     local roomList = self._group.rooms
+    self._view:GetChild('n364').text = string.format("已开启%s桌游戏", #roomList)
     local roomCtr = ControllerManager.GetController(RoomController)
     --先对房间进行一波分类
     local readyRoom = {}
@@ -1040,6 +1046,10 @@ local MORE_LIST = {
         name = "消息记录",
         Fct = M.MsgView
     },
+    {
+        name = "房卡记录",
+        Fct = M.MsgDiamondView
+    },
     {
         name = "禁止同桌",
         Fct = M.BanDeskmate

lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua

@@ -8,9 +8,10 @@ setmetatable(M, { __index = BaseWindow })
 function LobbyRecordView.new()
     local self = setmetatable({}, { __index = M })
     self.class = 'LobbyRecordView'
+    self._full = true
+    self._full_offset = false
     self._close_destroy = true
     self:init('ui://Lobby/Record')
-    self._viewlist_numberRecordDetail = self._view:GetChild('list_numberRecordDetail')
 
     return self
 end
@@ -20,90 +21,182 @@ function M:init(url)
 
     local view = self._view
 
-    self.records = { totalScore = 0, childNum = 0, winNum = 0 }
+    self.ctr_detail = self._view:GetController('detail')
+    self._view:GetChild('btn_close').onClick:Set(function()
+        if self.ctr_detail.selectedIndex == 0 then
+            self:Destroy()
+        else
+            self.ctr_detail.selectedIndex = self.ctr_detail.selectedIndex - 1
+        end
+    end)
+
+    self._view:GetChild('btn_lookOther').onClick:Set(function()
+        self._view:GetChild('input_recordId').text = ""
+        self._view:GetController('showLook').selectedIndex = 1
+    end)
+
+    self._view:GetChild('btn_send').onClick:Set(function()
+        ViewUtil.ShowOneChooose({ showText = "您查询的战报不存在" })
+    end)
+
+    local list_numberRecordDetail = self._view:GetChild('list_numberRecordDetail')
+    list_numberRecordDetail.itemRenderer = function(index, obj)
+        self:RecordRenderer(index, obj)
+    end
+    list_numberRecordDetail.scrollPane.onPullUpRelease:Set(function()
+
+    end)
+
+    self.list_playerName = self._view:GetChild('detail1_list_playerName')
+    self.list_playerName.itemRenderer = function(index, obj)
+        self:PlayerNameRenderer(index, obj)
+    end
+
+    self.list_playerScore = self._view:GetChild('detail1_list_main')
+    self.list_playerScore.itemRenderer = function(index, obj)
+        self:PlayerScoreRenderer(index, obj)
+    end
+
+    --获取个人战绩
     local loddyCtr1 = ControllerManager.GetController(LoddyController)
     loddyCtr1:RequestRecordList(function(res)
         if res.ReturnCode ~= 0 then
-            ViewUtil.ErrorTip(res.ReturnCode, "获取战绩失败")
+            ViewUtil.ErrorTip(res.ReturnCode, "获取个人战绩失败")
         else
-            -- pt(loddyCtr1.recordList)
+            self.records = res.Data.military_list
-            local records = res.Data.military_list
+            list_numberRecordDetail.numItems = #self.records
-            for i = 1, #records do
-                local info = records[i]
-                local tempTableChild = self.records
-                info.totalScore = json.decode(info.totalScore)
-                local totalScore = 0
-                print("lingmengtotalScore", #info.totalScore, DataManager.SelfUser.account_id)
-                for i = 1, #info.totalScore do
-                    pt(info.totalScore)
-                    if info.totalScore[i].accId == DataManager.SelfUser.account_id then
-                        totalScore = info.totalScore[i].score
         end
-                end
-                if info.round ~= "1" or totalScore ~= 0 then
-                    table.insert(tempTableChild, info)
-                    print(tempTableChild.totalScore)
-                    tempTableChild.totalScore = tempTableChild.totalScore + totalScore
-                    tempTableChild.childNum = tempTableChild.childNum + 1
-                    tempTableChild.winNum = tempTableChild.winNum + (totalScore > 0 and 1 or 0)
-                end
-            end
-        end
-        self._viewlist_numberRecordDetail.numItems = self.records.childNum
     end)
 end
 
-function M:NumberRecordDetailRender()
+--渲染初始进入的列表
-    local list_numberRecordDetail = self._viewlist_numberRecordDetail
+function M:RecordRenderer(index, obj)
-    list_numberRecordDetail:SetVirtual()
+    --处理一下数据
-    list_numberRecordDetail.itemRenderer = function(index, obj)
+    local data = self.records[index + 1]
-        local info = self.records
+    if type(data.totalScore) == "string" then
-        obj:GetChild('text_gameName').text = info.game_info.name
+        data.totalScore = json.decode(data.totalScore)
-        obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time)
+    end
-        obj:GetChild('text_roomID').text = info.room_id
+    if not data.Info then
-        obj:GetChild('text_userDiamond').text = 0
+        data.Info = { peopleNum = #data.totalScore }
-        obj:GetChild('btn_lookRecord').onClick:Set(function()
+        for i, v in ipairs(data.totalScore) do
-            print("lingmeng查看")
+            if v.accId == DataManager.SelfUser.account_id then
+                data.Info.win = v.score >= 0
+                data.Info.score = v.score
+                break
+            end
+        end
+    end
+
+
+    --开始渲染
+    obj:GetChild('text_gameName').text = data.game_info.name
+    obj:GetController('win').selectedIndex = data.Info.win and 1 or 0
+    obj:GetChild('text_score').text = string.format("%s%d", data.Info.win and "+" or "", data.Info.score)
+    obj:GetChild('text_roomID').text = data.room_id
+    obj:GetChild('text_time1').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(data.create_time))
+    obj:GetChild('btn_lookRecord').onClick:Set(function(context)
+        self.ctr_detail.selectedIndex = 1
+        self.detailData = data
+        self.list_playerScore.numItems = tonumber(data.round)
+        self.list_playerName.numItems = data.Info.peopleNum
     end)
-        obj:GetController('seleted').onChanged:Set(function(context)
+    local list = obj:GetChild('list')
-            pt(getmetatable(context.sender))
+    list.itemRenderer = function(index1, obj1)
-            if context.sender.selectedIndex == 1 then
+        self:RecordDetailRenderer(index1, obj1, data)
-                if not self.military[info.military_id] then
-                    self.military.size = self.military.size + 1
-                    self.military[info.military_id] = self.military.size
-                    table.insert(self.military.list, info.military_id)
-                end
-            else
-                if self.military[info.military_id] then
-                    self.military.size = self.military.size - 1
-                    table.remove(self.military.list, self.military[info.military_id])
-                    self.military[info.military_id] = nil
-                end
-            end
-        end)
-        if self._flag_allChoose and self._flag_allChoose > 0 then
-            obj:GetController('seleted').selectedIndex = 1
-            self._flag_allChoose = self._flag_allChoose - 1
-        end
-        if self._flag_allChooseReverse and self._flag_allChooseReverse > 0 then
-            obj:GetController('seleted').selectedIndex = 1 - obj:GetController('seleted').selectedIndex
-            self._flag_allChooseReverse = self._flag_allChooseReverse - 1
-        end
-        local resultDetailList = obj:GetChild('list')
-        resultDetailList:SetVirtual()
-        resultDetailList.itemRenderer = function(index, obj)
-            local resultInfo = info.totalScore[index + 1]
-            ImageLoad.Load(resultInfo.portrait, obj:GetChild('btn_head')._iconObject)
-            obj:GetChild('text_name').text = resultInfo.nick
-            obj:GetChild('text_score').text = resultInfo.score
-            obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0
-        end
-        resultDetailList.numItems = #info.totalScore
     end
+    list.numItems = data.Info.peopleNum
 end
 
-function M:ResetRecords()
+function M:RecordDetailRenderer(index, obj, data)
-    self.records = { totalScore = 0, childNum = 0, winNum = 0 }
+    local score = data.totalScore[index + 1].score
+    obj:GetController('colour').selectedIndex = score >= 0 and 1 or 0
+    obj:GetChild('text_score').text = string.format("%s%d", score > 0 and "+" or "", score)
+    obj:GetChild('text_name').text = data.totalScore[index + 1].nick
+end
+
+function M:PlayerNameRenderer(index, obj)
+    local data = self.detailData
+    obj.text = data.totalScore[index + 1].nick
+end
+
+function M:PlayerScoreRenderer(index, obj)
+    local data = self.detailData
+    if type(data[string.format("round_%d", index + 1)]) == "string" then
+        data[string.format("round_%d", index + 1)] = json.decode(data[string.format("round_%d", index + 1)])
+    end
+    obj:GetChild('text_index').text = index + 1
+    obj:GetChild('text_time').text = os.date("%m-%d\n%H:%M:%S", tonumber(data.create_time))
+    local list_playerScore = obj:GetChild('list_playerScore')
+    list_playerScore.itemRenderer = function(index1, obj1)
+        obj1.text = string.format("%s%d", data[string.format("round_%d", index + 1)][index1 + 1].score > 0 and "+" or "",
+            data[string.format("round_%d", index + 1)][index1 + 1].score)
+    end
+    list_playerScore.numItems = data.Info.peopleNum
+    local allDate = data
+    local round = index + 1
+    obj:GetChild('btn_lookBack').onClick:Set(function()
+        if DataManager.SelfUser.playback[allDate.military_id] ~= nil and DataManager.SelfUser.playback[allDate.military_id][round] ~= nil then
+            local room = ExtendManager.GetExtendConfig(allDate.game_info.game_id):NewRoom()
+            DataManager.CurrenRoom = room
+            room.lev = 1
+            room.game_id = allDate.game_info.game_id
+            local extend = ExtendManager.GetExtendConfig(allDate.game_info.game_id)
+            extend:FillPlayBackData(DataManager.SelfUser.playback[allDate.military_id][round])
+            if not room.self_player then
+                room.self_player = room:GetPlayerBySeat(1)
+            end
+            local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id)
+            main._currentId = allDate.military_id
+            main._currentRound = round
+            main._totalRound = tonumber(allDate.round)
+            main:FillRoomData(DataManager.SelfUser.playback[allDate.military_id][round])
+        else
+            ViewUtil.ShowModalWait(self._view)
+            local _data = {}
+            _data["military_id"] = allDate.military_id
+            _data["round"] = tostring(round)
+            local loddyCtr1 = ControllerManager.GetController(LoddyController)
+            loddyCtr1:RequestPlayBack(_data, function(code, data)
+                ViewUtil.CloseModalWait()
+                if code == 0 then
+                    if DataManager.SelfUser.playback[allDate.military_id] ~= nil then
+                        DataManager.SelfUser.playback[allDate.military_id][round] = data
+                    else
+                        local playback_data = {}
+                        playback_data[round] = data
+                        DataManager.SelfUser.playback[allDate.military_id] = playback_data
+                    end
+
+                    local main = self:GenaratePlayBack(ViewManager.View_PlayBack, allDate.game_info.game_id)
+                    main._currentId = allDate.military_id
+                    main._currentRound = round
+                    main._totalRound = tonumber(allDate.round)
+                    main:FillRoomData(data)
+                    main._room.lev = 1
+                elseif code == 25 then
+                    ViewUtil.ErrorTip(-1, "回放未找到！")
+                    -- btn_play_back.grayed = true
+                end
+            end, allDate.game_info)
+        end
+    end)
+end
+
+function M:GenaratePlayBack(id, game_id, ...)
+    local tem = nil
+    local dview_class = nil
+    if not dview_class then
+        local exconfig = ExtendManager.GetExtendConfig(game_id)
+        dview_class = exconfig:GetView(id)
+    end
+    if not dview_class then
+        return
+    end
+    local arg = { ... }
+    tem = dview_class.new(...)
+    tem.Id = id
+    tem:Show()
+    return tem
 end
 
 return M

lua_probject/base_project/Game/View/Lobby/LobbyShopView.lua

@@ -18,6 +18,10 @@ local SHOP_LIST = {
         num = 300,
         price = 50
     },
+    {
+        num = 30,
+        price = 10
+    },
 }
 
 function LobbyShopView.new(Fct_UpdateDiamo, groupID)
@@ -36,13 +40,11 @@ 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')
+    shopList.itemRenderer = function(index, obj)
-        shopChild:GetChild('num').text = string.format("%s 张", SHOP_LIST[i].num)
+        obj.text = string.format("%d张", SHOP_LIST[index + 1].num)
-        local shopBuyBtn = shopChild:GetChild('btn_buy')
+        obj:GetChild('btn_buy').text = string.format("%d元", SHOP_LIST[index + 1].price)
-        shopBuyBtn:GetChild('sprite').icon = string.format("ui://Lobby/shop_buy_%s", SHOP_LIST[i].price)
+        obj.onClick:Set(function()
-        shopBuyBtn.onClick:Set(function()
-            local index = i;
             if false then
                 --发送购买给后端
             else
@@ -55,7 +57,7 @@ function M:init(url)
                 -- self.UpdateDiamo()
                 --暂时用这个发送协议
                 local uid = DataManager.SelfUser.account_id
-                fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index].num, function(res)
+                fgCtr:FG_SetFamilyDiamond(self.groupID, uid, SHOP_LIST[index + 1].num, function(res)
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "重置房卡失败")
                     else
@@ -64,8 +66,9 @@ function M:init(url)
                 end)
             end
         end)
-        shopList:AddChild(shopChild)
     end
+
+    shopList.numItems = #SHOP_LIST
 end
 
 return M

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -306,16 +306,18 @@ function ViewUtil.stringEllipsis(szText, size, full)
 end
 
 -------------------------lingmeng---------------------------
-function ViewUtil.ShowOneChooose(showText, btnType, callback)
+function ViewUtil.ShowOneChooose(data, callback)
     local pop_oneChoose = UIPackage.CreateObjectFromURL("ui://Common/pop_oneChoose")
-    pop_oneChoose:GetChild('text_show').text = showText
+    pop_oneChoose:GetChild('text_show').text = data.showText
     GRoot.inst:AddChild(pop_oneChoose)
     pop_oneChoose:Center()
     local btn_center = pop_oneChoose:GetChild('btn_center')
-    if type(btnType) == "number" then
+    if data.btnType then
-        btn_center.icon = string.format("ui://Common/btn_%d", btnType)
+        if type(data.btnType) == "number" then
+            btn_center.icon = string.format("ui://Common/btn_%d", data.btnType)
         else
-        btn_center.icon = btnType
+            btn_center.icon = data.btnType
+        end
     end
     btn_center.onClick:Add(function()
         GRoot.inst:RemoveChild(pop_oneChoose)

lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua

@@ -284,6 +284,18 @@ function M:fillResult1(room, peopleNum, total_result)
     local familyIDText = self._view:GetChild("Text_FamilyID")
     print("lingmeng fillResult1")
     pt(room)
+    --初始化大赢家和最佳炮手
+    local bigWin = { seat = -1, score = 0 }
+    local bestPao = { seat = -1, times = 0 }
+    --循环数据得出分数最大的大赢家，以及点炮次数最多的最佳炮手
+    for i = 1, #total_result.info_list do
+        if total_result.info_list[i].total_score > bigWin.score then
+            bigWin = { seat = total_result.info_list[i].seat, score = total_result.info_list[i].total_score }
+        end
+        if total_result.info_list[i].settle_log.fangpao and total_result.info_list[i].settle_log.fangpao > bestPao.times then
+            bestPao = { seat = total_result.info_list[i].seat, times = total_result.info_list[i].settle_log.fangpao }
+        end
+    end
     for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
@@ -321,6 +333,16 @@ function M:fillResult1(room, peopleNum, total_result)
             totalInfoList.settle_log.fanggang or 0)
 
         resultInfoComp:GetController("win").selectedIndex = totalInfoList.total_score >= 0 and 1 or 0
+        if totalInfoList.seat == bigWin.seat then
+            resultInfoComp:GetController("bigWin").selectedIndex = 1
+            -- else
+            --     resultInfoComp:GetController("bigWin").selectedIndex = 0
+        end
+        if totalInfoList.seat == bestPao.seat then
+            resultInfoComp:GetController("fangPao").selectedIndex = 1
+            -- else
+            --     resultInfoComp:GetController("fangPao").selectedIndex = 0
+        end
     end
 end
 

wb_new_ui/assets/Common/MessageBox.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1182,552">
   <displayList>
-    <component id="n20_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500"/>
+    <component id="n20_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500" visible="false" touchable="false"/>
     <image id="n19_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="1182,552">
       <relation target="" sidePair="width-width,height-height"/>
     </image>

wb_new_ui/assets/Common/MessageBox1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1182,552">
   <displayList>
-    <component id="n19_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500"/>
+    <component id="n19_xblm" name="btn_close1" src="xblm7jbn" fileName="buttons/btn_bg.xml" xy="-909,-474" size="3000,1500" visible="false" touchable="false"/>
     <image id="n17_nuxq" name="bg" src="xblm7jbk" fileName="images/bg.png" xy="0,0" size="1182,552">
       <relation target="" sidePair="width-width,height-height"/>
     </image>

wb_new_ui/assets/Common/package.xml

@@ -1184,7 +1184,7 @@
     <misc id="h35o7im9" name="AlibabaPuHuiTi-3-95-ExtraBold.woff2" path="/font/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-95-ExtraBold/" exported="true"/>
     <font id="h35o7ima" name="AlibabaPuHuiTi-3-55-RegularL3.ttf" path="/font/AlibabaPuHuiTi-3/AlibabaPuHuiTi-3-55-RegularL3/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="n2h87imb" name="pop_oneChoose.xml" path="/" exported="true"/>
-    <component id="n2h87imc" name="btn_oneChoose.xml" path="/component/pop_oneChoose/"/>
+    <component id="n2h87imc" name="btn_oneChoose.xml" path="/component/pop_oneChoose/" exported="true"/>
     <image id="n2h87imd" name="提示@3x.png" path="/images/bg_oneChoose/"/>
     <image id="n2h87ime" name="Group 68@3x.png" path="/images/bg_oneChoose/"/>
     <image id="n2h87imf" name="Group 69@3x.png" path="/images/bg_oneChoose/"/>
@@ -2082,7 +2082,7 @@
     <image id="tx8e7jbh" name="1f4a4.png" path="/images/Emojies/" exported="true"/>
     <image id="tx8e7jbi" name="1f3c9.png" path="/images/Emojies/" exported="true"/>
     <image id="tx8e7jbj" name="1f539.png" path="/images/Emojies/" exported="true"/>
-    <image id="xblm7jbk" name="bg.png" path="/images/"/>
+    <image id="xblm7jbk" name="bg.png" path="/images/" exported="true"/>
     <image id="xblm7jbl" name="queren_btn1.png" path="/images/"/>
     <image id="xblm7jbm" name="bt_cancel1.png" path="/images/"/>
     <component id="xblm7jbn" name="btn_bg.xml" path="/buttons/" exported="true"/>

wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg(1).xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1992,102">
+  <displayList>
+    <image id="n0_k356" name="n0" src="66fw7d6v" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113"/>
+    <text id="n1_k356" name="tex_msg" xy="120,0" size="1332,102" font="ui://27vd145bh35o7ik0" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈"/>
+    <text id="n4_k356" name="tex_time" xy="1474,0" size="487,102" font="ui://27vd145bh35o7ik0" fontSize="42" align="right" vAlign="middle" autoSize="none" bold="true" text="2025-03-08 11:40:28"/>
+    <graph id="n5_k356" name="n5" xy="18,16" size="70,70" type="rect" lineSize="2" lineColor="#ff804b2e" corner="12"/>
+    <loader id="n2_k356" name="loader_icon" xy="18,16" size="70,70" url="ui://htcn7v3r66fw7d6w" align="center" vAlign="middle" fill="scale"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg_diamond.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1992,102">
+  <displayList>
+    <image id="n0_k356" name="n0" src="edxg7d5e" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_k356" name="tex_msg" xy="21,0" size="1563,102" font="Arial" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈">
+      <relation target="" sidePair="left-left"/>
+    </text>
+    <text id="n4_k356" name="tex_time" xy="1568,0" size="413,102" font="Arial" fontSize="42" align="right" vAlign="middle" autoSize="none" bold="true" text="2025-03-08 11:40:28">
+      <relation target="" sidePair="right-right"/>
+    </text>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgDiamond.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <image id="n9_hyws" name="n9" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n17_hyws">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n10_hyws" name="n10" src="jrro7cyd" fileName="Main/Image/bt_top.png" xy="0,0" group="n17_hyws">
+      <relation target="" sidePair="right-left,top-top,rightext-right"/>
+    </image>
+    <component id="n11_hyws" name="btn_quit" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
+    <image id="n13_hyws" name="n13" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1003,24" group="n16_hyws">
+      <relation target="n14_hyws" sidePair="left-left"/>
+    </image>
+    <text id="n14_hyws" name="n14" xy="1120,27" size="292,94" group="n16_hyws" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="申请消息">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n15_hyws" name="n15" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1466,24" group="n16_hyws" flip="hz">
+      <relation target="n14_hyws" sidePair="right-right"/>
+    </image>
+    <group id="n16_hyws" name="n16" xy="1003,24" size="526,99" group="n17_hyws" advanced="true"/>
+    <group id="n17_hyws" name="bg" xy="0,0" size="2532,1170"/>
+    <image id="n18_66fw" name="n18" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="226,140" size="2080,1005"/>
+    <image id="n19_66fw" name="n19" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="241,153" size="2050,978"/>
+    <list id="n4_k356" name="list_msg" xy="264,171" size="1997,956" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3r66fw7d6u" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml

@@ -7,7 +7,7 @@
     <image id="n10_hyws" name="n10" src="jrro7cyd" fileName="Main/Image/bt_top.png" xy="0,0" group="n17_hyws">
       <relation target="" sidePair="right-left,top-top,rightext-right"/>
     </image>
-    <component id="n11_hyws" name="btn_quit" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
+    <component id="n11_hyws" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
     <image id="n13_hyws" name="n13" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1003,24" group="n16_hyws">
       <relation target="n14_hyws" sidePair="left-left"/>
     </image>
@@ -19,9 +19,15 @@
     </image>
     <group id="n16_hyws" name="n16" xy="1003,24" size="526,99" group="n17_hyws" advanced="true"/>
     <group id="n17_hyws" name="bg" xy="0,0" size="2532,1170"/>
-    <image id="n3_k356" name="n3" src="edxg7d5g" fileName="FamilyMsgRecord/Iamge/Rectangle 291.png" xy="225,174" size="2076,984"/>
+    <image id="n18_66fw" name="n18" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="226,140" size="2080,1005">
-    <image id="n2_k356" name="n2" src="edxg7d5f" fileName="FamilyMsgRecord/Iamge/Rectangle 290.png" xy="243,192" size="2040,948"/>
+      <relation target="" sidePair="width-width%,height-height%"/>
-    <list id="n4_k356" name="list_msg" xy="264,208" size="1997,919" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3redxg7d5d" align="center" autoClearItems="true">
+    </image>
+    <image id="n19_66fw" name="n19" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="241,153" size="2050,978">
+      <relation target="n18_66fw" sidePair="rightext-right,topext-top,bottomext-bottom,leftext-left"/>
+    </image>
+    <list id="n4_k356" name="list_msg" xy="249,171" size="2034,956" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3r66fw7d6z" align="center" autoClearItems="true">
+      <relation target="n19_66fw" sidePair="bottomext-bottom"/>
+      <relation target="" sidePair="width-width%,top-top"/>
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Family/package.xml

@@ -413,6 +413,12 @@
     <image id="ofwa7d6o" name="hall_club_BG_landiyuan.png" path="/Main/Image/" scale="9grid" scale9grid="16,16,44,4"/>
     <image id="l9ll7d6r" name="Slice 1.png" path="/ChatRoom/Component/"/>
     <image id="l9ll7d6t" name="Slice 1.png" path="/NumberRecord/Component/"/>
+    <component id="66fw7d6u" name="item_msg(1).xml" path="/FamilyMsgRecord/Component/" exported="true"/>
+    <image id="66fw7d6v" name="Group 650(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="25,22,54,59"/>
+    <image id="66fw7d6w" name="Rectangle 290(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,21,40,42"/>
+    <image id="66fw7d6x" name="Rectangle 291(1).png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="21,22,42,44"/>
+    <component id="66fw7d6y" name="com_FamilyMsgDiamond.xml" path="/FamilyMsgRecord/" exported="true"/>
+    <component id="66fw7d6z" name="item_msg_diamond.xml" path="/FamilyMsgRecord/Component/" exported="true"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Lobby/NumberRecord/Component/btn_lookRecord.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="180,66" extention="Button">
+<component size="180,66" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n3_qz7i" name="n3" xy="0,0" size="180,66" type="rect"/>
+    <image id="n5_66fw" name="n5" src="66fw7d6p" fileName="component/Record/Image/Record14.png" xy="0,0" size="180,66">
-    <text id="n4_qz7i" name="n4" xy="52,8" size="76,49" fontSize="36" bold="true" text="查看">
+      <relation target="" sidePair="width-width,height-height"/>
-      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
-    </text>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.2"/>
 </component>

wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml

@@ -1,32 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="2233,120">
+<component size="2395,203">
   <controller name="seleted" pages="0,,1," selected="0"/>
+  <controller name="win" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_jrro" name="n0" src="jrro7cyq" fileName="NumberRecord/Component/Multiple_choose.xml" xy="39,27">
+    <image id="n14_66fw" name="n14" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="0,0" size="2395,203"/>
-      <Button controller="seleted" page="1"/>
+    <image id="n16_66fw" name="n16" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="277,18" size="4,166"/>
-    </component>
+    <image id="n17_66fw" name="n17" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="497,18" size="4,166"/>
-    <graph id="n1_jrro" name="n1" xy="144,8" size="2,100" type="rect"/>
+    <image id="n18_66fw" name="n18" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1888,18" size="4,166"/>
-    <text id="n2_jrro" name="text_gameName" xy="172,37" size="184,42" fontSize="30" text="五个字的游戏">
+    <image id="n19_66fw" name="n19" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="951,18" size="4,166"/>
+    <image id="n20_66fw" name="n20" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="719,18" size="4,166"/>
+    <image id="n21_66fw" name="n21" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="2179,18" size="4,166"/>
+    <text id="n2_jrro" name="text_gameName" xy="46,71" size="187,56" font="Arial" fontSize="42" color="#ff6f06" letterSpacing="5" autoClearText="true" text="黎川麻将">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <graph id="n3_jrro" name="n3" xy="382,8" size="2,100" type="rect"/>
+    <text id="n6_jrro" name="text_roomID" xy="746,67" size="181,64" font="Arial" fontSize="48" color="#6d2f00" letterSpacing="3" autoClearText="true" text="804850">
-    <text id="n4_jrro" name="text_time" xy="390,23" size="134,70" fontSize="26" text="2025-05-19&#xA;14:23:01"/>
-    <graph id="n5_jrro" name="n5" xy="530,8" size="2,100" type="rect"/>
-    <text id="n6_jrro" name="text_roomID" xy="548,37" size="140,42" fontSize="30" text="12345678">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <graph id="n7_jrro" name="n7" xy="704,8" size="2,100" type="rect"/>
+    <text id="n25_66fw" name="text_score" xy="576,65" size="71,72" font="Arial" fontSize="54" color="#0908fd" letterSpacing="5" autoClearText="true" text="+4">
-    <text id="n8_jrro" name="text_userDiamond" xy="724,37" size="55,42" fontSize="30" text="999">
+      <gearColor controller="win" pages="0" values="#0908fd,#000000" default="#ff0000,#000000"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <graph id="n9_jrro" name="n9" xy="797,8" size="2,100" type="rect"/>
+    <text id="n24_66fw" name="text_time1" xy="1947,53" size="206,93" font="Arial" fontSize="40" color="#6d2f00" align="center" vAlign="middle" leading="-10" autoClearText="true" text="2025-09-08&#xA;14:34:22">
-    <graph id="n11_jrro" name="n11" xy="2019,10" size="2,100" type="rect"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
-    <component id="n12_jrro" name="btn_lookRecord" src="jrro7cys" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2042,27"/>
+    </text>
-    <list id="n13_jrro" name="list" xy="830,0" size="1158,120" layout="row" overflow="scroll" scroll="horizontal" colGap="34" defaultItem="ui://2d9xdj6zjrro7cyt" autoClearItems="true">
+    <component id="n12_jrro" name="btn_lookRecord" src="jrro7cys" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2239,69" size="92,65"/>
+    <list id="n13_jrro" name="list" xy="957,9" size="931,182" layout="flow_hz" lineGap="32" colGap="3" defaultItem="ui://2d9xdj6zjrro7cyt" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <image id="n22_66fw" name="n22" src="66fw7d6o" fileName="component/Record/Image/Record13.png" xy="298,42" size="175,120">
+      <gearDisplay controller="win" pages="1"/>
+    </image>
+    <image id="n23_66fw" name="n23" src="66fw7d6n" fileName="component/Record/Image/Record12.png" xy="298,42" size="175,120">
+      <gearDisplay controller="win" pages="0"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailResultChild.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="260,120">
+<component size="457,47">
-  <controller name="colour" pages="0,,1," selected="1"/>
+  <controller name="colour" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_jrro" name="btn_head" src="jrro7cyu" fileName="Main/Component/btn_head.xml" xy="39,46" size="72,72"/>
+    <graph id="n3_66fw" name="n3" xy="0,0" size="457,47" type="rect" lineSize="0" fillColor="#0d000000"/>
-    <text id="n1_jrro" name="text_score" xy="116,61" size="142,42" fontSize="30" color="#ff0000" autoSize="shrink" text="+999999">
+    <text id="n1_jrro" name="text_score" xy="272,-1" size="185,49" font="Arial" fontSize="36" color="#0908fd" autoSize="none" text="+1234567890">
-      <gearColor controller="colour" pages="0,1" values="#00ff00,#000000|#ff0000,#000000"/>
+      <gearColor controller="colour" pages="0,1" values="#0908fd,#000000|#ff0000,#000000"/>
-      <relation target="n0_jrro" sidePair="left-left"/>
+      <relation target="" sidePair="width-width%,height-height%,right-right"/>
+    </text>
+    <text id="n2_jrro" name="text_name" xy="-1,-3" size="257,54" font="Arial" fontSize="36" color="#6d2f00" align="right" autoSize="none" text="超级长的名字张曼">
+      <relation target="" sidePair="width-width%,height-height%,left-left"/>
     </text>
-    <text id="n2_jrro" name="text_name" xy="-1,0" size="259,42" fontSize="30" autoSize="ellipsis" text="超级长的名字张曼"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/PlayerInfo.xml

@@ -1,36 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1500,876" bgColor="#f8f4ea">
+<component size="1350,660" bgColor="#f8f4ea">
   <controller name="type" pages="0,show,1,change" selected="0"/>
   <controller name="group_sex" pages="0,women,1,men" selected="0"/>
   <controller name="bind" pages="0,no,1,yes" selected="0"/>
   <displayList>
-    <image id="n0_in3i" name="n0" src="in3i7ctc" fileName="component/PlayerInfo/Image/Rectangle 39@3x.png" xy="0,0" group="n8_in3i"/>
+    <image id="n52_66fw" name="n52" src="66fw7d6b" fileName="component/PlayerInfo/Image/bg.png" xy="0,0" size="1350,660" group="n8_in3i"/>
-    <graph id="n4_in3i" name="n4" xy="30,30" size="1440,816" group="n8_in3i" type="rect" lineSize="0" fillColor="#ffc8ae5a" corner="60"/>
+    <group id="n8_in3i" name="bg" xy="0,0" size="1350,660"/>
-    <image id="n7_in3i" name="n7" src="in3i7cto" fileName="component/PlayerInfo/Image/Group 93@3x.png" xy="30,30" group="n8_in3i"/>
+    <component id="n15_in3i" name="btn_headChange" src="in3i7ctq" fileName="component/PlayerInfo/Component/btn_headChange.xml" xy="369,378" group="n14_in3i" visible="false" touchable="false">
-    <image id="n2_in3i" name="n2" src="in3i7ct6" fileName="component/PlayerInfo/Image/Group 68@3x.png" xy="30,30" group="n8_in3i"/>
-    <image id="n3_in3i" name="n3" src="in3i7cte" fileName="component/PlayerInfo/Image/title.png" xy="580,68" group="n8_in3i"/>
-    <group id="n8_in3i" name="bg" xy="0,0" size="1500,876"/>
-    <graph id="n10_in3i" name="n10" xy="171,237" size="438,438" group="n14_in3i" type="rect" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="42"/>
-    <graph id="n12_in3i" name="n12" xy="189,255" size="402,402" group="n14_in3i" type="rect" lineColor="#ff804b2e" fillColor="#00ffffff" corner="42"/>
-    <component id="n51_in3i" name="btn_PlayerHead" src="in3i7ctv" fileName="component/PlayerInfo/Component/btn_PlayerHead.xml" xy="189,255" group="n14_in3i"/>
-    <component id="n15_in3i" name="btn_headChange" src="in3i7ctq" fileName="component/PlayerInfo/Component/btn_headChange.xml" xy="489,558" group="n14_in3i" touchable="false">
       <gearDisplay controller="type" pages="1"/>
       <gearLook controller="type" pages="0,1" values="1,0,0,0|1,0,0,1"/>
     </component>
-    <group id="n14_in3i" name="head" xy="171,237" size="438,438"/>
+    <component id="n51_in3i" name="btn_PlayerHead" src="in3i7ctv" fileName="component/PlayerInfo/Component/btn_PlayerHead.xml" xy="105,172" size="374,304" group="n14_in3i">
-    <text id="n17_in3i" name="name" xy="748,240" size="328,64" group="n27_in3i" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#61270f" letterSpacing="6" text="用户名称1212"/>
+      <relation target="n53_66fw" sidePair="center-center,middle-middle"/>
-    <text id="n18_in3i" name="n18" xy="750,322" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="性别:"/>
+    </component>
-    <text id="n19_in3i" name="sex" xy="889,322" size="52,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="男"/>
+    <image id="n53_66fw" name="n53" src="66fw7d6a" fileName="component/PlayerInfo/Image/head_frame.png" xy="105,170" size="375,315" group="n14_in3i">
-    <text id="n24_in3i" name="n24" xy="750,592" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="手机:"/>
+      <relation target="" sidePair="left-left,top-top"/>
-    <text id="n25_in3i" name="phone" xy="896,596" size="265,56" group="n27_in3i" font="SimHei" fontSize="42" color="#61270f" align="center" letterSpacing="3" text="12345678945"/>
+    </image>
-    <component id="n26_in3i" name="btn_changeInfo" src="in3i7ctf" fileName="component/PlayerInfo/Component/btn_changeInfo.xml" xy="750,687" group="n27_in3i"/>
+    <group id="n14_in3i" name="head" xy="105,170" size="375,315"/>
-    <text id="n20_in3i" name="n20" xy="750,412" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="编号:"/>
+    <text id="n17_in3i" name="name" xy="608,168" size="106,64" group="n27_in3i" font="FZCuYuan-M03" fontSize="48" color="#61270f" letterSpacing="6" text="你好">
-    <text id="n21_in3i" name="id" xy="891,412" size="163,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="3" text="123123"/>
+      <relation target="" sidePair="left-left,top-top"/>
-    <text id="n22_in3i" name="n22" xy="750,502" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="房卡:"/>
+    </text>
-    <text id="n23_in3i" name="diamo" xy="891,502" size="55,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="3" text="20"/>
+    <text id="n18_in3i" name="n18" xy="607,361" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="性别:">
-    <group id="n27_in3i" name="show" xy="748,240" size="411,516" advanced="true">
+      <relation target="n22_in3i" sidePair="top-top,top-bottom"/>
+      <relation target="" sidePair="left-left"/>
+    </text>
+    <text id="n19_in3i" name="sex" xy="769,362" size="52,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="男">
+      <relation target="n18_in3i" sidePair="left-right"/>
+      <relation target="n23_in3i" sidePair="top-bottom"/>
+    </text>
+    <text id="n24_in3i" name="n24" xy="606,420" size="140,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="8" text="手机:">
+      <relation target="" sidePair="left-left"/>
+      <relation target="n18_in3i" sidePair="top-bottom"/>
+    </text>
+    <text id="n25_in3i" name="phone" xy="770,426" size="116,59" group="n27_in3i" font="SimHei" fontSize="44" color="#61270f" align="center" letterSpacing="8" text="1314">
+      <relation target="n24_in3i" sidePair="left-right"/>
+      <relation target="n19_in3i" sidePair="top-bottom"/>
+    </text>
+    <component id="n26_in3i" name="btn_changeInfo" src="in3i7ctf" fileName="component/PlayerInfo/Component/btn_changeInfo.xml" xy="108,498" size="360,114" group="n27_in3i">
+      <relation target="n53_66fw" sidePair="center-center,top-bottom"/>
+    </component>
+    <text id="n20_in3i" name="n20" xy="607,235" size="136,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="6" text="编号:">
+      <relation target="" sidePair="left-left"/>
+      <relation target="n17_in3i" sidePair="top-bottom"/>
+    </text>
+    <text id="n21_in3i" name="id" xy="768,235" size="88,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="6" text="137">
+      <relation target="n20_in3i" sidePair="left-right"/>
+      <relation target="n17_in3i" sidePair="top-bottom"/>
+    </text>
+    <text id="n22_in3i" name="n22" xy="608,297" size="130,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" letterSpacing="3" text="房卡:">
+      <relation target="" sidePair="left-left"/>
+      <relation target="n20_in3i" sidePair="top-bottom"/>
+    </text>
+    <text id="n23_in3i" name="diamo" xy="768,297" size="55,64" group="n27_in3i" font="SimHei" fontSize="48" color="#61270f" align="center" letterSpacing="3" text="20">
+      <relation target="n22_in3i" sidePair="left-right"/>
+      <relation target="n21_in3i" sidePair="top-bottom"/>
+    </text>
+    <group id="n27_in3i" name="show" xy="108,168" size="778,444" advanced="true">
       <gearDisplay controller="type" pages="0"/>
     </group>
+    <component id="n55_66fw" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1241,-33" size="135,124"/>
     <graph id="n28_in3i" name="n28" xy="729,237" size="288,66" group="n49_in3i" type="rect" lineSize="0" fillColor="#fff8f4ea" corner="12"/>
     <component id="n31_in3i" name="Lable_name" src="in3i7ctr" fileName="component/PlayerInfo/Component/Lable_name.xml" xy="747,246" group="n49_in3i"/>
     <image id="n32_in3i" name="n32" src="in3i7ct3" fileName="component/PlayerInfo/Image/Frame@3x.png" xy="1029,249" group="n49_in3i"/>

wb_new_ui/assets/Lobby/Record.xml

@@ -1,29 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
+  <controller name="detail" pages="0,,1," selected="0"/>
+  <controller name="showLook" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_n2h8" name="n0" src="n2h87csq" fileName="component/Record/Image/Rectangle 90@3x.png" xy="0,0" group="n12_n2h8"/>
+    <image id="n19_66fw" name="n19" src="66fw7d6t" fileName="component/Record/Image/CommonRes_8.png" xy="0,0" size="2532,1170">
-    <image id="n1_n2h8" name="n1" src="n2h87csr" fileName="component/Record/Image/Rectangle 92@3x.png" xy="6,6" group="n12_n2h8"/>
+      <relation target="" sidePair="width-width,height-height"/>
-    <image id="n2_n2h8" name="n2" src="n2h87css" fileName="component/Record/Image/Rectangle 96@3x.png" xy="48,204" group="n12_n2h8"/>
+    </image>
-    <image id="n3_n2h8" name="n3" src="n2h87cst" fileName="component/Record/Image/Rectangle 97@3x.png" xy="78,234" group="n12_n2h8"/>
+    <image id="n20_66fw" name="n20" src="66fw7d6q" fileName="component/Record/Image/title_bg.png" xy="0,0" size="2532,169">
-    <image id="n4_n2h8" name="n4" src="n2h87csu" fileName="component/Record/Image/战绩@3x.png" xy="1179,65" group="n12_n2h8"/>
+      <relation target="" sidePair="width-width%,height-height%,top-top"/>
-    <text id="n5_n2h8" name="game" xy="150,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="游戏"/>
+    </image>
-    <text id="n6_n2h8" name="result" xy="372,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="结果"/>
+    <image id="n29_66fw" name="n29" src="66fw7d6r" fileName="component/Record/Image/CommonRes_2.png" xy="26,160" size="2480,991">
-    <text id="n7_n2h8" name="score" xy="594,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="分数"/>
+      <relation target="" sidePair="width-width%,height-height%,left-center,right-center,top-top"/>
-    <text id="n8_n2h8" name="room_id" xy="815,259" size="168,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="房间号"/>
+    </image>
-    <text id="n9_n2h8" name="result" xy="1401,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="结算"/>
+    <image id="n22_66fw" name="n22" src="66fw7d6u" fileName="component/Record/Image/Garde_2.png" xy="1141,22" size="245,87">
-    <text id="n10_n2h8" name="time" xy="2037,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="时间"/>
+      <relation target="" sidePair="left-center,right-center,top-top%"/>
-    <text id="n11_n2h8" name="re" xy="2274,259" size="109,64" group="n13_n2h8" font="ui://27vd145bh35o7il1" fontSize="48" color="#996022" letterSpacing="11" text="回放"/>
+    </image>
-    <group id="n13_n2h8" name="title" xy="150,259" size="2233,64" group="n12_n2h8" visible="false" advanced="true"/>
+    <component id="n14_n2h8" name="btn_close" src="n2h87csv" fileName="component/Record/Component/btn_close.xml" xy="14,6" size="142,126" group="n16_n2h8">
-    <group id="n12_n2h8" name="bg" xy="0,0" size="2532,1170"/>
+      <relation target="" sidePair="left-left,top-top"/>
-    <component id="n14_n2h8" name="btn_close" src="n2h87csv" fileName="component/Record/Component/btn_close.xml" xy="48,42" size="126,126" group="n16_n2h8"/>
+    </component>
-    <component id="n15_n2h8" name="btn_lookOther" src="n2h87csw" fileName="component/Record/Component/btn_lookOther.xml" xy="2052,48" group="n16_n2h8"/>
+    <component id="n15_n2h8" name="btn_lookOther" src="n2h87csw" fileName="component/Record/Component/btn_lookOther.xml" xy="2044,6" size="455,124" group="n16_n2h8">
-    <group id="n16_n2h8" name="top" xy="48,42" size="2436,126"/>
+      <gearDisplay controller="detail" pages="0"/>
-    <component id="n17_jrro" name="n17" src="jrro7cyo" fileName="NumberRecord/Component/comp_numberRecordDetailChildTitle.xml" xy="138,258"/>
+      <relation target="" sidePair="right-right,top-top"/>
-    <list id="n18_jrro" name="list_numberRecordDetail" xy="138,378" size="2233,680" overflow="scroll" lineGap="8" defaultItem="ui://2d9xdj6zjrro7cyp">
+    </component>
+    <group id="n16_n2h8" name="top" xy="14,6" size="2485,126"/>
+    <text id="n5_n2h8" name="game" xy="164,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="游戏"/>
+    <text id="n6_n2h8" name="result" xy="397,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="结果"/>
+    <text id="n7_n2h8" name="score" xy="616,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="分数"/>
+    <text id="n8_n2h8" name="room_id" xy="815,189" size="158,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="房间号"/>
+    <text id="n9_n2h8" name="result" xy="1410,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="结算"/>
+    <text id="n10_n2h8" name="time" xy="2044,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="时间"/>
+    <text id="n11_n2h8" name="re" xy="2288,189" size="105,64" group="n13_n2h8" font="Arial" fontSize="48" color="#a16115" letterSpacing="5" text="回放"/>
+    <text id="n24_66fw" name="n24" xy="1139,1082" size="251,46" group="n13_n2h8" font="Arial" fontSize="34" letterSpacing="4" text="录像会保存5天">
+      <relation target="" sidePair="bottom-bottom"/>
+    </text>
+    <group id="n13_n2h8" name="title" xy="164,189" size="2229,939" group="n25_66fw" advanced="true"/>
+    <list id="n18_jrro" name="list_numberRecordDetail" xy="68,260" size="2397,820" group="n25_66fw" overflow="scroll" lineGap="8" defaultItem="ui://2d9xdj6zjrro7cyp">
+      <relation target="" sidePair="width-width%,height-height%"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <group id="n25_66fw" name="detail0" xy="68,189" size="2397,939" advanced="true">
+      <gearDisplay controller="detail" pages="0"/>
+    </group>
+    <image id="n33_66fw" name="n33" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="61,265" size="2410,860" group="n30_66fw"/>
+    <text id="n28_66fw" name="n28" xy="92,199" size="89,54" group="n32_66fw" font="Arial" fontSize="40" color="#a16115" letterSpacing="5" text="序号"/>
+    <text id="n31_66fw" name="n31" xy="219,198" size="179,54" group="n32_66fw" font="Arial" fontSize="40" color="#a16115" letterSpacing="5" text="对战时间"/>
+    <group id="n32_66fw" name="detail1_title" xy="92,198" size="306,55" group="n30_66fw"/>
+    <list id="n34_66fw" name="detail1_list_playerName" xy="416,185" size="1502,80" group="n30_66fw" layout="flow_hz" lineItemCount="4" defaultItem="ui://2d9xdj6z66fw7d72" autoItemSize="true" autoClearItems="true">
+      <item title="jefe"/>
+      <item title="奥利奥生活号"/>
+      <item title="你好~凌梦"/>
+    </list>
+    <list id="n36_66fw" name="detail1_list_main" xy="61,265" size="2410,860" group="n30_66fw" overflow="scroll" defaultItem="ui://2d9xdj6z66fw7d73">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n30_66fw" name="detail1" xy="61,185" size="2410,940" advanced="true">
+      <gearDisplay controller="detail" pages="1"/>
+    </group>
+    <graph id="n37_66fw" name="n37" xy="0,0" size="2532,1170" group="n38_66fw" type="rect" lineSize="0" fillColor="#4c000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n39_66fw" name="n39" src="xblm7jbk" fileName="images/bg.png" pkg="27vd145b" xy="675,309" size="1182,552" group="n38_66fw"/>
+    <component id="n40_66fw" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1762,267" size="122,129" group="n38_66fw">
+      <Button controller="showLook" page="0"/>
+    </component>
+    <text id="n41_66fw" name="n41" xy="1040,445" size="451,94" group="n38_66fw" font="Arial" fontSize="72" color="#a16115" letterSpacing="3" text="请输入回放码"/>
+    <image id="n42_66fw" name="n42" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="912,551" size="707,99" group="n38_66fw"/>
+    <component id="n43_66fw" name="btn_send" src="n2h87imc" fileName="component/pop_oneChoose/btn_oneChoose.xml" pkg="27vd145b" xy="1061,678" group="n38_66fw">
+      <Button icon="ui://27vd145bn2h87imi"/>
+    </component>
+    <text id="n44_66fw" name="input_recordId" xy="919,550" size="694,94" group="n38_66fw" fontSize="72" color="#a16115" letterSpacing="3" autoSize="none" autoClearText="true" text="012" input="true"/>
+    <group id="n38_66fw" name="lookOther" xy="0,0" size="2532,1170" advanced="true">
+      <gearDisplay controller="showLook" pages="1"/>
+    </group>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/Shop.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1843,910">
+<component size="1840,915">
   <displayList>
-    <image id="n6_h35o" name="n6" src="koxj7crb" fileName="component/Shop/Image/Group 69@3x.png" xy="30,45" group="n8_h35o"/>
+    <image id="n13_66fw" name="n13" src="66fw7d6g" fileName="component/Shop/Image/bg.png" xy="0,0" size="1840,915" group="n8_h35o"/>
-    <image id="n7_h35o" name="n7" src="koxj7cre" fileName="component/Shop/Image/Rectangle 39@3x.png" xy="0,0" group="n8_h35o"/>
+    <group id="n8_h35o" name="bg" xy="0,0" size="1840,915"/>
-    <image id="n5_h35o" name="n5" src="koxj7cra" fileName="component/Shop/Image/Group 68@3x.png" xy="30,30" group="n8_h35o"/>
+    <list id="n12_h35o" name="main" xy="45,200" size="1740,580" layout="row" overflow="scroll" scroll="horizontal" colGap="19" defaultItem="ui://2d9xdj6zkoxj7crf" vAlign="middle">
-    <image id="n9_h35o" name="n9" src="h35o7cry" fileName="component/Shop/Image/shop_title.png" xy="667,68" group="n8_h35o"/>
+      <item/>
-    <group id="n8_h35o" name="bg" xy="0,0" size="1500,876"/>
+      <item/>
-    <list id="n12_h35o" name="main" xy="56,210" size="1392,582" layout="row" overflow="scroll" scroll="horizontal" colGap="30" vAlign="middle"/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n14_66fw" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1737,-29" size="135,124"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/component/PlayerInfo/Component/btn_PlayerHead.xml

@@ -2,8 +2,12 @@
 <component size="402,402" extention="Button" mask="n4_in3i">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n4_in3i" name="mask" xy="1,1" size="400,400" type="rect" lineSize="0" corner="42"/>
+    <graph id="n4_in3i" name="mask" xy="1,1" size="400,400" type="rect" lineSize="0" corner="42">
-    <loader id="n6_in3i" name="icon" xy="1,1" size="400,400" fill="scaleNoBorder"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <loader id="n6_in3i" name="icon" xy="1,1" size="400,400" url="ui://2d9xdj6zin3i7ct5" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/Lobby/component/PlayerInfo/Component/btn_changeInfo.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="204,69" extention="Button">
+<component size="204,69" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_in3i" name="n3" src="in3i7ctg" fileName="component/PlayerInfo/Image/changeInfo.png" xy="-12,-16"/>
+    <image id="n4_66fw" name="n4" src="66fw7d6c" fileName="component/PlayerInfo/Image/btn3.png" xy="0,0" size="204,69">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Lobby/component/Record/Component/btn_close.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="126,126" extention="Button">
+<component size="126,126" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_n2h8" name="n3" src="n2h87cso" fileName="component/Record/Image/Group 83@3x.png" xy="-7,-7"/>
+    <image id="n4_66fw" name="n4" src="66fw7d6s" fileName="component/Record/Image/CommonRes_4.png" xy="0,0" size="126,126">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Lobby/component/Record/Component/btn_lookOther.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="432,114" extention="Button">
+<component size="432,114" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n6_n2h8" name="n6" src="n2h87csp" fileName="component/Record/Image/Group 84@3x.png" xy="-12,-14"/>
+    <image id="n8_66fw" name="n8" src="66fw7d6k" fileName="component/Record/Image/Record04.png" xy="0,0" size="432,114">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Lobby/component/Record/Component/btn_normol.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_66fw" name="icon" xy="0,0" size="100,20" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button downEffect="scale" downEffectValue="1.1"/>
+</component>

wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2410,148" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n4_66fw" name="n4" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="137,12" size="4,124"/>
+    <image id="n5_66fw" name="n5" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1851,12" size="4,124"/>
+    <image id="n6_66fw" name="n6" src="66fw7d6x" fileName="component/Record/Image/Record03.png" xy="9,142" size="2374,6"/>
+    <text id="n7_66fw" name="text_index" xy="58,45" size="30,62" font="Arial" fontSize="46" color="#6d2f00" text="2">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n8_66fw" name="text_time" xy="167,30" size="173,94" font="Arial" fontSize="38" color="#6d2f00" align="center" vAlign="middle" leading="-5" letterSpacing="3" text="09-08&#xA;17:04:33">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n9_66fw" name="btn_share" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="1870,22" size="255,111">
+      <Button icon="ui://2d9xdj6z66fw7d6m"/>
+    </component>
+    <component id="n10_66fw" name="btn_lookBack" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2136,22" size="255,111">
+      <Button icon="ui://2d9xdj6z66fw7d6l"/>
+    </component>
+    <list id="n11_66fw" name="list_playerScore" xy="352,-2" size="1497,148" layout="flow_hz" lineItemCount="4" defaultItem="ui://2d9xdj6z66fw7d77" autoItemSize="true">
+      <item title="-1"/>
+      <item title="-7"/>
+      <item title="+8"/>
+    </list>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Lobby/component/Record/Component/listChild_playerName.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,80" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n3_66fw" name="title" xy="0,0" size="100,80" font="Arial" fontSize="34" color="#a16115" align="center" vAlign="middle" letterSpacing="3" autoSize="none" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Lobby/component/Record/Component/listChild_playerScore.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,148" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n3_66fw" name="title" xy="0,0" size="100,148" font="Arial" fontSize="48" color="#a16115" align="center" vAlign="middle" letterSpacing="3" autoSize="none" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n4_66fw" name="n4" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="0,12" size="4,124"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Lobby/component/Shop/Component/btn_buy.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="333,102" extention="Button">
+<component size="340,105" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_h35o" name="sprite" xy="-8,-10" size="350,122" url="ui://2d9xdj6zh35o7crw" clearOnPublish="true"/>
+    <image id="n5_66fw" name="n5" src="66fw7d6h" fileName="component/Shop/Image/button.png" xy="0,0" size="340,105">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n6_66fw" name="title" xy="71,5" size="199,86" font="Arial" fontSize="66" letterSpacing="6" text="300元">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Lobby/component/Shop/Component/c_shop_child.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="543,582" bgColor="#f1dbb2">
+<component size="550,580" pivot="0.5,0.5" extention="Button" bgColor="#f1dbb2">
   <displayList>
-    <graph id="n7_h35o" name="n7" xy="0,0" size="543,582" group="n8_h35o" type="rect" lineSize="0" fillColor="#fff1dbb2" corner="18"/>
+    <image id="n10_66fw" name="n10" src="66fw7d6e" fileName="component/Shop/Image/djbox.png" xy="0,0" size="550,580" group="n8_h35o"/>
-    <image id="n5_h35o" name="n5" src="koxj7crc" fileName="component/Shop/Image/Group 77@3x.png" xy="166,160" group="n8_h35o"/>
+    <group id="n8_h35o" name="bg" xy="0,0" size="550,580"/>
-    <image id="n3_h35o" name="n3" src="h35o7crx" fileName="component/Shop/Image/Rectangle 86@3x.png" xy="0,0" group="n8_h35o"/>
+    <text id="n6_h35o" name="title" xy="145,-5" size="266,94" font="Arial" fontSize="72" color="#a52a2a" align="center" vAlign="middle" leading="0" letterSpacing="2" text="2000 张">
-    <group id="n8_h35o" name="bg" xy="0,0" size="543,582"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
-    <text id="n6_h35o" name="num" xy="142,1" size="259,94" font="ui://27vd145bh35o7im7" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="2000 张">
-      <relation target="" sidePair="center-center,top-top"/>
     </text>
-    <component id="n9_h35o" name="btn_buy" src="h35o7crz" fileName="component/Shop/Component/btn_buy.xml" xy="104,402"/>
+    <image id="n12_66fw" name="n12" src="66fw7d6f" fileName="component/Shop/Image/roomCard.png" xy="151,170" size="253,177">
+      <relation target="" sidePair="left-center,right-center,top-middle,bottom-middle"/>
+    </image>
+    <component id="n9_h35o" name="btn_buy" src="h35o7crz" fileName="component/Shop/Component/btn_buy.xml" xy="105,414">
+      <relation target="" sidePair="center-center,bottom-bottom%"/>
+    </component>
   </displayList>
+  <Button/>
 </component>

wb_new_ui/assets/Lobby/package.xml

@@ -393,12 +393,6 @@
     <component id="tme17cr5" name="slider_vedio_grip.xml" path="/component/Setting/Component/"/>
     <component id="tme17cr6" name="slider_vedio.xml" path="/component/Setting/Component/"/>
     <component id="koxj7cr8" name="Shop.xml" path="/" exported="true"/>
-    <image id="koxj7cr9" name="Group 26@3x.png" path="/component/Shop/Image/"/>
-    <image id="koxj7cra" name="Group 68@3x.png" path="/component/Shop/Image/"/>
-    <image id="koxj7crb" name="Group 69@3x.png" path="/component/Shop/Image/"/>
-    <image id="koxj7crc" name="Group 77@3x.png" path="/component/Shop/Image/"/>
-    <image id="koxj7crd" name="Group 81@3x.png" path="/component/Shop/Image/"/>
-    <image id="koxj7cre" name="Rectangle 39@3x.png" path="/component/Shop/Image/"/>
     <component id="koxj7crf" name="c_shop_child.xml" path="/component/Shop/Component/" exported="true"/>
     <component id="lt1q7crg" name="btn_close.xml" path="/component/Shop/Component/"/>
     <image id="h35o7crm" name="Group 82@3x.png" path="/component/Setting/Image/"/>
@@ -406,10 +400,6 @@
     <image id="h35o7cro" name="image 26@3x(2).png" path="/component/Setting/Image/"/>
     <image id="h35o7crs" name="Vector@3x.png" path="/component/Setting/Image/"/>
     <image id="h35o7crt" name="设置@3x(1).png" path="/component/Setting/Image/"/>
-    <image id="h35o7cru" name="shop_buy_300.png" path="/component/Shop/Image/" exported="true"/>
-    <image id="h35o7crv" name="shop_buy_50.png" path="/component/Shop/Image/" exported="true"/>
-    <image id="h35o7crw" name="shop_buy_165.png" path="/component/Shop/Image/" exported="true"/>
-    <image id="h35o7crx" name="Rectangle 86@3x.png" path="/component/Shop/Image/"/>
     <image id="h35o7cry" name="shop_title.png" path="/component/Shop/Image/"/>
     <component id="h35o7crz" name="btn_buy.xml" path="/component/Shop/Component/"/>
     <component id="h35o7cs0" name="Authentication.xml" path="/" exported="true"/>
@@ -433,33 +423,22 @@
     <image id="n2h87csn" name="Group 75@3x.png" path="/component/Record/Image/"/>
     <image id="n2h87cso" name="Group 83@3x.png" path="/component/Record/Image/"/>
     <image id="n2h87csp" name="Group 84@3x.png" path="/component/Record/Image/"/>
-    <image id="n2h87csq" name="Rectangle 90@3x.png" path="/component/Record/Image/" atlas="alone"/>
-    <image id="n2h87csr" name="Rectangle 92@3x.png" path="/component/Record/Image/" atlas="alone"/>
-    <image id="n2h87css" name="Rectangle 96@3x.png" path="/component/Record/Image/" atlas="alone"/>
-    <image id="n2h87cst" name="Rectangle 97@3x.png" path="/component/Record/Image/" atlas="alone"/>
     <image id="n2h87csu" name="战绩@3x.png" path="/component/Record/Image/"/>
     <component id="n2h87csv" name="btn_close.xml" path="/component/Record/Component/"/>
     <component id="n2h87csw" name="btn_lookOther.xml" path="/component/Record/Component/"/>
     <image id="op0e7ct1" name="n202.png" path="/"/>
     <component id="in3i7ct2" name="PlayerInfo.xml" path="/" exported="true"/>
     <image id="in3i7ct3" name="Frame@3x.png" path="/component/PlayerInfo/Image/"/>
-    <image id="in3i7ct4" name="Group 26@3x.png" path="/component/PlayerInfo/Image/"/>
-    <image id="in3i7ct5" name="Group 47@3x.png" path="/component/PlayerInfo/Image/"/>
-    <image id="in3i7ct6" name="Group 68@3x.png" path="/component/PlayerInfo/Image/"/>
     <image id="in3i7ct8" name="Group 76@3x.png" path="/component/PlayerInfo/Image/"/>
     <image id="in3i7ct9" name="Group 77@3x.png" path="/component/PlayerInfo/Image/"/>
     <image id="in3i7cta" name="Group 80@3x.png" path="/component/PlayerInfo/Image/"/>
     <image id="in3i7ctb" name="Group 92@3x.png" path="/component/PlayerInfo/Image/"/>
-    <image id="in3i7ctc" name="Rectangle 39@3x.png" path="/component/PlayerInfo/Image/"/>
     <image id="in3i7ctd" name="Vector@3x.png" path="/component/PlayerInfo/Image/"/>
-    <image id="in3i7cte" name="title.png" path="/component/PlayerInfo/Image/"/>
     <component id="in3i7ctf" name="btn_changeInfo.xml" path="/component/PlayerInfo/Component/"/>
-    <image id="in3i7ctg" name="changeInfo.png" path="/component/PlayerInfo/Image/"/>
     <component id="in3i7cth" name="btn_changePhone.xml" path="/component/PlayerInfo/Component/"/>
     <component id="in3i7cti" name="btn_save.xml" path="/component/PlayerInfo/Component/"/>
     <component id="in3i7ctj" name="btn_cancel.xml" path="/component/PlayerInfo/Component/"/>
     <component id="in3i7ctk" name="Radio_sex.xml" path="/component/PlayerInfo/Component/"/>
-    <image id="in3i7cto" name="Group 93@3x.png" path="/component/PlayerInfo/Image/"/>
     <component id="in3i7ctq" name="btn_headChange.xml" path="/component/PlayerInfo/Component/"/>
     <component id="in3i7ctr" name="Lable_name.xml" path="/component/PlayerInfo/Component/"/>
     <component id="in3i7cts" name="Lable_phone.xml" path="/component/PlayerInfo/Component/"/>
@@ -619,6 +598,32 @@
     <image id="kikc7d67" name="result_tips_bg.png" path="/component/notice_old/"/>
     <component id="ofwa7d68" name="com_notice.xml" path="/component/Main/Component/notice/"/>
     <image id="ofwa7d69" name="result_tips_bg.png" path="/component/Main/Component/notice/notice_old/"/>
+    <image id="66fw7d6a" name="head_frame.png" path="/component/PlayerInfo/Image/"/>
+    <image id="66fw7d6b" name="bg.png" path="/component/PlayerInfo/Image/"/>
+    <image id="66fw7d6c" name="btn3.png" path="/component/PlayerInfo/Image/"/>
+    <image id="66fw7d6e" name="djbox.png" path="/component/Shop/Image/"/>
+    <image id="66fw7d6f" name="roomCard.png" path="/component/Shop/Image/"/>
+    <image id="66fw7d6g" name="bg.png" path="/component/Shop/Image/"/>
+    <image id="66fw7d6h" name="button.png" path="/component/Shop/Image/"/>
+    <image id="66fw7d6k" name="Record04.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6l" name="Record05.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6m" name="Record06.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6n" name="Record12.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6o" name="Record13.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6p" name="Record14.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6q" name="title_bg.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6r" name="CommonRes_2.png" path="/component/Record/Image/" scale="9grid" scale9grid="310,148,620,296"/>
+    <image id="66fw7d6s" name="CommonRes_4.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6t" name="CommonRes_8.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6u" name="Garde_2.png" path="/component/Record/Image/"/>
+    <image id="66fw7d6v" name="Recharge_2.png" path="/component/Record/Image/" scale="9grid" scale9grid="158,22,316,44"/>
+    <image id="66fw7d6w" name="Record02.png" path="/component/Record/Image/" scale9grid="0,30,0,60"/>
+    <image id="66fw7d6x" name="Record03.png" path="/component/Record/Image/" scale9grid="16,0,89,0"/>
+    <component id="66fw7d72" name="listChild_playerName.xml" path="/component/Record/Component/"/>
+    <component id="66fw7d73" name="listChild_detailMain.xml" path="/component/Record/Component/"/>
+    <image id="66fw7d74" name="Slice 4.png" path="/component/Record/Component/"/>
+    <component id="66fw7d75" name="btn_normol.xml" path="/component/Record/Component/"/>
+    <component id="66fw7d77" name="listChild_playerScore.xml" path="/component/Record/Component/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml

@@ -108,7 +108,7 @@
       <item/>
     </list>
     <loader id="n68_jzul" name="loader_selfHuCardEffect" xy="2052,584" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
-    <movieclip id="n69_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="2052,584" pivot="0.5,0.5" anchor="true" visible="false" playing="false">
+    <movieclip id="n69_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="2052,584" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n68_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml

@@ -86,7 +86,7 @@
       <item/>
     </list>
     <loader id="n55_jzul" name="loader_selfHuCardEffect" xy="1266,243" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle"/>
-    <movieclip id="n56_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,243" pivot="0.5,0.5" anchor="true" visible="false" playing="false">
+    <movieclip id="n56_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,243" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n55_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml

@@ -90,7 +90,7 @@
     <loader id="n59_jzul" name="loader_selfHuCardEffect" xy="1266,778" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle" fill="scale">
       <relation target="" sidePair="left-center,right-center,bottom-bottom"/>
     </loader>
-    <movieclip id="n60_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,778" pivot="0.5,0.5" anchor="true" visible="false" playing="false">
+    <movieclip id="n60_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,778" pivot="0.5,0.5" anchor="true" size="530,383" aspect="true" visible="false" playing="false">
       <relation target="n59_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
     <list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml

@@ -91,7 +91,7 @@
       <item/>
     </list>
     <loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,584" pivot="0.5,0.5" anchor="true" size="280,220" align="center" vAlign="middle"/>
-    <movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,584" pivot="0.5,0.5" anchor="true" visible="false" playing="false">
+    <movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,584" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n67_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
   </displayList>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1018,7 +1018,7 @@
     <image id="u6331a4" name="button_desk.png" path="/Main_new/Main/Image/"/>
     <image id="xblm1a6" name="di.png" path="/Main_new/Main/Image/"/>
     <image id="xblm1a7" name="di2.png" path="/Main_new/Main/Image/"/>
-    <image id="xblm1a8" name="bg.png" path="/Main_new/Main/Image/"/>
+    <image id="xblm1a8" name="bg.png" path="/Main_new/Main/Image/" exported="true"/>
     <image id="xblm1a9" name="Setting_6.png" path="/Main_new/Main/Image/"/>
     <image id="xblm1ab" name="dismiss.png" path="/Main_new/Main/Image/"/>
     <component id="xblm1ac" name="btn_cancelRoom.xml" path="/Main_new/Main/Component/"/>