战绩记录，成员战绩

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

@@ -14,7 +14,7 @@ function M:init()
     local root = self._father
     self._lastTpe = root.familyType.selectedIndex
     root.familyType.selectedIndex = 0
-    local comp_rank = UIPackage.CreateObjectFromURL("ui://Family/comp_rank")
+    local comp_rank = UIPackage.CreateObjectFromURL("ui://Family/Comp_Rank")
     root._view:AddChild(comp_rank)
     comp_rank.width = root._view.width
     comp_rank.height = root._view.height

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

@@ -6,6 +6,7 @@ function FamilAllRank.New(root, groupId)
     local self = setmetatable({}, { __index = M })
     self._father = root
     self.group_id = groupId
+    self.currenGroup = DataManager.groups:get(groupId)
     self:init()
     return self
 end
@@ -20,26 +21,170 @@ function M:init()
     com_Record.height = root._view.height
     com_Record:Center()
     self._view = com_Record
+    self._ctr_cWindow = self._view:GetController('cWindow')
+
+    local ViewBox_Time = self._view:GetChild('combBox_time')
+    local serverDayValues, serverDayItems = self:InitTime()
+    ViewBox_Time.items = serverDayItems
+    ViewBox_Time.values = serverDayValues
+    self.selectTimes = tonumber(serverDayValues[1])
+    ViewBox_Time.onChanged:Set(function()
+        self.selectTimes = tonumber(ViewBox_Time.value)
+        self:ShowNumberRecord()
+    end)
+
+    self._viewList_record = self._view:GetChild('list_record_family')
+    self._viewList_record:SetVirtual()
+    self._viewList_record.itemRenderer = function(index, obj)
+        self:RecordItemRenderer(self.records[index + 1], obj)
+    end
+
+    self._viewList_recordDetail = self._view:GetChild('list_record_detail')
+
+    self._viewList_players = self._view:GetChild('list_players')
+
+    self._view:GetChild('btn_close').onClick:Set(function()
+        if self._ctr_cWindow.selectedIndex == 1 then
+            self._ctr_cWindow.selectedIndex = 0
+        else
+            self._father.familyType.selectedIndex = self._lastTpe
+            self._lastTpe = nil
+            self._view.visible = false
+        end
+    end)
+
 
     self:ShowNumberRecord()
 end
 
+function M:InitTime()
+    local timeTable = os.date("*t", os.time())
+    timeTable.hour = 0
+    timeTable.min = 0
+    timeTable.sec = 0
+
+    local serverDayItems = { "今天", "昨天", "前天" }
+    local serverDayValues = {}
+    for i = 0, 6 do
+        local tempValue = os.time(timeTable) - 86400 * i
+        print(tempValue)
+        local tempItems = os.date("%Y-%m-%d", tempValue)
+        if i > 2 then
+            table.insert(serverDayItems, tempItems)
+        end
+        table.insert(serverDayValues, tostring(tempValue))
+    end
+
+    return serverDayValues, serverDayItems
+end
+
 function M:ShowNumberRecord()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     self.records = {}
     local uid = DataManager.SelfUser.account_id
-    local timeTable = os.date("*t", os.time())
+
-    timeTable.hour = 0
+    self:RecursionRecord(fgCtr, 0, uid, self.selectTimes, self.selectTimes + 86399)
-    timeTable.min = 0
+end
-    timeTable.sec = 0
+
-    local leftTime = os.time(timeTable)
+function M:RecordItemDetailRender(round, allDate, rdata, obj)
-    local rightTime = os.time(timeTable) + 86399
+    obj:GetChild('text_round').text = round
-    self:RecursionRecord(fgCtr, 0, uid, leftTime, rightTime)
+    obj:GetChild('text_time').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(allDate.createTime))
+    local list = obj:GetChild('list_score')
+    rdata = json.decode(rdata)
+    list:RemoveChildrenToPool();
+    for i = 1, #rdata do
+        local obj2 = list:AddItemFromPool()
+        obj2:GetChild('title').text = rdata[i].score
+    end
+
+    local btn_play = obj:GetChild("n10")
+    btn_play.onClick:Set(function()
+        local group = self.currenGroup
+        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 = group.lev
+            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(rdata.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 = group.lev
+                elseif code == 25 then
+                    ViewUtil.ErrorTip(-1, "回放未找到！")
+                    -- btn_play_back.grayed = true
+                end
+            end, allDate.game_info)
+        end
+    end)
+end
+
+function M:RecordItemPlayersRender(data, obj)
+    obj:GetChild('n2').text = data.nick
+end
+
+function M:RecordItemRenderer(data, obj)
+    obj:GetChild('text_gameName').text = data.game_info.name
+    obj:GetChild('text_time').text = os.date("%Y-%m-%d\n%H:%M:%S", tonumber(data.create_time))
+    obj:GetChild('text_roomId').text = data.room_id
+    obj:GetChild('text_useDiamond').text = 0
+    obj:GetChild('btn_detail').onClick:Set(function()
+        self._viewList_recordDetail:RemoveChildrenToPool()
+        for i = 1, tonumber(data.round) do
+            local obj = self._viewList_recordDetail:AddItemFromPool()
+            self:RecordItemDetailRender(i, data, data[string.format("round_%d", i)], obj)
+        end
+        self._viewList_players:RemoveChildrenToPool()
+        for j = 1, #data.totalScore do
+            local obj = self._viewList_players:AddItemFromPool()
+            self:RecordItemPlayersRender(json.decode(data.round_1), obj)
+        end
+        self._ctr_cWindow.selectedIndex = 1
+    end)
+    -- obj:GetChild('text_playName').text = .name
+    local resultDetailList = obj:GetChild('list_familyPlayer')
+    resultDetailList:SetVirtual()
+    resultDetailList.itemRenderer = function(index, obj)
+        local resultInfo = data.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 = #data.totalScore
 end
 
 function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
     print("lingmeng RecursionRecord", self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 3)
-    fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 3,
+    fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 0,
         function(res)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "查看个人战绩失败")
@@ -49,14 +194,32 @@ function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
                 local records = res.Data.records
                 if records and #records > 0 then
                     for i = 1, #records do
+                        records[i].totalScore = json.decode(records[i].totalScore)
                         table.insert(self.records, records[i])
                     end
                     self:RecursionRecord(fgCtr, index + 1, uid, leftTime, rightTime)
                 else
-
+                    self._viewList_record.numItems = #self.records
                 end
             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/PlayBackView.lua

@@ -4,7 +4,7 @@
 --
 
 local MainRightPanelView = import('.MainRightPanelView')
-local PlayerInfoView = import('.PlayerInfoView')
+local PlayerInfoView = import('.PlayerInfoView2')
 
 PlayBackView = {
     _currentStep = 0,
@@ -50,11 +50,13 @@ function M:InitView(url)
     local btn_NextStep = panel_record:GetChild('btn_NextStep')
     local btn_return = panel_record:GetChild('btn_return')
     local btn_play = panel_record:GetChild('btn_play')
-    btn_return.onClick:Add(handler(self, self.CmdBackToLobby))
+    local btn_restart = panel_record:GetChild('btn_restart')
+    btn_return.onClick:Add(handler(self, self.MaxSpeedArriws))
     btn_LastStep.onClick:Add(handler(self, self.CmdLeftArrows))
     btn_NextStep.onClick:Add(handler(self, self.CmdRightArrows))
     btn_LastRound.onClick:Add(handler(self, self.LastRecordPlay))
     btn_NextRound.onClick:Add(handler(self, self.NextRecordPlay))
+    btn_restart.onClick:Add(handler(self, self.RestartRecordPlay))
     btn_play.onClick:Add(handler(self, self.Play))
 
     local _view = self._view
@@ -63,7 +65,7 @@ function M:InitView(url)
 
     local _player_info = self._player_info
     for i = 1, _room.room_config.people_num do
-        local tem = _view:GetChild('player_info' .. i)
+        local tem = _view:GetChild(string.format("player_info%d_%d", i, 2))
         _player_info[i] = PlayerInfoView.new(tem, self)
         tem.visible = false
     end
@@ -83,6 +85,17 @@ function M:InitView(url)
         btn_back_lobby.onClick:Set(handler(self, self.CmdBackToLobby))
     end
 
+
+    local btn_rule = self._view:GetChild('btn_rule_back')
+    if btn_rule ~= nil then
+        btn_rule.onClick:Set(function()
+            if self.RuleView == nil or self.RuleView._is_destroy then
+                self.RuleView = RoomInfoView.new(self._room)
+            end
+            self.RuleView:Show()
+        end)
+    end
+
     if self._style == 1 then
         local rightpanel = self._view:GetChild('right_panel')
         local btn_rule = self._view:GetChild('btn_rule')
@@ -153,9 +166,16 @@ end
 function M:CmdLeftArrows()
 end
 
+function M:MaxSpeedArriws()
+
+end
+
 function M:CmdRightArrows()
 end
 
+function M:RestartRecordPlay()
+end
+
 function M:NextCmdAction()
     self._lastStep = self._currentStep
     self._currentStep = self._currentStep + 1

lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua

@@ -20,7 +20,7 @@ end
 function M:InitView(url)
     local room = self._room
     UIPackage.AddPackage("extend/majiang/lichuan/ui/Extend_MJ_LiChuan")
-    MJPlayBackView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num)
+    MJPlayBackView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
     local _cardbox = self._view:GetChild("cardbox")
     --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false
     self._ctr_cardbox = _cardbox:GetController("c1")
@@ -58,7 +58,7 @@ function M:FillRoomData(data)
     for i = 1, #room.player_list do
         local p = room.player_list[i]
         local card_info = _player_card_info[self:GetPos(p.seat)]
-        card_info:Clear()
+        -- card_info:Clear()
         table.sort(p.card_list, self.HandCardSortAndJing)
         card_info:UpdateHandCard(false, true)
         self._player_info[i]._view:GetController("piao_niao").selectedIndex = 0
@@ -110,7 +110,7 @@ function M:ShowStep(index)
     if step.cmd == Record_Event.Evt_Win then
         self._win_pic = UIPackage.CreateObjectFromURL("ui://Main_Majiang/胡")
         local info = self._player_card_info[self:GetPos(step.win)]
-        info._mask_liangpai:AddChild(self._win_pic)
+        info._view:AddChild(self._win_pic)
         self._win_pic:Center()
     else
         if self._win_pic then
@@ -286,8 +286,9 @@ function M:UpdateCardBox(seat)
     self._ctr_cardbox.selectedIndex = index
 end
 
-function M:UpdateRound(round)
+function M:UpdateRound()
-    self._tex_round.text = "第 " .. round .. "/" .. self._room.room_config.round .. " 局"
+    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+        self._room.room_config.round)
 end
 
 function M:UpdateStep(step)

lua_probject/main_project/main/majiang/MJPlayBackView.lua

@@ -84,6 +84,15 @@ function M:LastRecordPlay()
 	self:ChangeTextSpeed()
 end
 
+function M:RestartRecordPlay()
+	self:ChangeAlpha()
+	self._currentStep = 0
+	self._speed = 1
+	self._playFoward = true
+	self:ChangeTextSpeed()
+	self:ChangePlayState(true)
+end
+
 function M:Play()
 	self:ChangeAlpha()
 	self:ChangePlayState(not self._play)
@@ -108,20 +117,22 @@ function M:ChangePlayState(state)
 end
 
 function M:ChangeTextSpeed()
-	local str1 = self._play and self._speed or ""
+	-- local str1 = self._play and self._speed or ""
-	self._view:GetChild("panel_record"):GetChild("tex_speed").text = str1
+	-- self._view:GetChild("panel_record"):GetChild("tex_speed").text = str1
-	local str2 = not self._play and (self._playFoward and "播放暂停" or "回退暂停") or self._playFoward and (self._speed == 1 and "播放" or "快进") or (self._speed == 1 and "回退" or "快退")
+	-- local str2 = not self._play and (self._playFoward and "播放暂停" or "回退暂停") or
-	self._view:GetChild("panel_record"):GetChild("tex_2").text = str2
+	-- 	self._playFoward and (self._speed == 1 and "播放" or "快进") or (self._speed == 1 and "回退" or "快退")
-	local str3 = self._play and "倍速度" or ""
+	-- self._view:GetChild("panel_record"):GetChild("tex_2").text = str2
-	self._view:GetChild("panel_record"):GetChild("tex_1").text = str3
+	-- local str3 = self._play and "倍速度" or ""
+	-- self._view:GetChild("panel_record"):GetChild("tex_1").text = str3
+	self._record:GetChild('tex_speed').text = self._speed
 end
 
 function M:CmdLeftArrows()
 	self:ChangeAlpha()
 	self:ChangePlayState(true)
 	if not self._playFoward then
-		if self._speed < 16 then
+		if self._speed < 5 then
-			self._speed = self._speed * 2
+			self._speed = self._speed + 1
 		else
 			self._speed = 1
 		end
@@ -137,8 +148,8 @@ function M:CmdRightArrows()
 	self:ChangeAlpha()
 	self:ChangePlayState(true)
 	if self._playFoward then
-		if self._speed < 16 then
+		if self._speed < 5 then
-			self._speed = self._speed * 2
+			self._speed = self._speed + 1
 		else
 			self._speed = 1
 		end
@@ -150,6 +161,12 @@ function M:CmdRightArrows()
 	end
 end
 
+function M:MaxSpeedArriws()
+	self:ChangeAlpha()
+	self:ChangePlayState(true)
+	self._speed = 30
+end
+
 function M:OnUpdate()
 	if self._play then
 		if (self._currentStep == #self.cmdList and self._playFoward) then
@@ -172,9 +189,9 @@ function M:OnUpdate()
 end
 
 function M:RemoveCursor()
-	if self._cursor.parent then
+	-- if self._cursor.parent then
-        self._cursor.parent:GetController("color").selectedIndex = 0
+	-- 	self._cursor.parent:GetController("color").selectedIndex = 0
-    end
+	-- end
 	self._cursor:RemoveFromParent()
 end
 

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -15,6 +15,24 @@ local PlayerCardInfoView = {
     _current_card_type = -1
 }
 
+local CardView = {
+    card = nil,
+    -- 牌序号
+    card_item = 0,
+    -- 索引
+    index = 0,
+    -- 原始位置
+    old_postion = Vector2.zero
+}
+
+local function NewCardView(card, cardItem)
+    local self = {}
+    setmetatable(self, { __index = CardView })
+    self.card = card
+    self.card_item = cardItem
+    return self
+end
+
 local M = PlayerCardInfoView
 
 --- Create a new PlayerCardInfoView
@@ -34,7 +52,8 @@ function M:init()
     self._view_handCardList = self._view:GetChild('List_HandCard')
     self._view_FZList = self._view:GetChild('List_FZ')
     self._view_outCardList = self._view:GetChild('List_OutCard')
-    self._view_getCard = self._view:GetChild('Comp_HandCard')
+
+    self._view_getCard = self._view:GetChild('Btn_HandCard')
 
     self._ctr_getCard = self._view:GetController('getCard')
 end
@@ -123,11 +142,16 @@ function M:UpdateHandCard(getcard, mp)
 
     self._view_handCardList:RemoveChildren()
     self._view_getCard:RemoveChildren()
+    local btn_card
     for i = 0, self._player.hand_left_count - 1 do
         if getcard and i == self._player.hand_left_count - 1 then
-            self._view_getCard:AddItemFromPool()
+            btn_card = self._view_getCard:AddItemFromPool()
         else
-            self._view_handCardList:AddItemFromPool()
+            btn_card = self._view_handCardList:AddItemFromPool()
+        end
+        if mp then
+            local tem_card = self._player.card_list[i + 1]
+            self:FillHandCard(i, btn_card, tem_card, true)
         end
     end
     self._ctr_getCard.selectedIndex = getcard and 1 or 0
@@ -207,6 +231,22 @@ function M:adjust3dOutPut(obj, area, oder, num, index)
     end
 end
 
+function M:FillHandCard(i, btn_card, tem_card, event)
+    local handCardName = self._viewText_cardInfo['Hand_Card']
+
+    self:fillCard2(btn_card, handCardName, tem_card)
+    local c_v = NewCardView(btn_card, tem_card)
+    c_v.index = i
+    c_v.old_postion = btn_card.xy
+    c_v.touch_pos = Vector2.New(btn_card.width / 2, btn_card.height / 2)
+    btn_card.data = c_v
+    if event then
+        btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin))
+        btn_card.onTouchMove:Set(handler(self, self.onTouchMove))
+        btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd))
+    end
+end
+
 function M:UpdateOutCardList(outcard, card_item, cursor)
     outcard = outcard or nil
     card_item = card_item or 0
@@ -258,7 +298,7 @@ end
 function M:UpdateFzList(fz, index, show_card)
     local room = DataManager.CurrenRoom
     -- local seat = (room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
-    local seat = ViewUtil.GetPos(room.self_player.seat, fz.from_seat, room.room_config.people_num)
+    local seat = ViewUtil.GetPos(room.self_player.seat, fz.from_seat or 1, room.room_config.people_num)
     seat = (room.room_config.people_num == 2 and seat == 2) and 2 or seat - 1
     print("lingmengUpdateFzList", fz, index, show_card, seat)
     local FZame = self._viewText_cardInfo['FZ_Card']

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -1,23 +1,5 @@
 local MJPlayerCardInfoView = import(".MJPlayerCardInfoView")
 
-local CardView = {
-    card = nil,
-    -- 牌序号
-    card_item = 0,
-    -- 索引
-    index = 0,
-    -- 原始位置
-    old_postion = Vector2.zero
-}
-
-local function NewCardView(card, cardItem)
-    local self = {}
-    setmetatable(self, { __index = CardView })
-    self.card = card
-    self.card_item = cardItem
-    return self
-end
-
 local PlayerSelfView = {
     _dragCom = nil,
     _carViewList = {}
@@ -118,22 +100,6 @@ function M:UpdateHandCard(getcard, mp)
     self:ClearMove()
 end
 
-function M:FillHandCard(i, btn_card, tem_card, event)
-    local handCardName = self._viewText_cardInfo['Hand_Card']
-
-    self:fillCard2(btn_card, handCardName, tem_card)
-    local c_v = NewCardView(btn_card, tem_card)
-    c_v.index = i
-    c_v.old_postion = btn_card.xy
-    c_v.touch_pos = Vector2.New(btn_card.width / 2, btn_card.height / 2)
-    btn_card.data = c_v
-    if event then
-        btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin))
-        btn_card.onTouchMove:Set(handler(self, self.onTouchMove))
-        btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd))
-    end
-end
-
 function M:UpdateHandCardWitness(getcard)
     self._view_handCardList.columnGap = -10
     MJPlayerCardInfoView.UpdateHandCardWitness(self, getcard, true)

wb_new_ui/assets/Common/package.xml

@@ -1210,6 +1210,7 @@
     <image id="o1v05g" name="Rectangle 145.png" path="/images/win/" exported="true"/>
     <image id="jydr7in3" name="bt_cancel1.png" path="/images/btn_choose/"/>
     <image id="jydr7in4" name="queren_btn1.png" path="/images/btn_choose/"/>
+    <component id="tgj67in5" name="btn_oneChoose.xml" path="/component/oneChoose/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml

@@ -2,22 +2,25 @@
 <component size="2328,150">
   <displayList>
     <image id="n0_slrk" name="n0" src="slrk7d34" fileName="Record/Image/Rectangle 182.png" xy="-11,-12" size="2350,172"/>
-    <image id="n1_slrk" name="n1" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="162,11"/>
+    <image id="n1_slrk" name="n1" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="272,11"/>
-    <image id="n2_slrk" name="n2" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="402,11"/>
+    <image id="n2_slrk" name="n2" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="512,11"/>
-    <image id="n3_slrk" name="n3" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="594,11"/>
+    <image id="n3_slrk" name="n3" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="676,11"/>
-    <image id="n4_slrk" name="n4" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="804,11"/>
+    <image id="n4_slrk" name="n4" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="779,11"/>
-    <image id="n6_slrk" name="n6" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1886,11"/>
+    <image id="n6_slrk" name="n6" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1866,11"/>
-    <image id="n7_slrk" name="n7" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2100,11"/>
+    <image id="n7_slrk" name="n7" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2151,10"/>
-    <text id="n8_slrk" name="text_id" xy="42,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <text id="n8_slrk" name="text_gameName" xy="6,13" size="267,119" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" align="center" vAlign="middle" autoSize="shrink" text="五个字游戏"/>
-    <text id="n9_slrk" name="text_time" xy="183,27" size="204,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21&#xA;14:30:23"/>
+    <text id="n9_slrk" name="text_time" xy="292,27" size="214,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="2025-03-21&#xA;14:30:23"/>
-    <text id="n10_slrk" name="text_roomId" xy="1960,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <text id="n10_slrk" name="text_playName" xy="1873,10" size="279,124" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="999"/>
-    <text id="n11_slrk" name="text_useDiamond" xy="662,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <text id="n11_slrk" name="text_useDiamond" xy="692,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="999"/>
-    <text id="n12_slrk" name="n12" xy="462,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <text id="n12_slrk" name="text_roomId" xy="523,47" size="148,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoClearText="true" text="999999"/>
-    <list id="n13_slrk" name="list_familyPlayer" xy="804,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="hidden" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" align="center" vAlign="middle">
+    <list id="n13_slrk" name="list_familyPlayer" xy="784,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <component id="n14_ghku" name="btn_detail" src="jydr7d3q" fileName="Main/Component/btn_mul.xml" xy="2172,12" size="144,126">
+      <Button icon="ui://htcn7v3rghku7d4g"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Family/Record/Component/Item_record.xml

@@ -6,12 +6,9 @@
     <image id="n4_slrk" name="n4" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="372,12"/>
     <image id="n7_slrk" name="n7" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1878,12"/>
     <image id="n8_slrk" name="n8" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2097,12"/>
-    <text id="n1_slrk" name="n1" xy="49,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" autoSize="none" text="999"/>
+    <text id="n1_slrk" name="text_round" xy="49,47" size="76,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#a62812" autoSize="none" text="999"/>
-    <text id="n3_slrk" name="n3" xy="170,27" size="204,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="none" text="2025-03-21&#xA;14:30:23"/>
+    <text id="n3_slrk" name="text_time" xy="170,27" size="204,96" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" vAlign="middle" autoSize="shrink" text="2025-03-21&#xA;14:30:23"/>
-    <list id="n6_slrk" name="list_score" xy="373,0" size="1505,150" layout="flow_hz" overflow="hidden" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d36" autoItemSize="true" scrollItemToViewOnClick="false">
+    <list id="n6_slrk" name="list_score" xy="373,0" size="1505,150" layout="flow_hz" scroll="horizontal" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d36" autoItemSize="true" scrollItemToViewOnClick="false">
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
     </list>

wb_new_ui/assets/Family/Record/Component/Item_score.xml

@@ -4,7 +4,7 @@
     <image id="n0_slrk" name="n0" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="0,12">
       <relation target="" sidePair="left-left"/>
     </image>
-    <text id="n1_slrk" name="n1" xy="321,47" size="158,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="-9999">
+    <text id="n1_slrk" name="title" xy="321,47" size="158,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="-9999">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

wb_new_ui/assets/Family/Record/Component/combBox_time.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="435,76" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n4_jydr" name="n4" src="jydr7d3u" fileName="Main/Image/Rectangle 163.png" xy="0,5" size="414,66" group="n7_jydr">
+      <relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
+    </image>
+    <image id="n5_jydr" name="n5" src="jydr7d3s" fileName="Main/Image/Rectangle 165.png" xy="369,5" size="66,66" group="n7_jydr" aspect="true">
+      <relation target="" sidePair="height-height%,left-left%,top-top%"/>
+    </image>
+    <image id="n6_jydr" name="n6" src="jydr7d3t" fileName="Main/Image/Polygon 5.png" xy="384,25" size="35,26" group="n7_jydr" aspect="true">
+      <relation target="n5_jydr" sidePair="center-center,middle-middle"/>
+      <relation target="" sidePair="height-height%"/>
+    </image>
+    <group id="n7_jydr" name="bg" xy="0,5" size="435,66"/>
+    <text id="n3_jydr" name="title" xy="4,2" size="364,72" font="ui://27vd145bh35o7il1" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="2025-09-09">
+      <relation target="" sidePair=""/>
+      <relation target="n5_jydr" sidePair="rightext-left"/>
+    </text>
+  </displayList>
+  <ComboBox dropdown="ui://htcn7v3rghku7d4f"/>
+</component>

wb_new_ui/assets/Family/Record/Component/combBox_time_item.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="435,72" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n2_jydr" name="title" xy="0,0" size="435,72" font="ui://27vd145bh35o7im8" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="2025-07-07">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <relation target="n2_jydr" sidePair="height-height"/>
+</component>

wb_new_ui/assets/Family/Record/Component/combBox_time_popup.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="364,504">
+  <displayList>
+    <image id="n0_jydr" name="n0" src="jydr7d3u" fileName="Rank/Image/Rectangle 163.png" xy="0,0" size="364,504">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <list id="n1_jydr" name="list" xy="0,0" size="364,504" overflow="scroll" defaultItem="ui://htcn7v3rghku7d4e">
+      <relation target="" sidePair="width-width"/>
+    </list>
+  </displayList>
+  <relation target="n1_jydr" sidePair="height-height"/>
+</component>

wb_new_ui/assets/Family/Record/com_Record.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="cWindow" pages="0,,1," selected="0">
+  <controller name="cWindow" pages="0,,1," selected="1">
     <remark page="0" value="亲友圈战绩"/>
     <remark page="1" value="房间战绩"/>
   </controller>
   <displayList>
     <image id="n5_jw05" name="n5" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="24,192" size="2484,960"/>
     <image id="n6_jw05" name="n6" src="jw057d2i" fileName="Record/Image/Rectangle 285.png" xy="60,222" size="2412,900"/>
-    <loader id="n60_slrk" name="loader_test" xy="261,18" size="197,188"/>
     <image id="n3_jw05" name="n3" src="jw057d2h" fileName="Record/Image/Group 544.png" xy="101,258" size="2328,72" group="n19_slrk"/>
     <graph id="n4_jw05" name="n4" xy="264,258" size="6,72" group="n19_slrk" type="rect" lineColor="#ffffffff"/>
     <graph id="n7_jw05" name="n7" xy="474,258" size="6,72" group="n19_slrk" type="rect" lineColor="#ffffffff"/>
@@ -17,14 +16,12 @@
     <text id="n12_jw05" name="n12" xy="330,265" size="88,56" group="n19_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
     <text id="n15_jw05" name="n15" xy="2052,265" size="88,56" group="n19_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
     <text id="n16_jw05" name="n16" xy="2271,265" size="88,56" group="n19_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
-    <list id="n17_slrk" name="list_players" xy="475,258" size="1506,72" group="n19_slrk" layout="flow_hz" selectionMode="none" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d32" autoItemSize="true" scrollItemToViewOnClick="false">
+    <list id="n17_slrk" name="list_players" xy="475,258" size="1506,72" group="n19_slrk" layout="flow_hz" selectionMode="none" scroll="horizontal" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d32" autoItemSize="true" scrollItemToViewOnClick="false">
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n18_slrk" name="list_record" xy="89,354" size="2354,702" group="n19_slrk" layout="flow_hz" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rslrk7d33" align="center">
+    <list id="n18_slrk" name="list_record_detail" xy="89,354" size="2354,702" group="n19_slrk" layout="flow_hz" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rslrk7d33" align="center">
       <item/>
       <item/>
       <item/>
@@ -32,26 +29,32 @@
     <group id="n19_slrk" name="n19" xy="89,258" size="2354,798" advanced="true">
       <gearDisplay controller="cWindow" pages="1"/>
     </group>
-    <image id="n20_slrk" name="n20" src="jw057d2h" fileName="Record/Image/Group 544.png" xy="102,258" size="2328,72" group="n57_slrk"/>
+    <image id="n20_slrk" name="n20" src="jw057d2h" fileName="Record/Image/Group 544.png" xy="102,303" size="2328,79" group="n57_slrk"/>
-    <graph id="n45_slrk" name="n45" xy="264,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n45_slrk" name="n45" xy="374,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <graph id="n46_slrk" name="n46" xy="474,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n46_slrk" name="n46" xy="614,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <graph id="n50_slrk" name="n50" xy="696,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n50_slrk" name="n50" xy="776,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <graph id="n51_slrk" name="n51" xy="906,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n51_slrk" name="n51" xy="876,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <graph id="n52_slrk" name="n52" xy="1988,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n52_slrk" name="n52" xy="1968,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <graph id="n53_slrk" name="n53" xy="2202,258" size="6,72" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
+    <graph id="n53_slrk" name="n53" xy="2252,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <text id="n47_slrk" name="n47" xy="144,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="选择"/>
+    <text id="n47_slrk" name="n47" xy="204,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="游戏"/>
-    <text id="n48_slrk" name="n48" xy="330,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="时间"/>
+    <text id="n48_slrk" name="n48" xy="440,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="时间"/>
-    <text id="n49_slrk" name="n49" xy="556,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房号"/>
+    <text id="n49_slrk" name="n49" xy="651,311" size="88,60" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房号"/>
-    <text id="n54_slrk" name="n54" xy="2056,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="备注"/>
+    <text id="n54_slrk" name="n54" xy="2076,311" size="88,60" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="备注"/>
-    <text id="n55_slrk" name="n55" xy="2268,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="回放"/>
+    <text id="n55_slrk" name="n55" xy="2288,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="回放"/>
-    <text id="n56_slrk" name="n56" xy="1410,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="结算"/>
+    <text id="n56_slrk" name="n56" xy="1410,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="结算"/>
-    <text id="n58_slrk" name="n58" xy="762,266" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房卡"/>
+    <text id="n58_slrk" name="n58" xy="782,311" size="88,62" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房卡"/>
-    <list id="n59_slrk" name="n59" xy="63,356" size="2405,636" group="n57_slrk" layout="flow_hz" overflow="scroll" lineGap="15" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
+    <component id="n63_ghku" name="combBox_time" src="ghku7d4d" fileName="Record/Component/combBox_time.xml" xy="1915,222" group="n57_slrk">
+      <ComboBox visibleItemCount="10"/>
+    </component>
+    <list id="n59_slrk" name="list_record_family" xy="63,401" size="2405,698" group="n57_slrk" layout="flow_hz" overflow="scroll" lineGap="15" defaultItem="ui://htcn7v3rslrk7d3b" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n57_slrk" name="n57" xy="63,258" size="2405,734"/>
+    <group id="n57_slrk" name="n57" xy="63,222" size="2405,877" advanced="true">
+      <gearDisplay controller="cWindow" pages="0"/>
+    </group>
     <component id="n61_o2rw" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
+    <image id="n62_ghku" name="n62" src="ghku7d4c" fileName="Record/Image/Group 327.png" xy="1041,24"/>
   </displayList>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -264,10 +264,10 @@
     <image id="slrk7d38" name="分享.png" path="/Record/Image/"/>
     <component id="slrk7d39" name="btn_share.xml" path="/Record/Component/"/>
     <component id="slrk7d3a" name="btn_replay.xml" path="/Record/Component/"/>
-    <component id="slrk7d3b" name="Item_familyRecord.xml" path="/Record/Component/"/>
+    <component id="slrk7d3b" name="Item_familyRecord.xml" path="/Record/Component/" exported="true"/>
     <component id="slrk7d3c" name="Item_familyPlayer.xml" path="/Record/Component/"/>
     <image id="o2rw7d3d" name="zhuangrang 1.png" path="/Main/Image/"/>
-    <component id="jydr7d3e" name="comp_rank.xml" path="/Rank/" exported="true"/>
+    <component id="jydr7d3e" name="Comp_Rank.xml" path="/Rank/" exported="true"/>
     <image id="jydr7d3f" name="2_12.png" path="/Rank/Image/"/>
     <image id="jydr7d3g" name="2_14.png" path="/Rank/Image/"/>
     <image id="jydr7d3h" name="2_16.png" path="/Rank/Image/"/>
@@ -320,6 +320,29 @@
     <image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
     <component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
     <component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
+    <image id="ghku7d4c" name="Group 327.png" path="/Record/Image/"/>
+    <component id="ghku7d4d" name="combBox_time.xml" path="/Record/Component/" exported="true"/>
+    <component id="ghku7d4e" name="combBox_time_item.xml" path="/Record/Component/"/>
+    <component id="ghku7d4f" name="combBox_time_popup.xml" path="/Record/Component/"/>
+    <image id="ghku7d4g" name="Record14.png" path="/Record/Image/"/>
+    <image id="ghku7d4h" name="Record15.png" path="/Record/Image/"/>
+    <image id="tgj67d4i" name="Group 100.png" path="/Main/Image/"/>
+    <image id="tgj67d4j" name="Rectangle 119.png" path="/Main/Image/"/>
+    <image id="tgj67d4k" name="Rectangle 118.png" path="/Main/Image/"/>
+    <image id="tgj67d4l" name="Rectangle 117.png" path="/Main/Image/"/>
+    <image id="tgj67d4m" name="Rectangle 116.png" path="/Main/Image/"/>
+    <image id="tgj67d4n" name="Rectangle 109.png" path="/Main/Image/"/>
+    <image id="tgj67d4o" name="Rectangle 101.png" path="/Main/Image/"/>
+    <image id="tgj67d4p" name="Rectangle 120.png" path="/Main/Image/"/>
+    <image id="tgj67d4q" name="Group 97.png" path="/Main/Image/"/>
+    <image id="tgj67d4r" name="Group 83.png" path="/Main/Image/"/>
+    <image id="tgj67d4s" name="Group 191.png" path="/Main/Image/"/>
+    <image id="tgj67d4t" name="Group 115.png" path="/Main/Image/"/>
+    <image id="tgj67d4u" name="Group 111.png" path="/Main/Image/"/>
+    <image id="tgj67d4v" name="Group 110.png" path="/Main/Image/"/>
+    <image id="tgj67d4w" name="Group 109.png" path="/Main/Image/"/>
+    <image id="tgj67d4x" name="Group 96.png" path="/Main/Image/"/>
+    <component id="tgj67d4y" name="btn_head.xml" path="/NumberList/Component/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="120,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_ckvb" name="n3" src="pbp614j" fileName="Main_New/Image/Group 205.png" xy="-3,-3"/>
+  </displayList>
+  <Button downEffect="dark" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_mul.xml

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

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml

@@ -39,7 +39,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n38_gi99" name="List_FZ" xy="18,16" size="1329,85" touchable="false" layout="row" selectionMode="none" colGap="4" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
+    <list id="n38_gi99" name="List_FZ" xy="18,15" size="1329,85" touchable="false" layout="row" selectionMode="none" colGap="4" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
@@ -70,7 +70,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n43_nee3" name="Comp_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
+    <list id="n43_nee3" name="Btn_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
       <item/>
     </list>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -14,21 +14,18 @@
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
     </component>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="356,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
+    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="743,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
-    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-384,-885" group="n90_8sat"/>
+    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="3,-885" group="n90_8sat"/>
-    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2098,-382" size="110,75" group="n90_8sat" scale="2,2">
+    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2485,-382" size="110,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2925,-501" size="58,75" group="n90_8sat" scale="2,2">
+    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="265,-887" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="-122,-887" group="n90_8sat">
+    <group id="n90_8sat" name="n90" xy="3,-1170" size="2592,863" advanced="true">
-      <gearDisplay controller="state" pages="0,3"/>
-    </component>
-    <group id="n90_8sat" name="n90" xy="-384,-1170" size="3367,863" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1984,-344" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1596,-344" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
@@ -48,14 +45,6 @@
     <group id="n36_k3io" name="n36" xy="2797,-240" size="736,1138" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="978,435" group="n59_v38k" alpha="0.5">
-      <gearDisplay controller="state" pages="3"/>
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1261,480" group="n59_v38k">
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <group id="n59_v38k" name="huifang" xy="978,435" size="575,165"/>
     <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
@@ -106,10 +95,16 @@
     </component>
     <text id="n136_lu84" name="text_roomId" xy="43,97" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
     <group id="n135_lu84" name="top_left" xy="43,44" size="228,171"/>
+    <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <component id="n192_lj2n" name="btn_rule_back" src="lj2n17s" fileName="Main_new/Main/Component/btn_mul.xml" xy="215,36" size="115,111">
+      <Button icon="ui://v0j9abjylj2n17t"/>
+    </component>
     <component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="515,33">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="7,975">
+    <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
@@ -134,17 +129,17 @@
       <gearSize controller="state" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="737,916" size="144,144">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="73,784" size="144,144">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="1,3,4" values="71,784|71,784|69,774" default="737,916"/>
+      <gearXY controller="state" pages="1,3,4" values="73,784|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,274" size="144,144">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,909" size="144,144">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2031,519" size="108,108">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1885,27" size="108,108">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="2031,519|1885,27|1885,27|1897,43" default="1337,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -250,12 +245,19 @@
       <gearDisplay controller="witness" pages="1"/>
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
-    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_New/Component/Btn_MessageTalk.xml" xy="2328,482"/>
+    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2328,482"/>
     <graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
-    <image id="n189_pbp6" name="n189" src="pbp614k" fileName="Main_New/Image/Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
+    <image id="n189_pbp6" name="n189" src="pbp614k" fileName="Main_new/Chat/Image/Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
     <text id="n190_pbp6" name="n190" xy="1024,667" size="484,79" group="n191_pbp6" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
     <group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
       <gearDisplay controller="voice" pages="1"/>
     </group>
+    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,848" group="n59_v38k">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1140,904" group="n59_v38k">
+      <relation target="" sidePair="center-center"/>
+    </component>
+    <group id="n59_v38k" name="huifang" xy="0,848" size="2532,165"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="91,99">
   <displayList>
-    <loader id="n0_gi99" name="n0" xy="0,0" size="91,99" url="ui://v0j9abjyk0pa13l" align="center" vAlign="middle" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" size="91,99" url="ui://v0j9abjyk0pa13l" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/record/font/MJ_recordSpeed.fnt

@@ -0,0 +1,11 @@
+info size=20 colored=false
+char id=48 img=lj2n181 xoffset=0 yoffset=0 xadvance=0
+char id=49 img=lj2n182 xoffset=0 yoffset=0 xadvance=0
+char id=50 img=lj2n183 xoffset=0 yoffset=0 xadvance=0
+char id=51 img=lj2n184 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=lj2n185 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=lj2n186 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=lj2n187 xoffset=0 yoffset=0 xadvance=0
+char id=55 img=lj2n188 xoffset=0 yoffset=0 xadvance=0
+char id=56 img=lj2n189 xoffset=0 yoffset=0 xadvance=0
+char id=57 img=lj2n18a xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Main_Majiang/Main_style_2/poker/Btn_back_lobby.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="57,77" extention="Button" initName="btn_back_lobby">
+<component size="85,65" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n3_hp0b" name="n3" src="gq7m4q" fileName="images/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true" visible="false"/>
+    <image id="n3_hp0b" name="n3" src="gq7m4q" fileName="Main_style_2/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true" visible="false"/>
-    <image id="n4_qf80" name="n4" src="gq7m4r" fileName="images/fh_img.png" xy="0,0"/>
+    <image id="n4_qf80" name="n4" src="gq7m4r" fileName="Main_style_2/fh_img.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/record/Btn_record_play.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="93,114" extention="Button">
+<component size="337,134" extention="Button">
-  <controller name="state" pages="0,,1," selected="1"/>
+  <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n5_rayb" name="n5" src="gq7m4f" fileName="images/record/01.png" xy="0,4">
+    <image id="n5_rayb" name="n5" src="lj2n17z" fileName="Main_new/record/mahj_start_btn.png" xy="0,0" size="337,134">
       <gearDisplay controller="state" pages="0"/>
     </image>
-    <image id="n6_tjv8" name="n6" src="gq7m4g" fileName="images/record/02.png" xy="0,0">
+    <image id="n6_tjv8" name="n6" src="lj2n17v" fileName="Main_new/record/mahj_pause_btn.png" xy="0,0" size="337,134">
       <gearDisplay controller="state" pages="1"/>
     </image>
   </displayList>
-  <Button mode="Radio" downEffect="dark" downEffectValue="0.80"/>
+  <Button mode="Radio" downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/record/Btn_record_return.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="128,92" extention="Button">
+<component size="334,134" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n5_rayb" name="n5" src="gq7m4h" fileName="images/record/button03.png" xy="0,0"/>
+    <image id="n6_lj2n" name="n6" src="lj2n180" fileName="Main_new/record/stop.png" xy="0,0" size="334,134"/>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/record/Btn_record_speed.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="52,38" pivot="0.5,0.5" anchor="true" extention="Button">
+<component size="52,38" anchor="true" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="enable" pages="0,,1," selected="0"/>
   <displayList>
@@ -7,10 +7,10 @@
       <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <loader id="n2" name="icon" xy="0,0" size="52,38" align="right" vAlign="middle">
+    <loader id="n2" name="icon" xy="0,0" size="52,38" align="right" vAlign="middle" fill="scale">
       <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_style_2/record/Record.xml

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="575,165">
+<component size="2532,165">
-  <controller name="type" pages="0,麻将,1,牛牛,2," selected="1"/>
+  <controller name="type" pages="0,麻将,1,牛牛,2," selected="0"/>
   <displayList>
-    <image id="n0_rayb" name="n0" src="gq7m4c" fileName="images/record/di.png" xy="0,0"/>
+    <component id="n3_rayb" name="btn_LastStep" src="gq7m4u" fileName="Main_style_2/record/Btn_record_speed.xml" xy="-96,-400" size="58,54" visible="false">
-    <component id="n3_rayb" name="btn_LastStep" src="gq7m4u" fileName="component/record/Btn_record_speed.xml" xy="150,83" size="58,54">
       <gearDisplay controller="type" pages="0"/>
       <Button icon="ui://v0j9abjygq7m4d"/>
     </component>
-    <component id="n5_rayb" name="btn_LastRound" src="gq7m4u" fileName="component/record/Btn_record_speed.xml" xy="126,81" size="60,60">
+    <component id="n5_rayb" name="btn_LastRound" src="gq7m4u" fileName="Main_style_2/record/Btn_record_speed.xml" xy="2073,15" size="334,134">
-      <gearXY controller="type" pages="0,1,2" values="61,85|126,81|129,85"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
-      <Button icon="ui://v0j9abjygq7m4e"/>
+      <Button icon="ui://v0j9abjylj2n17w"/>
     </component>
-    <component id="n6_rayb" name="btn_NextStep" src="gq7m4u" fileName="component/record/Btn_record_speed.xml" xy="420,80" size="56,54" scale="-1,1">
+    <component id="n6_rayb" name="btn_NextStep" src="gq7m4u" fileName="Main_style_2/record/Btn_record_speed.xml" xy="142,15" size="334,134">
-      <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
-      <Button icon="ui://v0j9abjygq7m4d"/>
+      <Button icon="ui://v0j9abjylj2n17x"/>
     </component>
-    <component id="n7_rayb" name="btn_NextRound" src="gq7m4u" fileName="component/record/Btn_record_speed.xml" xy="438,82" size="58,56" scale="-1,1">
+    <component id="n7_rayb" name="btn_NextRound" src="gq7m4u" fileName="Main_style_2/record/Btn_record_speed.xml" xy="1671,17" size="337,134">
-      <gearXY controller="type" pages="0,1,2" values="517,81|438,82|440,83"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
-      <Button icon="ui://v0j9abjygq7m4e"/>
+      <Button icon="ui://v0j9abjylj2n17u"/>
     </component>
     <text id="n10_dpym" name="tex_step" xy="17,-8" size="216,38" fontSize="30" color="#ffffff" autoSize="none" text="第 999 / 999 步">
       <gearDisplay controller="type" pages="1"/>
     </text>
-    <component id="n11_tjv8" name="btn_play" src="gq7m4v" fileName="component/record/Btn_record_play.xml" xy="256,25" size="89,108">
+    <component id="n11_tjv8" name="btn_play" src="gq7m4v" fileName="Main_style_2/record/Btn_record_play.xml" xy="520,15" size="337,134">
       <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://v0j9abjylj2n17v"/>
     </component>
-    <text id="n12_tjv8" name="tex_speed" xy="36,-8" size="10,37" fontSize="30" color="#ff9c00" text="">
+    <text id="n12_tjv8" name="tex_speed" xy="299,43" size="64,78" font="ui://v0j9abjylj2n18c" fontSize="30" color="#ffffff" text="1">
       <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
     </text>
-    <text id="n13_tjv8" name="tex_1" xy="53,-8" size="10,37" fontSize="30" color="#ff9c00" text="">
+    <text id="n13_tjv8" name="tex_1" xy="370,-8" size="0,0" visible="false" fontSize="30" color="#ff9c00" text="">
       <gearDisplay controller="type" pages="0"/>
       <relation target="n12_tjv8" sidePair="left-right"/>
     </text>
-    <text id="n14_tjv8" name="tex_2" xy="58,-8" size="65,38" fontSize="30" color="#ff9c00" text="暂停">
+    <text id="n14_tjv8" name="tex_2" xy="281,-417" size="64,42" visible="false" fontSize="30" color="#ff9c00" text="暂停">
       <gearDisplay controller="type" pages="0"/>
       <relation target="n13_tjv8" sidePair="left-right"/>
     </text>
-    <graph id="n15_tjv8" name="n15" xy="221,-145" size="132,132" visible="false" alpha="0.6" type="eclipse" lineSize="0" lineColor="#ff333333" fillColor="#ff000000">
+    <component id="n9_rayb" name="btn_return" src="gq7m4w" fileName="Main_style_2/record/Btn_record_return.xml" xy="1279,15" size="334,134">
-      <gearDisplay controller="type" pages="0"/>
+      <gearXY controller="type" pages="0,1,2" values="1279,15|227,32|458,35"/>
-    </graph>
+      <gearSize controller="type" pages="0,1,2" values="334,134,1,1|128,98,1,1|135,93,0.6,0.6"/>
-    <component id="n9_rayb" name="btn_return" src="gq7m4w" fileName="component/record/Btn_record_return.xml" xy="227,32" pivot="0.5,0.5" size="128,98" visible="false">
+      <relation target="" sidePair="height-height%,left-left%"/>
-      <gearXY controller="type" pages="0,1,2" values="221,-130|227,32|458,35"/>
-      <gearSize controller="type" pages="0,1,2" values="128,92,1,1|128,98,1,1|135,93,0.6,0.6"/>
     </component>
+    <component id="n16_lj2n" name="btn_restart" src="lj2n17s" fileName="Main_new/Main/Component/btn_mul.xml" xy="905,15" size="334,134">
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://v0j9abjylj2n17y"/>
+    </component>
+    <image id="n17_lj2n" name="n17" src="lj2n18b" fileName="Main_new/record/font/x.png" xy="227,45" size="60,74">
+      <relation target="" sidePair="height-height%,left-left%"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1223,9 +1223,145 @@
     <component id="sx7x14f" name="btn_bg.xml" path="/Main_new/Main/Component/"/>
     <image id="sx7x14g" name="gamechatback1.png" path="/Main_new/Main/Image/" scale="9grid" scale9grid="22,13,46,31"/>
     <image id="sx7x14h" name="gamechatback2.png" path="/Main_new/Main/Image/"/>
-    <component id="pbp614i" name="Btn_MessageTalk.xml" path="/Main_New/Component/"/>
+    <component id="pbp614i" name="Btn_MessageTalk.xml" path="/Main_new/Chat/Component/"/>
-    <image id="pbp614j" name="Group 205.png" path="/Main_New/Image/"/>
+    <image id="pbp614j" name="Group 205.png" path="/Main_new/Chat/Image/"/>
-    <image id="pbp614k" name="Group 205(1).png" path="/Main_New/Image/"/>
+    <image id="pbp614k" name="Group 205(1).png" path="/Main_new/Chat/Image/"/>
+    <component id="ghku14l" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
+    <component id="tgj614m" name="Main_new_2.xml" path="/"/>
+    <image id="tgj614n" name="a201_407.png" path="/images/cards2/1/"/>
+    <image id="tgj614o" name="a201_406.png" path="/images/cards2/1/"/>
+    <image id="tgj614p" name="a201_405.png" path="/images/cards2/1/"/>
+    <image id="tgj614q" name="202_407.png" path="/images/cards/2/"/>
+    <image id="tgj614r" name="202_406.png" path="/images/cards/2/"/>
+    <image id="tgj614s" name="202_405.png" path="/images/cards/2/"/>
+    <image id="tgj614t" name="201_407.png" path="/images/cards/2/"/>
+    <image id="tgj614u" name="201_406.png" path="/images/cards/2/"/>
+    <image id="tgj614v" name="201_405.png" path="/images/cards/2/"/>
+    <image id="tgj614w" name="102_418.png" path="/images/cards/1/"/>
+    <image id="tgj614x" name="102_415.png" path="/images/cards/1/"/>
+    <image id="tgj614y" name="a202_405.png" path="/images/cards2/2/"/>
+    <image id="tgj614z" name="102_412.png" path="/images/cards/1/"/>
+    <image id="tgj6150" name="102_406.png" path="/images/cards/1/"/>
+    <image id="tgj6151" name="102_400.png" path="/images/cards/1/"/>
+    <image id="tgj6152" name="game_btn_kaiju_huang.png" path="/component/clearing/room/"/>
+    <component id="tgj6153" name="btn_invite.xml" path="/component/clearing/room/"/>
+    <component id="tgj6154" name="btn_invite(1).xml" path="/component/clearing/room/"/>
+    <image id="tgj6155" name="winnerBg.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6156" name="tgz.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6157" name="returnBtn.png" path="/component/clearing/clearing2/"/>
+    <component id="tgj6158" name="result_main.xml" path="/component/clearing/clearing2/"/>
+    <image id="tgj6159" name="pnl-zi.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj615a" name="pnl-lv.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj615b" name="102_409.png" path="/images/cards/1/"/>
+    <image id="tgj615c" name="pnl-lan_b.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj615d" name="a202_406.png" path="/images/cards2/2/"/>
+    <image id="tgj615e" name="a102_400.png" path="/images/cards2/3/"/>
+    <image id="tgj615f" name="Group 195.png" path="/Main_new_2/Image/"/>
+    <component id="tgj615g" name="btn_ready.xml" path="/Main_new_2/Component/"/>
+    <component id="tgj615h" name="btn_invite.xml" path="/Main_new_2/Component/"/>
+    <component id="tgj615i" name="btn_head.xml" path="/Main_new_2/Component/"/>
+    <component id="tgj615j" name="btn_closeRoom.xml" path="/Main_new_2/Component/"/>
+    <component id="tgj615k" name="Player_card_info_2.xml" path="/Main_new_2/"/>
+    <component id="tgj615l" name="Player_card_info_1.xml" path="/Main_new_2/"/>
+    <component id="tgj615m" name="PlayerHead_1.xml" path="/Main_new_2/"/>
+    <component id="tgj615n" name="OutCard_self_jiangxi.xml" path="/Main_new_2/"/>
+    <component id="tgj615o" name="Btn_Card_jiangxi.xml" path="/Main_new_2/"/>
+    <image id="tgj615p" name="Group 205.png" path="/Main_new/Image/"/>
+    <image id="tgj615q" name="a202_407.png" path="/images/cards2/2/"/>
+    <image id="tgj615r" name="Group 205(1).png" path="/Main_new/Image/"/>
+    <image id="tgj615s" name="a302_418.png" path="/images/cards2/4/"/>
+    <image id="tgj615t" name="a302_415.png" path="/images/cards2/4/"/>
+    <image id="tgj615u" name="a302_412.png" path="/images/cards2/4/"/>
+    <image id="tgj615v" name="a302_409.png" path="/images/cards2/4/"/>
+    <image id="tgj615w" name="a302_406.png" path="/images/cards2/4/"/>
+    <image id="tgj615x" name="a302_400.png" path="/images/cards2/4/"/>
+    <image id="tgj615y" name="a102_418.png" path="/images/cards2/3/"/>
+    <image id="tgj615z" name="a102_415.png" path="/images/cards2/3/"/>
+    <image id="tgj6160" name="a102_412.png" path="/images/cards2/3/"/>
+    <image id="tgj6161" name="a102_409.png" path="/images/cards2/3/"/>
+    <image id="tgj6162" name="a102_406.png" path="/images/cards2/3/"/>
+    <component id="tgj6163" name="Btn_MessageTalk.xml" path="/Main_new/Component/"/>
+    <image id="tgj6164" name="Group 196.png" path="/Main_new_2/Image/"/>
+    <image id="tgj6165" name="pnl-lan.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6166" name="jtfx.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6167" name="labelEnd.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj6168" name="jiesuan_btx_pjjs.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj6169" name="jiesuan_btx_jxyx.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616a" name="jiesuanxiangxi.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616b" name="jiangma.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616c" name="ico_zimo.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616d" name="hu.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616e" name="flush.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616f" name="fanhuipaix.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616g" name="fama.png" path="/component/clearing/clearing1/"/>
+    <component id="tgj616h" name="Component1.xml" path="/component/clearing/clearing1/"/>
+    <image id="tgj616i" name="lk.png" path="/component/clearing/clearing1/"/>
+    <component id="tgj616j" name="clearing_jiangpaiitem.xml" path="/component/clearing/clearing1/"/>
+    <component id="tgj616k" name="clearing_fz_3.xml" path="/component/clearing/clearing1/"/>
+    <component id="tgj616l" name="clearing_card.xml" path="/component/clearing/clearing1/"/>
+    <component id="tgj616m" name="clearing_1_item.xml" path="/component/clearing/clearing1/"/>
+    <image id="tgj616n" name="chat_button_blue.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616o" name="bg_ty.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616p" name="bg_serviceStop_panel.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616q" name="title_win.png" path="/component/clearing/"/>
+    <image id="tgj616r" name="title_lose.png" path="/component/clearing/"/>
+    <image id="tgj616s" name="title_liuju.png" path="/component/clearing/"/>
+    <image id="tgj616t" name="title_jiesan.png" path="/component/clearing/"/>
+    <component id="tgj616u" name="clearing.xml" path="/component/clearing/"/>
+    <component id="tgj616v" name="clearing_fz_4.xml" path="/component/clearing/clearing1/"/>
+    <image id="tgj616w" name="labelShare.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj616x" name="maima.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616y" name="noticeBg.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj616z" name="jfd.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6170" name="host.png" path="/component/clearing/clearing2/"/>
+    <component id="tgj6171" name="Head2.xml" path="/component/clearing/clearing2/"/>
+    <image id="tgj6172" name="hd.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6173" name="fzzj.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6174" name="fxlj.png" path="/component/clearing/clearing2/"/>
+    <image id="tgj6175" name="dyj.png" path="/component/clearing/clearing2/"/>
+    <component id="tgj6176" name="descript_item.xml" path="/component/clearing/clearing2/"/>
+    <component id="tgj6177" name="btn_clearing_return.xml" path="/component/clearing/clearing2/"/>
+    <component id="tgj6178" name="big_result_item.xml" path="/component/clearing/clearing2/"/>
+    <image id="tgj6179" name="放炮.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617a" name="mapai.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617b" name="封顶.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617c" name="zhuang.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617d" name="xqan(2).png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617e" name="xl_xlornament_zb_bg_ziyuan.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617f" name="ting.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617g" name="task_cell_bg.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617h" name="share_record1.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617i" name="report_share_win_text_bg.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617j" name="queding1.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617k" name="pbg.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617l" name="over_btn_zlyj_1.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617m" name="noTing.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617n" name="四连冠.png" path="/component/clearing/clearing1/"/>
+    <image id="tgj617o" name="Group 76.png" path="/Main_new_2/Image/"/>
+    <component id="tgj617p" name="Btn_MessageTalk.xml" path="/Main_new/Chat/Component/"/>
+    <image id="tgj617q" name="Group 205(1).png" path="/Main_new/Chat/Image/"/>
+    <image id="tgj617r" name="Group 205.png" path="/Main_new/Chat/Image/"/>
+    <component id="lj2n17s" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
+    <image id="lj2n17t" name="Record2_08.png" path="/Main_new/Main/Image/"/>
+    <image id="lj2n17u" name="mahj_next_one_btn.png" path="/Main_new/record/"/>
+    <image id="lj2n17v" name="mahj_pause_btn.png" path="/Main_new/record/"/>
+    <image id="lj2n17w" name="mahj_previous_btn.png" path="/Main_new/record/"/>
+    <image id="lj2n17x" name="mahj_record_speed_bg.png" path="/Main_new/record/"/>
+    <image id="lj2n17y" name="mahj_restart_btn.png" path="/Main_new/record/"/>
+    <image id="lj2n17z" name="mahj_start_btn.png" path="/Main_new/record/"/>
+    <image id="lj2n180" name="stop.png" path="/Main_new/record/"/>
+    <image id="lj2n181" name="4919.png" path="/Main_new/record/font/"/>
+    <image id="lj2n182" name="4920.png" path="/Main_new/record/font/"/>
+    <image id="lj2n183" name="4921.png" path="/Main_new/record/font/"/>
+    <image id="lj2n184" name="4922.png" path="/Main_new/record/font/"/>
+    <image id="lj2n185" name="4923.png" path="/Main_new/record/font/"/>
+    <image id="lj2n186" name="4924.png" path="/Main_new/record/font/"/>
+    <image id="lj2n187" name="4925.png" path="/Main_new/record/font/"/>
+    <image id="lj2n188" name="4926.png" path="/Main_new/record/font/"/>
+    <image id="lj2n189" name="4927.png" path="/Main_new/record/font/"/>
+    <image id="lj2n18a" name="4928.png" path="/Main_new/record/font/"/>
+    <image id="lj2n18b" name="x.png" path="/Main_new/record/font/"/>
+    <font id="lj2n18c" name="MJ_recordSpeed.fnt" path="/Main_new/record/font/" exported="true"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyd.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyi.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyj.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyk.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyl.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_jrro7cyp.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes.meta

@@ -3,5 +3,5 @@ guid: c1652156a48ed314e92cb8121851e5aa
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleName: 
   assetBundleVariant: