0902问题解决后同步

lua_probject/base_project/Game/Controller/GameController.lua

@@ -164,8 +164,9 @@ function M:ExitWitnessGame(pid, gid, rid)
     local _data = {}
     _data["pid"] = pid
     _data["room_id"] = rid
+    -- _data["session"] = _client:getSession()
     _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data)
-    -- _client:destroy()
+    _client:destroy()
 end
 
 --聊天
@@ -180,7 +181,7 @@ function M:SendInteraction(playid, type, parm, callback)
     local _data = {}
     _data['playerid'] = playid
     _data['type'] = type
-    _data['parm'] = tonumber(parm)
+    _data['parm'] = parm
     -- _data['gid'] = 1
     _client:send(Protocol.GAME_INTERACTION, _data, function(res)
         if callback then

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1002,18 +1002,34 @@ end
 ---@param platform function GetPlatform()
 ---@param militarys table 战绩id列表
 ---@param is_read number 0是将选中战绩设置为未读，1是将选中战绩选择为已读
-function M:FG_SetGroupRecordReadStatus(group_id, platform, militarys, is_read, callback)
+---@param tagId number 战绩所属的玩家
+function M:FG_SetGroupRecordReadStatus(group_id, platform, militarys, is_read, tagId, callback)
     local _client  = ControllerManager.GroupClient
     local data     = {}
     data.id        = group_id
     data.platform  = platform
     data.militarys = militarys
     data.is_read   = is_read
+    data.tagId     = tagId
     _client:send(Protocol.WEB_FG_SET_RECORD_READ, data, function(res)
         callback(res)
     end)
 end
 
+---comment 发送分数限制协议，仅起源互娱（情怀）使用
+---@param group_id number 亲友圈id
+---@param dayType number 分数限制类型，type为1是限制一天，type为2是限制两天
+---@param callback function
+function M:FG_SetGroupRecordUpdateDayType(group_id, dayType, callback)
+    local _client = ControllerManager.GroupClient
+    local data    = {}
+    data.id       = group_id
+    data.dayType  = dayType
+    _client:send(Protocol.WEB_FG_SET_DAY_SCORE, data, function(res)
+        callback(res)
+    end)
+end
+
 -- 获取战绩
 function M:FG_GetGroupRecordSpe(group_id, platform, qid, includeMembers, limit, num, begin_time, end_time, time_type,
                                 callback)
@@ -1600,14 +1616,13 @@ end
 ---@param mj_score number 麻将限制分
 ---@param pk_score number 扑克限制分
 ---@param callback function 回调函数
-function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, day, callback)
+function M:FG_SetJoinScore(group_id, playerId, mj_score, pk_score, callback)
     local _client = ControllerManager.GroupClient
     local _data = {}
     _data.id = group_id
     _data.playerId = playerId
     _data.mj_score = mj_score
     _data.pk_score = pk_score
-    _data.day = day
     _client:send(Protocol.WEB_FG_SET_JOIN_SCORE, _data, function(res)
         callback(res)
     end)

lua_probject/base_project/Game/Protocol.lua

@@ -331,6 +331,8 @@ Protocol = {
     WEB_FG_GET_MEMBER_STAT          = "group/log/get_member_stat",
     -- 修改战绩阅读状态
     WEB_FG_SET_RECORD_READ          = "group/log/read_records",
+    -- 修改分数限制天数（情怀，起源互娱）
+    WEB_FG_SET_DAY_SCORE            = "group/update_day_score",
     -- 获取合伙人统计
     WEB_FG_GET_PARTNER_STAT         = "group/log/get_partner_stat",
     --获取钻石消耗统计

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

@@ -32,8 +32,8 @@ function M:init(url, lev, res)
     self._view:GetChild('name').text               = string.format("%s(%s)", info.nick, info.uid)
     self._view:GetChild('text_allRounds').text     = info.total_round
     self._view:GetChild('text_joinTime').text      = os.date('%Y-%m-%d  %H:%M', info.join_time)
-    self._view:GetChild('text_score_majiang').text = MJScore
+    self._view:GetChild('text_score_majiang').text = -MJScore
-    self._view:GetChild('text_score_poker').text   = PKScore
+    self._view:GetChild('text_score_poker').text   = -PKScore
 
     ImageLoad.Load(icon_url, self._view:GetChild('btn_head'):GetChild('icon'))
 
@@ -57,7 +57,7 @@ function M:init(url, lev, res)
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
                     MJScore = tonumber(text)
-                    self._view:GetChild('text_score_majiang').text = MJScore
+                    self._view:GetChild('text_score_majiang').text = -MJScore
                 end
             end)
         end)
@@ -71,7 +71,7 @@ function M:init(url, lev, res)
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
                     PKScore = tonumber(text)
-                    self._view:GetChild('text_score_poker').text = PKScore
+                    self._view:GetChild('text_score_poker').text = -PKScore
                 end
             end)
         end)

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

@@ -64,7 +64,6 @@ function FamilyNumberRecord.New(root, page)
     self.text_score_poker.text = 0 - self.PKScore
     self._viewText_titleRecord.emojies = EmojiDitc.EmojiesDitc
     self._viewText_titleRecord.text = string.format("%s  成员记录", self._text_groupTitle)
-    self._view:GetChild('text_residueDiamond').text = root._group.diamo
     self._view:GetChild('text_timeRecord').text = os.date('%Y-%m-%d  %H:%M:%S', os.time())
     self._view:GetController('lev').selectedIndex = group.lev == 1 and 0 or 1
 
@@ -100,8 +99,20 @@ function FamilyNumberRecord.New(root, page)
         self:OnClickSortType()
     end)
 
+    ctr_limitDay.selectedIndex = 0
     ctr_limitDay.onChanged:Set(function()
+        if self.ctr_limitDay_isReverting then
+            self.ctr_limitDay_isReverting = false
+            return
+        end
         --写限制分数
+        fgCtr:FG_SetGroupRecordUpdateDayType(group_id, ctr_limitDay.selectedIndex + 1, function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "分数限制分设置失败")
+                self.ctr_limitDay_isReverting = true
+                ctr_limitDay.selectedIndex = 1 - ctr_limitDay.selectedIndex
+            end
+        end)
     end)
 
     self.ctr_numberRecord.onChanged:Set(function()
@@ -152,7 +163,7 @@ function FamilyNumberRecord.New(root, page)
             else
                 day = 2
             end
-            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, day, function(res)
+            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
@@ -172,7 +183,7 @@ function FamilyNumberRecord.New(root, page)
             else
                 day = 2
             end
-            fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), day, function(res)
+            fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ShowOneChooose("修改限制分失败" .. res.ReturnCode)
                 else
@@ -184,11 +195,19 @@ function FamilyNumberRecord.New(root, page)
     end)
     self._view:GetChild('btn_allChoose').onClick:Set(function()
         self._flag_allChoose = self.records[self.gameTypeNum][self.readStatusNum].childNum
+        for i = 1, self.records[self.gameTypeNum][self.readStatusNum].childNum do
+            local info = self.records[self.gameTypeNum][self.readStatusNum][i]
+            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
+        end
         self._viewlist_numberRecordDetail:RefreshVirtualList()
     end)
     self._view:GetChild('btn_allChooseRead').onClick:Set(function()
         local newReadType = 3 - self.readStatusNum
-        fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1,
+        fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId,
             function(res)
                 pt(res)
                 if res.ReturnCode ~= 0 then
@@ -196,11 +215,22 @@ function FamilyNumberRecord.New(root, page)
                 else
                     self.ctr_numberRecord.selectedIndex = 1
                     self:OnClickNumberRank(group_id, self.rankNumber.uid, self.rankNumber.round)
+                    self.military = { size = 0, list = {} }
                 end
             end)
     end)
     self._view:GetChild('btn_allChooseReverse').onClick:Set(function()
         self._flag_allChooseReverse = self.records[self.gameTypeNum][self.readStatusNum].childNum
+        local military_bar = { size = 0, list = {} }
+        for i = 1, self.records[self.gameTypeNum][self.readStatusNum].childNum do
+            local info = self.records[self.gameTypeNum][self.readStatusNum][i]
+            if not self.military[info.military_id] then
+                military_bar.size = self.military.size + 1
+                military_bar[info.military_id] = military_bar.size
+                table.insert(military_bar.list, info.military_id)
+            end
+        end
+        self.military = military_bar
         self._viewlist_numberRecordDetail:RefreshVirtualList()
     end)
 
@@ -220,18 +250,25 @@ function FamilyNumberRecord.New(root, page)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
         else
-            -- MJScore = tonumber(res.Data.mj_score)
+            local res_data = res.Data
-            -- PKScore = tonumber(res.Data.pk_score)
+            self._view:GetChild('text_residueDiamond').text = res_data.diamo
-            -- text_score_majiang.text = 0 - MJScore
+            text_allRound.text = res_data.round
-            -- text_score_poker.text = 0 - PKScore
+            text_winNum.text = res_data.win_count
+            text_useDiamond.text = res_data.diamo_cost
+            self.MJScore = tonumber(res.Data.mj_score)
+            self.PKScore = tonumber(res.Data.pk_score)
+            self.text_score_majiang.text = 0 - self.MJScore
+            self.text_score_poker.text = 0 - self.PKScore
+            self.ctr_limitDay_isReverting = true
+            ctr_limitDay.selectedIndex = res_data.dayType - 1
         end
     end)
     return self
 end
 
 function M:InitBoxType()
-    local items = { "扑克", "麻将" }
+    local items = { "麻将", "扑克" }
-    local values = { "0", "1" }
+    local values = { "1", "0" }
 
     local games = DataManager.SelfUser.games
     for i = 1, #games do
@@ -239,7 +276,7 @@ function M:InitBoxType()
         table.insert(values, tostring(games[i].game_id))
     end
 
-    self._data_seletedType = "0"
+    self._data_seletedType = "1"
     return items, values
 end
 
@@ -283,7 +320,12 @@ function M:NumverRecordRenderer()
             self.ctr_numberRecord.selectedIndex = 2
             self.gameTypeNum = index + 1
             self.readStatusNum = 2
+            self.military = { size = 0, list = {} }
+            if self._viewlist_numberRecordDetail.numItems == info.childNum then
+                self._viewlist_numberRecordDetail:RefreshVirtualList()
+            else
                 self._viewlist_numberRecordDetail.numItems = info.childNum
+            end
         end)
     end
     numberRankListRead.numItems = 2
@@ -302,7 +344,12 @@ function M:NumverRecordRenderer()
             self.ctr_numberRecord.selectedIndex = 2
             self.gameTypeNum = index + 1
             self.readStatusNum = 1
+            self.military = { size = 0, list = {} }
+            if self._viewlist_numberRecordDetail.numItems == info.childNum then
+                self._viewlist_numberRecordDetail:RefreshVirtualList()
+            else
                 self._viewlist_numberRecordDetail.numItems = info.childNum
+            end
         end)
     end
     numberRankListUnRead.numItems = 2
@@ -316,7 +363,9 @@ function M:NumberRecordDetailRender()
         obj:GetChild('text_gameName').text = info.game_info.name
         obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time)
         obj:GetChild('text_roomID').text = info.room_id
-        obj:GetChild('text_userDiamond').text = 0
+        obj:GetChild('text_userDiamond').text = info.info
+        obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
+        obj:GetChild('text_playName').text = info.pname
         obj:GetChild('btn_lookRecord').onClick:Set(function()
             self._viewList_recordDetail:RemoveChildrenToPool()
             for i = 1, tonumber(info.round) do
@@ -330,6 +379,8 @@ function M:NumberRecordDetailRender()
             end
             self.ctr_numberRecord.selectedIndex = 3
         end)
+        obj:GetController('seleted').onChanged:Clear()
+        obj:GetController('seleted').selectedIndex = self.military[info.military_id] and 1 or 0
         obj:GetController('seleted').onChanged:Set(function(context)
             pt(getmetatable(context.sender))
             if context.sender.selectedIndex == 1 then
@@ -346,14 +397,6 @@ function M:NumberRecordDetailRender()
                 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)
@@ -488,8 +531,6 @@ function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
                     self:RecursionGetNumberRank(fgCtr, index + 1, round, win, cost)
                 else
                     round = math.floor(round / 2)
-                    self._view:GetChild('text_allRound').text = round
-                    self._view:GetChild('text_winNum').text = win
                     self.showRank = self.rank
                     self._viewList_numverRecord.numItems = #self.showRank
                 end
@@ -541,6 +582,7 @@ function M:RecursionGetNumberRecord(fgCtr, groupId, uid, index)
                 else
                     self._viewList_numberRankRead:RefreshVirtualList()
                     self._viewList_numberRankUnRead:RefreshVirtualList()
+                    self._tagId = uid
                 end
             end
         end)

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

@@ -170,7 +170,7 @@ 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('text_useDiamond').text = data.valid_diamo
     obj:GetChild('btn_detail').onClick:Set(function()
         self._viewList_recordDetail:RemoveChildrenToPool()
         for i = 1, tonumber(data.round) do
@@ -184,7 +184,8 @@ function M:RecordItemRenderer(data, obj)
         end
         self._ctr_cWindow.selectedIndex = 1
     end)
-    -- obj:GetChild('text_playName').text = .name
+    obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
+    obj:GetChild('text_playName').text = data.pname
     local resultDetailList = obj:GetChild('list_familyPlayer')
     resultDetailList:SetVirtual()
     resultDetailList.itemRenderer = function(index, obj)

lua_probject/base_project/Game/View/LobbyView.lua

@@ -497,7 +497,7 @@ function M:GetPlayerInfoData()
             self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
             if data.group_id ~= 0 then
                 -- 重连
-                -- self:ReconnectRoom(data.groupId)
+                self:ReconnectRoom(data.groupId)
             end
         end
     end)
@@ -553,6 +553,7 @@ function M:ReconnectRoom(groupId)
                     return
                 else
                     FamilyView.lastId = groupId
+                    DataManager.SelfUser.room_id = ""
                     ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
                 end
             end,

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -236,6 +236,7 @@ end
 -- 表情 语音
 function M:ShowInteraction(type, str)
     if type == 3 then
+        print("lingmeng ShowInteractionq",str)
         Voice.DownLoad(
             str,
             function(clip)

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

@@ -5,7 +5,7 @@ local EXClearingView = {}
 
 local M = EXClearingView
 
-function EXClearingView.new(blur_view)
+function EXClearingView.new(blur_view, data)
     setmetatable(M, { __index = ResultView })
     local self = setmetatable({}, { __index = M })
     self._full = true
@@ -16,6 +16,9 @@ function EXClearingView.new(blur_view)
     self._currenIndex = 0
     self._blur_view = blur_view
     self._close_zone = false
+    if data then
+        self.flag_back = data.flag_back
+    end
     -- self:InitMaPai()
 
     return self
@@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    --回放不需要显示还剩下多少牌
+    if self.flag_back then
+        result.cardList = {}
+        mainCtr.selectedIndex = 1
+        nextRoundBtn2.touchable = false
+    else
         if result then
+            if result.cardList then
                 result.cardList = json.decode(result.cardList)
-        --table.sort(result.cardList)
+            end
+        end
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua

@@ -61,9 +61,10 @@ end
 
 ------------------------------------------------------------
 
-function M:SendOutCard(card, callback)
+function M:SendOutCard(data, callback)
     local _data = {}
-    _data["card"] = card
+    _data["card"] = data.card
+    _data["isTip"] = data.isTip
     local _room = self._room
     local _client = ControllerManager.GameNetClinet
     _client:send(TX_Protocol.GAME_DIS_CARD, _data)
@@ -71,14 +72,14 @@ function M:SendOutCard(card, callback)
     -- 进行预删牌处理
     local p = _room.self_player
     _room.curren_outcard_seat = -1
-    list_remove(p.card_list, card)
+    list_remove(p.card_list, data.card)
 
     table.sort(p.card_list, self.HandCardSortAndJing)
 
 
     p.hand_left_count = p.hand_left_count - 1
     if not p.outcard_list then p.outcard_list = {} end
-    p.outcard_list[#p.outcard_list + 1] = card
+    p.outcard_list[#p.outcard_list + 1] = data.card
     __pre_delete_card = true
     callback()
 end

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -381,7 +381,6 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
-        self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
         self:UpdateCardBox(0)
@@ -390,6 +389,9 @@ function M:EventInit()
         local total_result = arg[2]
         local result = arg[1]
         local over = arg[3]
+        if over < 2 or _room.curren_round > 0 then
+            self:PlayMJSound("end_music.mp3")
+        end
         self._clearingView = EXClearingView.new()
         coroutine.start(function()
             coroutine.wait(0.5)
@@ -467,7 +469,7 @@ function M:OutCard(card)
         printlog("当前出牌为===>>>" .. card)
         local _gamectr = ControllerManager.GetController(GameController)
         self._room.curren_outcard_seat = -1
-        _gamectr:SendOutCard(card, function()
+        _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function()
             local info = self._player_card_info[1]
             self:RemoveCursor()
             info:UpdateHandCard()
@@ -798,8 +800,10 @@ function M:ReloadRoom(bskip)
     if bskip == nil or bskip == false then
         if not room.playing then
             self._state.selectedIndex = 2
+            self._ctr_action.selectedIndex = 1
         else
             self._state.selectedIndex = 1
+            self._ctr_action.selectedIndex = 0
             self._room._reload_flag = true
         end
     end
@@ -913,7 +917,7 @@ function M:FillShowCards(obj, card, num)
         end
     end
     if obj.icon then
-        obj.icon = 'ui://Main_Majiang/201_' .. card
+        obj.icon = 'ui://Main_Majiang/b201_' .. card
     else
         obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card
     end

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

@@ -139,12 +139,12 @@ function M:ShowStep(index)
 	end
 	if step.cmd == Record_Event.Evt_Result then
         if not self.result then
-			self.result = EXClearingView.new(self._root_view, true)
+            self.result = EXClearingView.new(self._root_view, { flag_back = true })
             self.result:InitData(0, self._room, step.result_data)
             self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
             self.result._view.width = GRoot.inst.width
             self.result._view.height = GRoot.inst.height
-			self.result._view:GetChild("btn_confirm").visible = false
+            -- self.result._view:GetChild("btn_confirm").visible = false
             self._anchor:AddChild(self.result._view)
             self.result._view.x = self._anchor.x * -1
             self.result._view.y = self._anchor.y * -1
@@ -152,10 +152,10 @@ function M:ShowStep(index)
             self.result._view.visible = true
         end
         -- self.result._view:Center()
-	else
+        -- else
-		if self.result then
+        --     if self.result then
-			self.result._view.visible = false
+        --         self.result._view.visible = false
-		end
+        --     end
     end
 end
 

lua_probject/extend_project/extend/majiang/fuzhou/EXRoomConfig.lua

@@ -146,7 +146,7 @@ function M:GetGameSMSize()
 end
 
 function M:GetGameName()
-	return "个旧麻将"
+	return "抚州麻将"
 end
 
 return M

lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua

@@ -65,11 +65,14 @@ function M:InitView(url)
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id
     self._view:GetChild('wanfa_text').text = gamePlay
-    self._ctr_state = self._view:GetController("state")
+    self._state = self._view:GetController("state")
 
     self._text_remined = self._view:GetChild('remaining_card')
     self._text_round = self._view:GetChild('text_round')
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
+    self._state.onChanged:Add(function()
+        self:UpdatePlayerInfoView()
+    end)
 
     self:UpdateRound()
     self:InitPlayerInfoView()
@@ -89,8 +92,8 @@ function M:InitView(url)
         for i = 1, #p.fz_list do
             cardInfo:UpdateFzList(p.fz_list[i], -1)
         end
-        info:FillData(p)
+        -- info:FillData(p)
-        info._view.visible = true
+        -- info._view.visible = true
     end
 
     local btn_rule = self._view:GetChild('btn_rule')
@@ -121,21 +124,23 @@ function M:InitView(url)
     local btn_witness = self._view:GetChild('btn_pangGuang')
     if btn_witness then
         btn_witness.onClick:Set(function()
-            if room._flag_updateWitness then
+            self._view:GetController('witness').selectedIndex = 1
-                room._flag_updateWitness = false
+        end)
+    end
+
+    --直接渲染观战人员
     if viewList_witness.numItems == #room.witness_player_list then
         viewList_witness:RefreshVirtualList()
     else
         viewList_witness.numItems = #room.witness_player_list
     end
-            end
-            self._view:GetController('witness').selectedIndex = 1
-        end)
-    end
 
+    --展示精牌
+    self.jing = self._view:GetChild('jing')
+    self:ShowJing()
     -------------------------------------------------------
 
-    self._ctr_state.selectedIndex = 4
+    self._state.selectedIndex = 4
     self.com_logocType.selectedIndex = 0
 end
 
@@ -153,6 +158,22 @@ function M:EventInit()
         print("lingmeng witness PlayerEnter")
     end)
 
+    _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
+        self:PlayMJSound("user_enter.mp3")
+        local arg = { ... }
+        local witnessPlayerList = arg[1]
+        self._room.witness_player_list = witnessPlayerList
+
+        local _room = DataManager.CurrenRoom
+        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
+        print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
+        if viewList_witness.numItems == #_room.witness_player_list then
+            viewList_witness:RefreshVirtualList()
+        else
+            viewList_witness.numItems = #_room.witness_player_list
+        end
+    end)
+
     _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
         local arg = { ... }
         print("lingmeng witness SendLaiZi")
@@ -176,7 +197,7 @@ function M:EventInit()
             self._clearingView = nil
         end
         self:UpdateRound()
-        self._ctr_state.selectedIndex = 4
+        self._state.selectedIndex = 4
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]
@@ -286,7 +307,7 @@ function M:EventInit()
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
                 DataManager.CurrenRoom.self_player.card_list = {}
-                self._ctr_state.selectedIndex = 2
+                self._state.selectedIndex = 2
                 self._clearingView = nil
             end)
         end
@@ -334,6 +355,11 @@ function M:InitPlayerInfoView()
     end
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:NewMJPlayerCardInfoView(view, index)
     return MJMainView.NewMJPlayerCardInfoView(self, view, index)
     --[[
@@ -381,11 +407,40 @@ function M:OnFangziAction(...)
     -- self:__CloseTip()
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:UpdateRound()
     self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
+function M:ShowJing()
+    if self._room.jing then
+        self.jing.visible = true
+        MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing)
+    else
+        self.jing.visible = false
+    end
+end
+
+function M:UpdatePlayerInfoView()
+    self._player_info = {}
+    local _player_info = self._player_info
+    local list = self._room.player_list
+
+    for i = 1, self._room.room_config.people_num do
+        local seat = self:GetPos(list[i].seat)
+        local tem = self._view:GetChild(string.format("player_info%d_%d", seat,
+            (self._state.selectedIndex == 4 and 1 or 0) + 1))
+        _player_info[seat] = PlayerInfoView.new(tem, self)
+        _player_info[seat]:FillData(list[i])
+        printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
+    end
+end
+
 function M:OnUpdate()
     if (self._popEvent) then
         local func = self._gamectr:PopEvent()

lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua

@@ -113,7 +113,7 @@ function M:FillRoomData(s2croom)
                 p.fz_list[#p.fz_list + 1] = fz
             end
             if not playing and room.curren_round > 0 then
-                self.GetGameController():PlayerReady()
+                -- self.GetGameController():PlayerReady()
             end
         end
     end
@@ -191,6 +191,7 @@ function M:FillWitnessData(pd_data)
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
     room.curren_round = _tableInfo["round"]
+    room.witness_player_list = _tableInfo["playerSpectatorData"]
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
         local _jp = _info_list[i]

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

@@ -5,7 +5,7 @@ local EXClearingView = {}
 
 local M = EXClearingView
 
-function EXClearingView.new(blur_view)
+function EXClearingView.new(blur_view, data)
     setmetatable(M, { __index = ResultView })
     local self = setmetatable({}, { __index = M })
     self._full = true
@@ -16,6 +16,9 @@ function EXClearingView.new(blur_view)
     self._currenIndex = 0
     self._blur_view = blur_view
     self._close_zone = false
+    if data then
+        self.flag_back = data.flag_back
+    end
     -- self:InitMaPai()
 
     return self
@@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    --回放不需要显示还剩下多少牌
+    if self.flag_back then
+        result.cardList = {}
+        mainCtr.selectedIndex = 1
+        nextRoundBtn2.touchable = false
+    else
         if result then
+            if result.cardList then
                 result.cardList = json.decode(result.cardList)
-        --table.sort(result.cardList)
+            end
+        end
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua

@@ -61,25 +61,26 @@ end
 
 ------------------------------------------------------------
 
-function M:SendOutCard(card, callback)
+function M:SendOutCard(data, callback)
     local _data = {}
-    _data["card"] = card
+    _data["card"] = data.card
-    _data["isTip"] = false
+    _data["isTip"] = data.isTip
     local _room = self._room
     local _client = ControllerManager.GameNetClinet
+
     _client:send(TX_Protocol.GAME_DIS_CARD, _data)
 
     -- 进行预删牌处理
     local p = _room.self_player
     _room.curren_outcard_seat = -1
-    list_remove(p.card_list, card)
+    list_remove(p.card_list, data.card)
 
     table.sort(p.card_list, self.HandCardSortAndJing)
 
 
     p.hand_left_count = p.hand_left_count - 1
     if not p.outcard_list then p.outcard_list = {} end
-    p.outcard_list[#p.outcard_list + 1] = card
+    p.outcard_list[#p.outcard_list + 1] = data.card
     __pre_delete_card = true
     callback()
 end

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -92,10 +92,6 @@ function M:InitView(url)
     if room.playing or room.curren_round > 0 then
         self:ReloadRoom()
     end
-
-    ---------为了下次复现出牌情况
-    --self._viewText_testName = self._view:GetChild('text_testName')
-    --self._viewText_testName.text = 0
 end
 
 function M:__BuGang(cardInfo, callback)
@@ -477,7 +473,6 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
-        self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
         self:UpdateCardBox(0)
@@ -486,6 +481,9 @@ function M:EventInit()
         local total_result = arg[2]
         local result = arg[1]
         local over = arg[3]
+        if over < 2 or _room.curren_round > 0 then
+            self:PlayMJSound("end_music.mp3")
+        end
         self._clearingView = EXClearingView.new()
         coroutine.start(function()
             coroutine.wait(0.5)
@@ -563,7 +561,7 @@ function M:OutCard(card)
         printlog("当前出牌为===>>>" .. card)
         local _gamectr = ControllerManager.GetController(GameController)
         self._room.curren_outcard_seat = -1
-        _gamectr:SendOutCard(card, function()
+        _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function()
             local info = self._player_card_info[1]
             self:RemoveCursor()
             info:UpdateHandCard()
@@ -894,8 +892,10 @@ function M:ReloadRoom(bskip)
     if bskip == nil or bskip == false then
         if not room.playing then
             self._state.selectedIndex = 2
+            self._ctr_action.selectedIndex = 1
         else
             self._state.selectedIndex = 1
+            self._ctr_action.selectedIndex = 0
             self._room._reload_flag = true
         end
     end
@@ -1009,7 +1009,7 @@ function M:FillShowCards(obj, card, num)
         end
     end
     if obj.icon then
-        obj.icon = 'ui://Main_Majiang/201_' .. card
+        obj.icon = 'ui://Main_Majiang/b201_' .. card
     else
         obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card
     end

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

@@ -139,12 +139,12 @@ function M:ShowStep(index)
 	end
 	if step.cmd == Record_Event.Evt_Result then
 		if not self.result then
-			self.result = EXClearingView.new(self._root_view, true)
+            self.result = EXClearingView.new(self._root_view, { flag_back = true })
             self.result:InitData(0, self._room, step.result_data)
             self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
             self.result._view.width = GRoot.inst.width
             self.result._view.height = GRoot.inst.height
-			self.result._view:GetChild("btn_confirm").visible = false
+            -- self.result._view:GetChild("btn_confirm").visible = false
             self._anchor:AddChild(self.result._view)
             self.result._view.x = self._anchor.x * -1
             self.result._view.y = self._anchor.y * -1
@@ -152,10 +152,10 @@ function M:ShowStep(index)
             self.result._view.visible = true
         end
         -- self.result._view:Center()
-	else
+        -- else
-		if self.result then
+        --     if self.result then
-			self.result._view.visible = false
+        --         self.result._view.visible = false
-		end
+        --     end
     end
 end
 

lua_probject/extend_project/extend/majiang/jinxi/EXRoomConfig.lua

@@ -146,7 +146,7 @@ function M:GetGameSMSize()
 end
 
 function M:GetGameName()
-	return "个旧麻将"
+	return "金溪麻将"
 end
 
 return M

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -64,21 +64,24 @@ function M:InitView(url)
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id
     self._view:GetChild('wanfa_text').text = gamePlay
-    self._ctr_state = self._view:GetController("state")
+    self._state = self._view:GetController("state")
 
     self._text_remined = self._view:GetChild('remaining_card')
     self._text_round = self._view:GetChild('text_round')
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
+    self._state.onChanged:Add(function()
+        self:UpdatePlayerInfoView()
+    end)
 
     self:UpdateRound()
-    self:InitPlayerInfoView()
+    -- self:InitPlayerInfoView()
     self._player_card_info = {}
     local _player_card_info = self._player_card_info
     for i = 1, #room.player_list do
         local p = room.player_list[i]
         local index = self:GetPos(p.seat)
         print("lingmeng index", index)
-        local info = self._player_info[index]
+        -- local info = self._player_info[index]
         local tem = self._view:GetChild("player_card_info" .. index)
         _player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
         local cardInfo = _player_card_info[index]
@@ -88,8 +91,8 @@ function M:InitView(url)
         for i = 1, #p.fz_list do
             cardInfo:UpdateFzList(p.fz_list[i], -1)
         end
-        info:FillData(p)
+        -- info:FillData(p)
-        info._view.visible = true
+        -- info._view.visible = true
     end
 
     local btn_rule = self._view:GetChild('btn_rule')
@@ -136,7 +139,7 @@ function M:InitView(url)
     self:ShowJing()
     -------------------------------------------------------
 
-    self._ctr_state.selectedIndex = 4
+    self._state.selectedIndex = 4
     self.com_logocType.selectedIndex = 3
 end
 
@@ -193,7 +196,7 @@ function M:EventInit()
             self._clearingView = nil
         end
         self:UpdateRound()
-        self._ctr_state.selectedIndex = 4
+        self._state.selectedIndex = 4
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]
@@ -303,7 +306,7 @@ function M:EventInit()
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
                 DataManager.CurrenRoom.self_player.card_list = {}
-                self._ctr_state.selectedIndex = 2
+                self._state.selectedIndex = 2
                 self._clearingView = nil
             end)
         end
@@ -403,6 +406,11 @@ function M:OnFangziAction(...)
     -- self:__CloseTip()
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:UpdateRound()
     self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
@@ -417,6 +425,21 @@ function M:ShowJing()
     end
 end
 
+function M:UpdatePlayerInfoView()
+    self._player_info = {}
+    local _player_info = self._player_info
+    local list = self._room.player_list
+
+    for i = 1, self._room.room_config.people_num do
+        local seat = self:GetPos(list[i].seat)
+        local tem = self._view:GetChild(string.format("player_info%d_%d", seat,
+            (self._state.selectedIndex == 4 and 1 or 0) + 1))
+        _player_info[seat] = PlayerInfoView.new(tem, self)
+        _player_info[seat]:FillData(list[i])
+        printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
+    end
+end
+
 function M:OnUpdate()
     if (self._popEvent) then
         local func = self._gamectr:PopEvent()

lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua

@@ -81,9 +81,6 @@ function M:FillRoomData(s2croom)
 
     if (reload) then
         local _reloadInfo = s2croom["reloadInfo"]
-        local _hand_card = _reloadInfo["hand_card"]
-        room.self_player.card_list = _hand_card
-        table.sort(_hand_card, self.HandCardSortAndJing)
 
         local active_seat = _reloadInfo["active_seat"]
         local bank_seat = _reloadInfo["banker_seat"]
@@ -100,6 +97,10 @@ function M:FillRoomData(s2croom)
         if jing then
             room.jing = jing
         end
+        --将排序放在精牌后面
+        local _hand_card = _reloadInfo["hand_card"]
+        room.self_player.card_list = _hand_card
+        table.sort(_hand_card, self.HandCardSortAndJing)
         for i = 1, #_info_list do
             local tem = _info_list[i]
             local playerid = tem["playerid"]
@@ -119,7 +120,7 @@ function M:FillRoomData(s2croom)
                 p.fz_list[#p.fz_list + 1] = fz
             end
             if not playing and room.curren_round > 0 then
-                self.GetGameController():PlayerReady()
+                -- self.GetGameController():PlayerReady()
             end
         end
     end

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

@@ -288,6 +288,15 @@ 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
+    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)

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

@@ -49,6 +49,7 @@ function M:SendNextCard(card)
     local _data = {}
     _data["card"] = tonumber(card)
     local _client = ControllerManager.GameNetClinet
+
     _client:send(TX_Protocol.GAME_NEXT_CARD, _data)
 end
 
@@ -67,6 +68,7 @@ function M:SendOutCard(data, callback)
     _data["isTip"] = data.isTip
     local _room = self._room
     local _client = ControllerManager.GameNetClinet
+
     _client:send(TX_Protocol.GAME_DIS_CARD, _data)
 
     -- 进行预删牌处理

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

@@ -92,10 +92,6 @@ function M:InitView(url)
     if room.playing or room.curren_round > 0 then
         self:ReloadRoom()
     end
-
-    ---------为了下次复现出牌情况
-    --self._viewText_testName = self._view:GetChild('text_testName')
-    --self._viewText_testName.text = 0
 end
 
 function M:__BuGang(cardInfo, callback)
@@ -221,7 +217,6 @@ function M:EventInit()
 
     _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
         -- self:ShowHuTip()
-        --测试用记录出牌权次数
         --self._viewText_testName.text = 0
         self:UpdateRound()
         self._state.selectedIndex = 1
@@ -483,9 +478,9 @@ function M:EventInit()
         local total_result = arg[2]
         local result = arg[1]
         local over = arg[3]
-        if over < 2 or _room.curren_round > 0 then
+        -- if over < 2 or _room.curren_round > 0 then
-            self:PlayMJSound("end_music.mp3")
+        --     self:PlayMJSound("end_music.mp3")
-        end
+        -- end
         self._clearingView = EXClearingView.new()
         coroutine.start(function()
             coroutine.wait(0.5)
@@ -893,8 +888,10 @@ function M:ReloadRoom(bskip)
     if bskip == nil or bskip == false then
         if not room.playing then
             self._state.selectedIndex = 2
+            self._ctr_action.selectedIndex = 1
         else
             self._state.selectedIndex = 1
+            self._ctr_action.selectedIndex = 0
             self._room._reload_flag = true
         end
     end
@@ -1008,7 +1005,7 @@ function M:FillShowCards(obj, card, num)
         end
     end
     if obj.icon then
-        obj.icon = 'ui://Main_Majiang/201_' .. card
+        obj.icon = 'ui://Main_Majiang/b201_' .. card
     else
         obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card
     end

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

@@ -65,21 +65,24 @@ function M:InitView(url)
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id
     self._view:GetChild('wanfa_text').text = gamePlay
-    self._ctr_state = self._view:GetController("state")
+    self._state = self._view:GetController("state")
 
     self._text_remined = self._view:GetChild('remaining_card')
     self._text_round = self._view:GetChild('text_round')
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
+    self._state.onChanged:Add(function()
+        self:UpdatePlayerInfoView()
+    end)
 
     self:UpdateRound()
-    self:InitPlayerInfoView()
+    -- self:InitPlayerInfoView()
     self._player_card_info = {}
     local _player_card_info = self._player_card_info
     for i = 1, #room.player_list do
         local p = room.player_list[i]
         local index = self:GetPos(p.seat)
         print("lingmeng index", index)
-        local info = self._player_info[index]
+        -- local info = self._player_info[index]
         local tem = self._view:GetChild("player_card_info" .. index)
         _player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index)
         local cardInfo = _player_card_info[index]
@@ -89,8 +92,8 @@ function M:InitView(url)
         for i = 1, #p.fz_list do
             cardInfo:UpdateFzList(p.fz_list[i], -1)
         end
-        info:FillData(p)
+        -- info:FillData(p)
-        info._view.visible = true
+        -- info._view.visible = true
     end
 
     local btn_rule = self._view:GetChild('btn_rule')
@@ -121,21 +124,23 @@ function M:InitView(url)
     local btn_witness = self._view:GetChild('btn_pangGuang')
     if btn_witness then
         btn_witness.onClick:Set(function()
-            if room._flag_updateWitness then
+            self._view:GetController('witness').selectedIndex = 1
-                room._flag_updateWitness = false
+        end)
+    end
+
+    --直接渲染观战人员
     if viewList_witness.numItems == #room.witness_player_list then
         viewList_witness:RefreshVirtualList()
     else
         viewList_witness.numItems = #room.witness_player_list
     end
-            end
-            self._view:GetController('witness').selectedIndex = 1
-        end)
-    end
 
+    --展示精牌
+    self.jing = self._view:GetChild('jing')
+    self:ShowJing()
     -------------------------------------------------------
 
-    self._ctr_state.selectedIndex = 4
+    self._state.selectedIndex = 4
     self.com_logocType.selectedIndex = 2
 end
 
@@ -153,6 +158,22 @@ function M:EventInit()
         print("lingmeng witness PlayerEnter")
     end)
 
+    _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
+        self:PlayMJSound("user_enter.mp3")
+        local arg = { ... }
+        local witnessPlayerList = arg[1]
+        self._room.witness_player_list = witnessPlayerList
+
+        local _room = DataManager.CurrenRoom
+        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
+        print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
+        if viewList_witness.numItems == #_room.witness_player_list then
+            viewList_witness:RefreshVirtualList()
+        else
+            viewList_witness.numItems = #_room.witness_player_list
+        end
+    end)
+
     _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
         local arg = { ... }
         print("lingmeng witness SendLaiZi")
@@ -176,7 +197,7 @@ function M:EventInit()
             self._clearingView = nil
         end
         self:UpdateRound()
-        self._ctr_state.selectedIndex = 4
+        self._state.selectedIndex = 4
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]
@@ -286,7 +307,7 @@ function M:EventInit()
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
                 DataManager.CurrenRoom.self_player.card_list = {}
-                self._ctr_state.selectedIndex = 2
+                self._state.selectedIndex = 2
                 self._clearingView = nil
             end)
         end
@@ -329,12 +350,17 @@ function M:InitPlayerInfoView()
     self._player_info = {}
     local _player_info = self._player_info
     for i = 1, self._room.room_config.people_num do
-        local tem = self._view:GetChild(string.format("player_info%d_2", i))
+        local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
         _player_info[i] = PlayerInfoView.new(tem, self)
         tem.visible = false
     end
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:NewMJPlayerCardInfoView(view, index)
     return MJMainView.NewMJPlayerCardInfoView(self, view, index)
     --[[
@@ -392,6 +418,30 @@ function M:UpdateRound()
         self._room.room_config.round)
 end
 
+function M:ShowJing()
+    if self._room.jing then
+        self.jing.visible = true
+        MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing)
+    else
+        self.jing.visible = false
+    end
+end
+
+function M:UpdatePlayerInfoView()
+    self._player_info = {}
+    local _player_info = self._player_info
+    local list = self._room.player_list
+
+    for i = 1, self._room.room_config.people_num do
+        local seat = self:GetPos(list[i].seat)
+        local tem = self._view:GetChild(string.format("player_info%d_%d", seat,
+            (self._state.selectedIndex == 4 and 1 or 0) + 1))
+        _player_info[seat] = PlayerInfoView.new(tem, self)
+        _player_info[seat]:FillData(list[i])
+        printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
+    end
+end
+
 function M:OnUpdate()
     if (self._popEvent) then
         local func = self._gamectr:PopEvent()

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

@@ -81,9 +81,7 @@ function M:FillRoomData(s2croom)
 
     if (reload) then
         local _reloadInfo = s2croom["reloadInfo"]
-        local _hand_card = _reloadInfo["hand_card"]
+
-        room.self_player.card_list = _hand_card
-        table.sort(_hand_card, self.HandCardSortAndJing)
 
         local active_seat = _reloadInfo["active_seat"]
         local bank_seat = _reloadInfo["banker_seat"]
@@ -100,6 +98,10 @@ function M:FillRoomData(s2croom)
         if jing then
             room.jing = jing
         end
+        --将排序放在精牌后面
+        local _hand_card = _reloadInfo["hand_card"]
+        room.self_player.card_list = _hand_card
+        table.sort(_hand_card, self.HandCardSortAndJing)
         for i = 1, #_info_list do
             local tem = _info_list[i]
             local playerid = tem["playerid"]
@@ -119,7 +121,7 @@ function M:FillRoomData(s2croom)
                 p.fz_list[#p.fz_list + 1] = fz
             end
             if not playing and room.curren_round > 0 then
-                self.GetGameController():PlayerReady()
+                -- self.GetGameController():PlayerReady()
             end
         end
     end
@@ -141,6 +143,10 @@ function M:FillPlayBackData(pd_data)
     room.curren_round = _tableInfo["round"]
 
     local _info_list = _tableInfo["playerData"]
+    local jing = _tableInfo["jing"]
+    if jing then
+        room.jing = jing
+    end
     for i = 1, #_info_list do
         local _jp = _info_list[i]
         local p = room:NewPlayer()
@@ -197,6 +203,7 @@ function M:FillWitnessData(pd_data)
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
     room.curren_round = _tableInfo["round"]
+    room.witness_player_list = _tableInfo["playerSpectatorData"]
     local jing = _tableInfo["jing"]
     if jing then
         room.jing = jing

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

@@ -5,7 +5,7 @@ local EXClearingView = {}
 
 local M = EXClearingView
 
-function EXClearingView.new(blur_view)
+function EXClearingView.new(blur_view, data)
     setmetatable(M, { __index = ResultView })
     local self = setmetatable({}, { __index = M })
     self._full = true
@@ -16,6 +16,9 @@ function EXClearingView.new(blur_view)
     self._currenIndex = 0
     self._blur_view = blur_view
     self._close_zone = false
+    if data then
+        self.flag_back = data.flag_back
+    end
     -- self:InitMaPai()
 
     return self
@@ -49,9 +52,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    --回放不需要显示还剩下多少牌
+    if self.flag_back then
+        result.cardList = {}
+        mainCtr.selectedIndex = 1
+        nextRoundBtn2.touchable = false
+    else
         if result then
+            if result.cardList then
                 result.cardList = json.decode(result.cardList)
-        --table.sort(result.cardList)
+            end
+        end
     end
     self.list_lastCard = self._view:GetChild('list_lastCard')
 

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

@@ -61,24 +61,26 @@ end
 
 ------------------------------------------------------------
 
-function M:SendOutCard(card, callback)
+function M:SendOutCard(data, callback)
     local _data = {}
-    _data["card"] = card
+    _data["card"] = data.card
+    _data["isTip"] = data.isTip
     local _room = self._room
     local _client = ControllerManager.GameNetClinet
+
     _client:send(TX_Protocol.GAME_DIS_CARD, _data)
 
     -- 进行预删牌处理
     local p = _room.self_player
     _room.curren_outcard_seat = -1
-    list_remove(p.card_list, card)
+    list_remove(p.card_list, data.card)
 
     table.sort(p.card_list, self.HandCardSortAndJing)
 
 
     p.hand_left_count = p.hand_left_count - 1
     if not p.outcard_list then p.outcard_list = {} end
-    p.outcard_list[#p.outcard_list + 1] = card
+    p.outcard_list[#p.outcard_list + 1] = data.card
     __pre_delete_card = true
     callback()
 end

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

@@ -256,7 +256,6 @@ function M:EventInit()
     local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
     _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
         self:__CloseTip()
-        self._left_time = 0
         local arg = { ... }
         local p = arg[1]
         local card = arg[2]
@@ -478,7 +477,6 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
-        self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
         self:UpdateCardBox(0)
@@ -487,6 +485,9 @@ function M:EventInit()
         local total_result = arg[2]
         local result = arg[1]
         local over = arg[3]
+        if over < 2 or _room.curren_round > 0 then
+            self:PlayMJSound("end_music.mp3")
+        end
         self._clearingView = EXClearingView.new()
         coroutine.start(function()
             coroutine.wait(0.5)
@@ -564,7 +565,7 @@ function M:OutCard(card)
         printlog("当前出牌为===>>>" .. card)
         local _gamectr = ControllerManager.GetController(GameController)
         self._room.curren_outcard_seat = -1
-        _gamectr:SendOutCard(card, function()
+        _gamectr:SendOutCard({ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 }, function()
             local info = self._player_card_info[1]
             self:RemoveCursor()
             info:UpdateHandCard()
@@ -819,7 +820,7 @@ function M:OnFangziAction(...)
     local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
     info:UpdateFzList(fz, index, true, seat)
     local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
-    print(getcard)
+    printlog(getcard)
     info:UpdateHandCard(getcard)
     self:__CloseTip()
 end
@@ -896,8 +897,10 @@ function M:ReloadRoom(bskip)
     if bskip == nil or bskip == false then
         if not room.playing then
             self._state.selectedIndex = 2
+            self._ctr_action.selectedIndex = 1
         else
             self._state.selectedIndex = 1
+            self._ctr_action.selectedIndex = 0
             self._room._reload_flag = true
         end
     end
@@ -1011,7 +1014,7 @@ function M:FillShowCards(obj, card, num)
         end
     end
     if obj.icon then
-        obj.icon = 'ui://Main_Majiang/201_' .. card
+        obj.icon = 'ui://Main_Majiang/b201_' .. card
     else
         obj:GetChild("icon").url = 'ui://Main_Majiang/201_' .. card
     end

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

@@ -139,12 +139,12 @@ function M:ShowStep(index)
     end
     if step.cmd == Record_Event.Evt_Result then
         if not self.result then
-			self.result = EXClearingView.new(self._root_view, true)
+            self.result = EXClearingView.new(self._root_view, { flag_back = true })
             self.result:InitData(0, self._room, step.result_data)
             self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
             self.result._view.width = GRoot.inst.width
             self.result._view.height = GRoot.inst.height
-			self.result._view:GetChild("btn_confirm").visible = false
+            -- self.result._view:GetChild("btn_confirm").visible = false
             self._anchor:AddChild(self.result._view)
             self.result._view.x = self._anchor.x * -1
             self.result._view.y = self._anchor.y * -1
@@ -152,10 +152,10 @@ function M:ShowStep(index)
             self.result._view.visible = true
         end
         -- self.result._view:Center()
-	else
+        -- else
-		if self.result then
+        --     if self.result then
-			self.result._view.visible = false
+        --         self.result._view.visible = false
-		end
+        --     end
     end
 end
 

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

@@ -64,14 +64,17 @@ function M:InitView(url)
     self._view:GetChild('text_time').text = os.date("%H:%M", os.time())
     self._view:GetChild('text_roomId').text = room.room_id
     self._view:GetChild('wanfa_text').text = gamePlay
-    self._ctr_state = self._view:GetController("state")
+    self._state = self._view:GetController("state")
 
     self._text_remined = self._view:GetChild('remaining_card')
     self._text_round = self._view:GetChild('text_round')
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
+    self._state.onChanged:Add(function()
+        self:UpdatePlayerInfoView()
+    end)
 
     self:UpdateRound()
-    self:InitPlayerInfoView()
+    -- self:InitPlayerInfoView()
     self._player_card_info = {}
     local _player_card_info = self._player_card_info
     for i = 1, #room.player_list do
@@ -88,8 +91,8 @@ function M:InitView(url)
         for i = 1, #p.fz_list do
             cardInfo:UpdateFzList(p.fz_list[i], -1)
         end
-        info:FillData(p)
+        -- info:FillData(p)
-        info._view.visible = true
+        -- info._view.visible = true
     end
 
     local btn_rule = self._view:GetChild('btn_rule')
@@ -120,21 +123,23 @@ function M:InitView(url)
     local btn_witness = self._view:GetChild('btn_pangGuang')
     if btn_witness then
         btn_witness.onClick:Set(function()
-            if room._flag_updateWitness then
+            self._view:GetController('witness').selectedIndex = 1
-                room._flag_updateWitness = false
+        end)
+    end
+
+    --直接渲染观战人员
     if viewList_witness.numItems == #room.witness_player_list then
         viewList_witness:RefreshVirtualList()
     else
         viewList_witness.numItems = #room.witness_player_list
     end
-            end
-            self._view:GetController('witness').selectedIndex = 1
-        end)
-    end
 
+    --展示精牌
+    self.jing = self._view:GetChild('jing')
+    self:ShowJing()
     -------------------------------------------------------
 
-    self._ctr_state.selectedIndex = 4
+    self._state.selectedIndex = 4
     self.com_logocType.selectedIndex = 1
 end
 
@@ -152,6 +157,22 @@ function M:EventInit()
         print("lingmeng witness PlayerEnter")
     end)
 
+    _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
+        self:PlayMJSound("user_enter.mp3")
+        local arg = { ... }
+        local witnessPlayerList = arg[1]
+        self._room.witness_player_list = witnessPlayerList
+
+        local _room = DataManager.CurrenRoom
+        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
+        print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
+        if viewList_witness.numItems == #_room.witness_player_list then
+            viewList_witness:RefreshVirtualList()
+        else
+            viewList_witness.numItems = #_room.witness_player_list
+        end
+    end)
+
     _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
         local arg = { ... }
         print("lingmeng witness SendLaiZi")
@@ -175,7 +196,7 @@ function M:EventInit()
             self._clearingView = nil
         end
         self:UpdateRound()
-        self._ctr_state.selectedIndex = 4
+        self._state.selectedIndex = 4
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]
@@ -285,7 +306,7 @@ function M:EventInit()
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
                 DataManager.CurrenRoom.self_player.card_list = {}
-                self._ctr_state.selectedIndex = 2
+                self._state.selectedIndex = 2
                 self._clearingView = nil
             end)
         end
@@ -333,6 +354,11 @@ function M:InitPlayerInfoView()
     end
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:NewMJPlayerCardInfoView(view, index)
     return MJMainView.NewMJPlayerCardInfoView(self, view, index)
     --[[
@@ -380,11 +406,40 @@ function M:OnFangziAction(...)
     -- self:__CloseTip()
 end
 
+local majiang_asset_path = "base/main_majiang/sound/"
+function M:PlayMJSound(path)
+    ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)
+end
+
 function M:UpdateRound()
     self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
+function M:ShowJing()
+    if self._room.jing then
+        self.jing.visible = true
+        MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing)
+    else
+        self.jing.visible = false
+    end
+end
+
+function M:UpdatePlayerInfoView()
+    self._player_info = {}
+    local _player_info = self._player_info
+    local list = self._room.player_list
+
+    for i = 1, self._room.room_config.people_num do
+        local seat = self:GetPos(list[i].seat)
+        local tem = self._view:GetChild(string.format("player_info%d_%d", seat,
+            (self._state.selectedIndex == 4 and 1 or 0) + 1))
+        _player_info[seat] = PlayerInfoView.new(tem, self)
+        _player_info[seat]:FillData(list[i])
+        printlog("lingmeng _player_info", tem, seat, list[i].self_user.nick_name)
+    end
+end
+
 function M:OnUpdate()
     if (self._popEvent) then
         local func = self._gamectr:PopEvent()

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

@@ -95,6 +95,7 @@ function M:FillRoomData(s2croom)
         room.curren_outcard_seat = _reloadInfo["curren_outcard_seat"]
         room.last_outcard_seat = last_outcard_seat
         room.playing = playing
+        room.reload = reload
         for i = 1, #_info_list do
             local tem = _info_list[i]
             local playerid = tem["playerid"]
@@ -114,7 +115,7 @@ function M:FillRoomData(s2croom)
                 p.fz_list[#p.fz_list + 1] = fz
             end
             if not playing and room.curren_round > 0 then
-                self.GetGameController():PlayerReady()
+                -- self.GetGameController():PlayerReady()
             end
         end
     end
@@ -192,6 +193,7 @@ function M:FillWitnessData(pd_data)
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
     room.curren_round = _tableInfo["round"]
+    room.witness_player_list = _tableInfo["playerSpectatorData"]
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
         local _jp = _info_list[i]

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -669,7 +669,7 @@ function M:ShowHand(msg)
         if infoView.class ~= "PlayerSelfCardInfoView" then
             printlog("ShowHand", player.seat)
             table.sort(player.hand_card, self.HandCardSortAndJing)
-            infoView:ShowHand(player.hand_card)
+            infoView:ShowHand(player.hand_card, self:GetPos(player.seat) == 1)
         end
     end
 end
@@ -757,7 +757,7 @@ function M:OnHuCard(...)
     local player = self._room:GetPlayerBySeat(win_seat)
     self:RemoveCursor()
     --info:UpdateHandCard(false, false)
-    info:ShowHuCard(win_card)
+    info:ShowHuCard(win_card, index == 1)
 
     self.cHuCardEffect.selectedIndex = 1
 

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -484,7 +484,7 @@ end
 
 function M:ShowHand(cards)
     local list = self._view_handCardList
-    local cardType = self._viewText_cardInfo["Out_Card"]
+    local cardType = self._viewText_cardInfo["Hand_Card"]
     if self._viewText_cardInfo['IS_SIDE'] == "true" then
         list = self._view:GetChild('List_HandCard2')
         cardType = self._viewText_cardInfo["Hand_Card"]
@@ -501,14 +501,27 @@ function M:ShowHand(cards)
             self:fillCard2(obj, cardType, card, 1)
         end
     end
+
+    if flag_isme then
+        self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1
+        self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0)
+            :GetController('jing').selectedIndex
+        self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0
+    end
 end
 
-function M:ShowHuCard(card)
+function M:ShowHuCard(card, flag_isme)
     self.winCard = card
     self._view_getCard:RemoveChildrenToPool()
     local btn_card = self._view_getCard:AddItemFromPool()
     self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1)
     self._ctr_getCard.selectedIndex = 1
+    if flag_isme then
+        self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1
+        self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0)
+            :GetController('jing').selectedIndex
+        self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0
+    end
 end
 
 return M

wb_new_ui/assets/Family/NumberRecord/Component/btn_chooseTime.xml

@@ -2,8 +2,8 @@
 <component size="442,90" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <text id="n3_jrro" name="title" xy="114,9" size="328,72" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#a8312f" text="分数限制一天">
+    <text id="n3_jrro" name="title" xy="114,9" size="328,72" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" text="分数限制一天">
-      <gearColor controller="button" pages="1" values="#a8312f,#000000" default="#0000ed,#000000"/>
+      <gearColor controller="button" pages="0,1" values="#a8312f,#000000|#0000ed,#000000"/>
     </text>
     <image id="n7_lgoh" name="n7" src="lgoh7d4b" fileName="NumberRecord/Image/createRoom_6.png" xy="0,0"/>
     <image id="n6_lgoh" name="n6" src="v5m57d0p" fileName="NumberRecord/Image/Ellipse 38.png" xy="24,24">

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

@@ -2,24 +2,37 @@
 <component size="2328,150">
   <controller name="seleted" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n14_v5m5" name="n14" src="v5m57d0v" fileName="NumberRecord/Image/Group 185(1).png" xy="0,0" size="2328,150"/>
+    <image id="n15_jzul" name="n15" src="slrk7d34" fileName="Record/Image/Rectangle 182.png" xy="0,0" size="2350,150" group="n22_jzul"/>
+    <image id="n16_jzul" name="n16" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="173,21" size="6,108" group="n22_jzul"/>
+    <image id="n17_jzul" name="n17" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="410,21" size="6,108" group="n22_jzul"/>
+    <image id="n18_jzul" name="n18" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="654,21" size="6,108" group="n22_jzul"/>
+    <image id="n19_jzul" name="n19" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="862,21" size="6,108" group="n22_jzul"/>
+    <image id="n20_jzul" name="n20" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="964,21" size="6,108" group="n22_jzul"/>
+    <image id="n23_jzul" name="n23" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1856,21" size="6,108" group="n22_jzul"/>
+    <image id="n21_jzul" name="n21" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2159,21" size="6,108" group="n22_jzul"/>
+    <group id="n22_jzul" name="n22" xy="0,0" size="2350,150"/>
     <component id="n0_jrro" name="n0" src="jrro7cxm" fileName="NumberRecord/Component/Multiple_choose.xml" xy="48,42">
       <Button controller="seleted" page="1"/>
     </component>
     <text id="n2_jrro" name="text_gameName" xy="192,47" size="182,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" autoSize="none" text="麻将麻将&#xA;">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n4_jrro" name="text_time" xy="408,48" size="346,54" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" autoSize="none" text="2025-05-19 14:23:01">
+    <text id="n4_jrro" name="text_time" xy="434,28" size="208,103" font="ui://27vd145bg2mo7ij0" fontSize="36" color="#444444" align="center" autoSize="none" text="2025-05-19 14:23:01">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n6_jrro" name="text_roomID" xy="763,48" size="177,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="12345678">
+    <text id="n6_jrro" name="text_roomID" xy="673,48" size="177,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="12345678">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n8_jrro" name="text_userDiamond" xy="1019,48" size="72,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="999">
+    <text id="n8_jrro" name="text_userDiamond" xy="881,48" size="72,54" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" text="999">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
+    <richtext id="n24_jzul" name="text_playName" xy="1871,27" size="283,102" font="ui://27vd145bg2mo7ij0" fontSize="40" color="#444444" align="center" vAlign="middle" autoSize="none" text="好几个备注">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </richtext>
     <component id="n12_jrro" name="btn_lookRecord" src="qz7i7cx1" fileName="NumberRecord/Component/btn_lookRecord.xml" xy="2177,48"/>
-    <list id="n13_jrro" name="list" xy="1212,15" size="865,120" layout="row" overflow="scroll" scroll="horizontal" colGap="76" defaultItem="ui://htcn7v3rjrro7cxo" autoClearItems="true">
+    <list id="n13_jrro" name="list" xy="982,15" size="861,120" layout="row" overflow="scroll" scroll="horizontal" colGap="76" defaultItem="ui://htcn7v3rjrro7cxo" autoClearItems="true">
+      <item/>
+      <item/>
       <item/>
       <item/>
     </list>

wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChildTitle.xml

@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2328,72">
   <displayList>
-    <image id="n18_v5m5" name="n18" src="v5m57d0u" fileName="NumberRecord/Image/Group 149(1).png" xy="0,0" size="2328,72">
+    <image id="n19_jzul" name="n19" src="jzul7d6f" fileName="NumberRecord/Image/hall_club_BG_landiyuan.png" xy="13,0" size="160,72"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <text id="n14_jrro" name="n14" xy="48,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="选择">
-    </image>
-    <text id="n2_jrro" name="n2" xy="243,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="游戏">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n4_jrro" name="n4" xy="537,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="时间">
+    <image id="n20_jzul" name="n20" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="179,0" size="231,72"/>
+    <text id="n2_jrro" name="n2" xy="249,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="游戏">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n6_jrro" name="n6" xy="813,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房号">
+    <image id="n21_jzul" name="n21" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="416,0" size="238,72"/>
+    <text id="n4_jrro" name="n4" xy="490,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="时间">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n8_jrro" name="n8" xy="1014,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房卡">
+    <image id="n24_jzul" name="n24" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="660,0" size="202,72"/>
+    <text id="n6_jrro" name="n6" xy="716,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房号">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n14_jrro" name="n14" xy="39,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="选择">
+    <image id="n22_jzul" name="n22" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="868,0" size="96,72"/>
+    <text id="n8_jrro" name="n8" xy="871,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="房卡">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n15_jrro" name="n15" xy="1560,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="结算">
+    <image id="n23_jzul" name="n23" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="971,0" size="886,72"/>
+    <text id="n15_jrro" name="n15" xy="1369,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="结算">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n16_jrro" name="n16" xy="2166,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="回放">
+    <image id="n34_jzul" name="n34" src="jzul7d6e" fileName="NumberRecord/Image/hall_club_BG_landifang.png" xy="1863,0" size="296,72"/>
+    <text id="n35_jzul" name="n35" xy="1966,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="备注">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <image id="n36_jzul" name="n36" src="jzul7d6f" fileName="NumberRecord/Image/hall_club_BG_landiyuan.png" xy="2165,0" size="163,72" flip="hz"/>
+    <text id="n16_jrro" name="n16" xy="2201,8" size="90,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="回放">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="page" pages="0,,1,,2,,3," selected="1"/>
+  <controller name="page" pages="0,,1,,2,,3," selected="2"/>
   <controller name="day" pages="0,,1," selected="0"/>
   <controller name="sort" pages="0,,1," selected="0"/>
   <controller name="limitDay" pages="0,,1," selected="0"/>
   <controller name="noPeople" pages="0,,1," selected="0"/>
-  <controller name="lev" pages="0,,1," selected="1"/>
+  <controller name="lev" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n171_g71b" name="n171" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="0,0" size="2531,1170" group="n173_g71b">
       <relation target="" sidePair="width-width,height-height"/>
@@ -51,55 +51,55 @@
     <image id="n18_lgoh" name="n18" src="c8pn7d02" fileName="Main/Image/Rectangle 93(1)(1).png" xy="21,145" size="2484,1011" group="n20_lgoh"/>
     <image id="n19_lgoh" name="n19" src="c8pn7d03" fileName="Main/Image/Rectangle 122(1).png" xy="39,161" size="2448,978" group="n20_lgoh"/>
     <group id="n20_lgoh" name="bg_numberRecordRank" xy="21,145" size="2484,1011" group="n63_lgoh"/>
-    <text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="605,71" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01  18:58:25"/>
+    <text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="660,72" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01  18:58:25"/>
     <image id="n22_lgoh" name="n22" src="c8pn7czi" fileName="Main/Image/Rectangle 278.png" xy="226,328" size="438,72" group="n47_lgoh"/>
     <text id="n23_lgoh" name="input_numberID" xy="248,328" size="344,72" group="n47_lgoh" fontSize="46" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="123456213" input="true"/>
     <component id="n24_lgoh" name="btn_clearInput" src="qz7i7cwy" fileName="NumberRecord/Component/btn_clearInput.xml" xy="607,352" group="n47_lgoh"/>
     <component id="n25_lgoh" name="btn_searchRecord" src="qz7i7cwz" fileName="NumberRecord/Component/btn_search.xml" xy="688,316" group="n47_lgoh"/>
-    <text id="n26_lgoh" name="n26" xy="109,540" size="221,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="总局数:">
+    <text id="n26_lgoh" name="n26" xy="109,540" size="220,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="总局数:">
       <relation target="" sidePair="right-left,top-top"/>
     </text>
-    <text id="n27_lgoh" name="text_allRound" xy="328,540" size="41,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" text="0">
+    <text id="n27_lgoh" name="text_allRound" xy="328,540" size="41,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" text="0">
       <relation target="n26_lgoh" sidePair="left-right,top-top"/>
     </text>
-    <text id="n28_lgoh" name="n28" xy="700,540" size="287,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="大赢家数:">
+    <text id="n28_lgoh" name="n28" xy="700,540" size="286,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="大赢家数:">
       <relation target="" sidePair="right-left,top-top"/>
     </text>
-    <text id="n29_lgoh" name="text_winNum" xy="985,540" size="41,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" text="0">
+    <text id="n29_lgoh" name="text_winNum" xy="985,540" size="41,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" text="0">
       <relation target="n28_lgoh" sidePair="left-right,top-top"/>
     </text>
-    <text id="n30_lgoh" name="n30" xy="76,645" size="287,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="剩余房卡:">
+    <text id="n30_lgoh" name="n30" xy="76,645" size="286,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="剩余房卡:">
       <relation target="" sidePair="right-left,top-top"/>
     </text>
     <text id="n31_lgoh" name="text_residueDiamond" xy="361,645" size="330,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" autoSize="shrink" text="0">
       <relation target="n30_lgoh" sidePair="left-right,top-top"/>
     </text>
-    <text id="n32_lgoh" name="n32" xy="700,645" size="287,87" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="房卡消耗:">
+    <text id="n32_lgoh" name="n32" xy="700,645" size="286,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="房卡消耗:">
       <relation target="" sidePair="right-left,top-top"/>
     </text>
-    <text id="n33_lgoh" name="n33" xy="198,807" size="158,87" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
+    <text id="n33_lgoh" name="n33" xy="198,807" size="160,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="114,87" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
+    <text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="121,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
       <relation target="n33_lgoh" sidePair="left-right"/>
     </text>
     <component id="n35_lgoh" name="btn_changeMJScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,816" group="n37_lgoh">
       <relation target="n36_lgoh" sidePair="left-right"/>
     </component>
-    <text id="n36_lgoh" name="n36" xy="471,806" size="488,87" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
+    <text id="n36_lgoh" name="n36" xy="471,806" size="485,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
       <relation target="n34_lgoh" sidePair="left-right"/>
     </text>
     <group id="n37_lgoh" name="majiang" xy="198,806" size="912,87" group="n47_lgoh"/>
-    <text id="n38_lgoh" name="n38" xy="198,933" size="158,87" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
+    <text id="n38_lgoh" name="n38" xy="198,933" size="160,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n39_lgoh" name="text_score_poker" xy="356,933" size="114,87" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
+    <text id="n39_lgoh" name="text_score_poker" xy="356,933" size="121,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
       <relation target="n38_lgoh" sidePair="left-right"/>
     </text>
     <component id="n40_lgoh" name="btn_changePKScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,942" group="n42_lgoh">
       <relation target="n41_lgoh" sidePair="left-right"/>
     </component>
-    <text id="n41_lgoh" name="n41" xy="471,933" size="488,87" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
+    <text id="n41_lgoh" name="n41" xy="471,933" size="485,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
       <relation target="n39_lgoh" sidePair="left-right"/>
     </text>
     <group id="n42_lgoh" name="oiker" xy="198,933" size="912,86" group="n47_lgoh"/>
@@ -142,26 +142,26 @@
     <group id="n63_lgoh" name="numberRank" xy="21,145" size="2484,1011" group="n73_lgoh" advanced="true">
       <gearDisplay controller="page" pages="0"/>
     </group>
-    <image id="n64_lgoh" name="n64" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="23,182" size="2484,960" group="n66_lgoh"/>
+    <image id="n64_lgoh" name="n64" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="22,188" size="2484,960" group="n66_lgoh"/>
-    <image id="n65_lgoh" name="n65" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="59,214" size="2412,900" group="n66_lgoh"/>
+    <image id="n65_lgoh" name="n65" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="58,220" size="2412,900" group="n66_lgoh"/>
-    <group id="n66_lgoh" name="bg_numberRecordDetail" xy="23,182" size="2484,960" group="n72_lgoh"/>
+    <group id="n66_lgoh" name="bg_numberRecordDetail" xy="22,188" size="2484,960" group="n72_lgoh"/>
-    <component id="n67_lgoh" name="n67" src="jrro7cxp" fileName="NumberRecord/Component/comp_numberRecordDetailChildTitle.xml" xy="94,260" size="2342,72" group="n72_lgoh"/>
+    <component id="n67_lgoh" name="n67" src="jrro7cxp" fileName="NumberRecord/Component/comp_numberRecordDetailChildTitle.xml" xy="93,266" size="2342,72" group="n72_lgoh"/>
-    <list id="n68_lgoh" name="list_numberRecordDetail" xy="94,373" size="2342,620" group="n72_lgoh" overflow="scroll" lineGap="-5" defaultItem="ui://htcn7v3rjrro7cxl">
+    <list id="n68_lgoh" name="list_numberRecordDetail" xy="94,379" size="2342,620" group="n72_lgoh" selectionMode="multipleSingleClick" overflow="scroll" lineGap="-5" defaultItem="ui://htcn7v3rjrro7cxl">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n69_lgoh" name="btn_allChoose" src="jrro7cxq" fileName="NumberRecord/Component/btn_allChoose.xml" xy="389,1009" size="240,84" group="n72_lgoh">
+    <component id="n69_lgoh" name="btn_allChoose" src="jrro7cxq" fileName="NumberRecord/Component/btn_allChoose.xml" xy="388,1015" size="240,84" group="n72_lgoh">
       <gearDisplay controller="lev" pages="0"/>
     </component>
-    <component id="n70_lgoh" name="btn_allChooseRead" src="jrro7cxs" fileName="NumberRecord/Component/btn_allChooseRead.xml" xy="1013,1009" size="240,84" group="n72_lgoh">
+    <component id="n70_lgoh" name="btn_allChooseRead" src="jrro7cxs" fileName="NumberRecord/Component/btn_allChooseRead.xml" xy="1012,1015" size="240,84" group="n72_lgoh">
       <gearDisplay controller="lev" pages="0"/>
     </component>
-    <component id="n71_lgoh" name="btn_allChooseReverse" src="jrro7cxr" fileName="NumberRecord/Component/btn_allChooseReverse.xml" xy="701,1009" size="240,84" group="n72_lgoh">
+    <component id="n71_lgoh" name="btn_allChooseReverse" src="jrro7cxr" fileName="NumberRecord/Component/btn_allChooseReverse.xml" xy="700,1015" size="240,84" group="n72_lgoh">
       <gearDisplay controller="lev" pages="0"/>
     </component>
-    <group id="n72_lgoh" name="numberRecordDetail" xy="23,182" size="2484,960" group="n73_lgoh" advanced="true">
+    <group id="n72_lgoh" name="numberRecordDetail" xy="22,188" size="2484,960" group="n73_lgoh" advanced="true">
       <gearDisplay controller="page" pages="2"/>
     </group>
     <image id="n168_lj2n" name="n168" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="39,182" size="2484,960" group="n170_lj2n"/>
@@ -172,10 +172,10 @@
     <graph id="n158_lj2n" name="n158" xy="481,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
     <graph id="n159_lj2n" name="n159" xy="1987,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
     <graph id="n160_lj2n" name="n160" xy="2206,232" size="6,72" group="n167_lj2n" type="rect" lineColor="#ffffffff"/>
-    <text id="n161_lj2n" name="n161" xy="151,239" size="88,57" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
+    <text id="n161_lj2n" name="n161" xy="151,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
-    <text id="n162_lj2n" name="n162" xy="337,239" size="88,57" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
+    <text id="n162_lj2n" name="n162" xy="337,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
-    <text id="n163_lj2n" name="n163" xy="2059,239" size="88,57" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
+    <text id="n163_lj2n" name="n163" xy="2059,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
-    <text id="n164_lj2n" name="n164" xy="2278,239" size="88,57" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
+    <text id="n164_lj2n" name="n164" xy="2278,239" size="88,56" group="n167_lj2n" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" text="序号"/>
     <list id="n165_lj2n" name="list_players" xy="482,232" size="1506,72" group="n167_lj2n" layout="flow_hz" selectionMode="none" scroll="horizontal" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d32" autoItemSize="true" scrollItemToViewOnClick="false">
       <item/>
       <item/>

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

@@ -10,7 +10,7 @@
     <image id="n7_slrk" name="n7" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2151,10"/>
     <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="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_playName" xy="1873,10" size="279,124" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="999"/>
+    <richtext id="n10_slrk" name="text_playName" xy="1873,10" size="279,124" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" autoClearText="true" 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="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="784,0" size="1082,150" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="101" defaultItem="ui://htcn7v3rjrro7cxo" vAlign="middle" autoClearItems="true">

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

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2328,150">
-  <controller name="jiesan_mng" pages="0,,1," selected="0"/>
+  <controller name="jiesan_mng" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n0_slrk" name="n0" src="slrk7d34" fileName="Record/Image/Rectangle 182.png" xy="-11,-12" size="2349,170"/>
     <image id="n2_slrk" name="n2" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="162,12"/>
     <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"/>
+    <image id="n11_lvks" name="n11" src="lvks7d6b" fileName="Record/Image/guanliyuanjiesan.png" xy="0,0">
+      <gearDisplay controller="jiesan_mng" pages="1"/>
+      <relation target="" sidePair="middle-middle,left-left"/>
+    </image>
     <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="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" scroll="horizontal" lineItemCount="5" defaultItem="ui://htcn7v3rslrk7d36" autoItemSize="true" scrollItemToViewOnClick="false">
@@ -15,9 +19,5 @@
     </list>
     <component id="n9_slrk" name="n9" src="slrk7d39" fileName="Record/Component/btn_share.xml" xy="1896,39"/>
     <component id="n10_slrk" name="n10" src="slrk7d3a" fileName="Record/Component/btn_replay.xml" xy="2115,39"/>
-    <image id="n11_lvks" name="n11" src="lvks7d6b" fileName="Record/Image/guanliyuanjiesan.png" xy="0,0">
-      <gearDisplay controller="jiesan_mng" pages="1"/>
-      <relation target="" sidePair="middle-middle,left-left"/>
-    </image>
   </displayList>
 </component>

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

@@ -5,9 +5,6 @@
     <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="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>
     <image id="n2_lvks" name="n2" src="lvks7d6d" fileName="Record/Image/同意.png" xy="290,21">
       <gearDisplay controller="jiesan" pages="2"/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -16,5 +13,8 @@
       <gearDisplay controller="jiesan" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
+    <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>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -402,6 +402,8 @@
     <image id="lvks7d6b" name="guanliyuanjiesan.png" path="/Record/Image/"/>
     <image id="lvks7d6c" name="解散.png" path="/Record/Image/"/>
     <image id="lvks7d6d" name="同意.png" path="/Record/Image/"/>
+    <image id="jzul7d6e" name="hall_club_BG_landifang.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="17,9,34,18"/>
+    <image id="jzul7d6f" name="hall_club_BG_landiyuan.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="17,9,34,18"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml

@@ -15,9 +15,9 @@
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="19,-4" size="39,39" aspect="true">
+    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="19,-3" size="39,39" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="button" pages="0,1" values="19,-4|3,-22" tween="true"/>
+      <gearXY controller="button" pages="0,1" values="19,-3|3,-22" tween="true"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml

@@ -9,9 +9,9 @@
       <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n13_g9ft" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="1,0" size="40,41" aspect="true">
+    <image id="n13_g9ft" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="28,8" size="47,49" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="button" pages="0,1" values="1,0|0,-22" duration=".1"/>
+      <gearXY controller="button" pages="0,1" values="28,8|0,-22" duration="0.1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" bgColor="#000000">
-  <controller name="over" pages="0,,1," selected="0"/>
+  <controller name="over" pages="0,,1," selected="1"/>
-  <controller name="main" pages="0,,1," selected="0"/>
+  <controller name="main" pages="0,,1," selected="1"/>
   <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="0"/>
   <controller name="showType" pages="0,,1," selected="0"/>
   <displayList>
@@ -15,40 +15,40 @@
     <group id="n113_qt01" name="Frist" xy="559,451" size="1420,258" advanced="true">
       <gearDisplay controller="main" pages="0"/>
     </group>
-    <image id="n114_yry6" name="n114" src="yry6yx" fileName="Main_new/Clearing/Image/Group 239.png" xy="-3,72" group="n116_yry6"/>
+    <image id="n114_yry6" name="n114" src="yry6yx" fileName="Main_new/Clearing/Image/Group 239.png" xy="-4,73" group="n116_yry6"/>
-    <image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6" visible="false">
+    <image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="539,-14" group="n116_yry6" visible="false">
       <gearDisplay controller="over" pages="0"/>
     </image>
-    <component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="185,115" group="n121_yry6"/>
+    <component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="184,116" group="n121_yry6"/>
-    <component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2031,1018" group="n121_yry6"/>
+    <component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2030,1019" group="n121_yry6"/>
-    <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,217" group="n121_yry6">
+    <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="94,218" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
     </component>
-    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,421" group="n121_yry6">
+    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="94,422" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
-      <gearXY controller="playerNum" pages="0,1" values="95,421|96,516" default="96,417"/>
+      <gearXY controller="playerNum" pages="0,1" values="94,422|96,516" default="96,417"/>
     </component>
-    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,625" group="n121_yry6">
+    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="94,626" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
-      <gearXY controller="playerNum" pages="0,1" values="95,625|96,813" default="96,615"/>
+      <gearXY controller="playerNum" pages="0,1" values="94,626|96,813" default="96,615"/>
     </component>
-    <text id="n141_kxhm" name="Text_BoJing" xy="1941,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
+    <text id="n141_kxhm" name="Text_BoJing" xy="1940,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
       <relation target="" sidePair=""/>
     </text>
-    <text id="n142_kxhm" name="Text_Gang" xy="2051,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
+    <text id="n142_kxhm" name="Text_Gang" xy="2050,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
       <relation target="" sidePair=""/>
     </text>
-    <text id="n143_kxhm" name="Text_Hu" xy="2165,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
+    <text id="n143_kxhm" name="Text_Hu" xy="2164,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
       <relation target="" sidePair="top-top"/>
     </text>
-    <text id="n144_kxhm" name="Text_Tatal" xy="2286,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
+    <text id="n144_kxhm" name="Text_Tatal" xy="2285,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
       <relation target="" sidePair="top-top"/>
     </text>
-    <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,811" group="n121_yry6">
+    <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="94,812" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="2"/>
-      <gearXY controller="playerNum" pages="0" values="95,811" default="96,813"/>
+      <gearXY controller="playerNum" pages="0" values="94,812" default="96,813"/>
     </component>
-    <list id="n145_uans" name="list_lastCard" xy="302,1036" size="1256,84" group="n121_yry6" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
+    <list id="n145_uans" name="list_lastCard" xy="301,1037" size="1256,84" group="n121_yry6" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -82,52 +82,52 @@
       <item/>
       <item/>
     </list>
-    <text id="n146_uans" name="n146" xy="190,1047" size="96,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩牌"/>
+    <text id="n146_uans" name="n146" xy="189,1048" size="96,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩牌"/>
-    <text id="n147_uans" name="n147" xy="1637,1047" size="332,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩余50张未显示"/>
+    <text id="n147_uans" name="n147" xy="1636,1048" size="332,62" group="n121_yry6" font="ui://27vd145bg2mo7ij0" fontSize="46" color="#c06a2d" text="剩余50张未显示"/>
-    <group id="n121_yry6" name="over0" xy="95,115" size="2340,1017" group="n116_yry6" advanced="true">
+    <group id="n121_yry6" name="over0" xy="94,116" size="2340,1017" group="n116_yry6" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <graph id="n126_yry6" name="Bg_over1" xy="185,183" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/>
+    <graph id="n126_yry6" name="Bg_over1" xy="184,184" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/>
-    <text id="n127_yry6" name="Text_GameNameAndRoomID" xy="246,111" size="709,76" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="58" color="#c06a2d" bold="true" autoClearText="true" text="南城麻将  房号：12345678">
+    <text id="n127_yry6" name="Text_GameNameAndRoomID" xy="245,112" size="709,76" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="58" color="#c06a2d" bold="true" autoClearText="true" text="南城麻将  房号：12345678">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n128_yry6" name="Text_FamilyID" xy="1807,111" size="429,76" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="58" color="#c06a2d" bold="true" text="俱乐部：123456">
+    <text id="n128_yry6" name="Text_FamilyID" xy="1806,112" size="429,76" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="58" color="#c06a2d" bold="true" text="俱乐部：123456">
       <relation target="" sidePair="right-right"/>
     </text>
-    <text id="n129_yry6" name="Text_comom1" xy="229,1076" size="376,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="仅供娱乐，禁止赌博">
+    <text id="n129_yry6" name="Text_comom1" xy="228,1077" size="376,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="仅供娱乐，禁止赌博">
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n130_yry6" name="Text_Time" xy="887,1076" size="313,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="2025-04-01 15:52">
+    <text id="n130_yry6" name="Text_Time" xy="886,1077" size="313,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="2025-04-01 15:52">
       <relation target="" sidePair=""/>
       <relation target="n131_yry6" sidePair="left-right"/>
     </text>
-    <text id="n131_yry6" name="Text_RoundNum" xy="660,1076" size="191,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="局数:5/511">
+    <text id="n131_yry6" name="Text_RoundNum" xy="659,1077" size="191,58" group="n140_yry6" font="ui://27vd145bh35o7ik0" fontSize="43" color="#c06a2d" leading="0" letterSpacing="-3" bold="true" text="局数:5/511">
       <relation target="" sidePair=""/>
       <relation target="n129_yry6" sidePair="left-right"/>
     </text>
-    <component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1425,996" group="n140_yry6"/>
+    <component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1424,997" group="n140_yry6"/>
-    <component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1761,996" group="n140_yry6"/>
+    <component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1760,997" group="n140_yry6"/>
-    <component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2100,996" group="n140_yry6"/>
+    <component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2099,997" group="n140_yry6"/>
-    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="540,228" group="n140_yry6">
+    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="539,229" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
-      <gearXY controller="playerNum" pages="1,2" values="333,228|333,228" default="540,228"/>
+      <gearXY controller="playerNum" pages="0,1,2" values="539,229|333,228|333,228"/>
     </component>
-    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1530,228" group="n140_yry6">
+    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1529,229" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
-      <gearXY controller="playerNum" pages="0,1" values="1530,228|1035,228" default="801,228"/>
+      <gearXY controller="playerNum" pages="0,1" values="1529,229|1035,228" default="801,228"/>
     </component>
-    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1269,228" group="n140_yry6">
+    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1268,229" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
-      <gearXY controller="playerNum" pages="1" values="1737,228" default="1269,228"/>
+      <gearXY controller="playerNum" pages="0,1" values="1268,229|1737,228" default="1269,228"/>
     </component>
-    <component id="n139_yry6" name="Comp_ResultInfo4" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1737,228" group="n140_yry6">
+    <component id="n139_yry6" name="Comp_ResultInfo4" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1736,229" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="2"/>
       <gearSize controller="playerNum" default="462,759,1,1"/>
     </component>
-    <group id="n140_yry6" name="over1" xy="185,111" size="2215,1023" group="n116_yry6" advanced="true">
+    <group id="n140_yry6" name="over1" xy="184,112" size="2215,1023" group="n116_yry6" advanced="true">
       <gearDisplay controller="over" pages="1"/>
     </group>
-    <group id="n116_yry6" name="Main" xy="-3,-15" size="2538,1185" advanced="true">
+    <group id="n116_yry6" name="Main" xy="-4,-14" size="2538,1185" advanced="true">
       <gearDisplay controller="main" pages="1"/>
     </group>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/allCardsToShow/Btn_Card_jiangxi_show.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="176,249" extention="Button">
+<component size="200,225" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="-3,2" size="176,249" url="ui://Main_Majiang/201_101" fill="scaleFree"/>
+    <loader id="n3_hp0b" name="icon" xy="-3,2" size="200,225" url="ui://Main_Majiang/b201_101" fill="scale">
-    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="-3,3" size="73,76" aspect="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="90,39" size="102,71" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
     </image>
     <graph id="n13_rw7j" name="n13" xy="0,0" size="176,249" type="rect" lineSize="0" fillColor="#99000000">
       <gearDisplay controller="button" pages="1"/>
     </graph>
-    <image id="n15_rw7j" name="n15" src="gq7m8a" fileName="component/card/card_mark/images/tingArrow.png" xy="61,-3" size="56,42" aspect="true">
+    <image id="n15_rw7j" name="n15" src="gq7m8a" fileName="component/card/card_mark/images/tingArrow.png" xy="73,-3" size="56,42" aspect="true">
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <graph id="n16_qz7i" name="n16" xy="110,-17" size="93,93" aspect="true" type="eclipse" fillColor="#ff000000"/>
+    <graph id="n16_qz7i" name="n16" xy="-7,-11" size="84,84" aspect="true" type="eclipse" fillColor="#ff000000"/>
-    <text id="n17_qz7i" name="title" xy="118,-1" size="76,62" fontSize="46" color="#ffffff" text="3张"/>
+    <text id="n17_qz7i" name="title" xy="0,3" size="71,62" fontSize="42" color="#ffffff" autoSize="none" text="3张"/>
   </displayList>
   <Button mode="Check"/>
 </component>

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

@@ -4,7 +4,7 @@
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
   <controller name="getCard" pages="0,,1," selected="0"/>
-  <controller name="cStie" exported="true" pages="0,,1,,2," selected="0">
+  <controller name="cStie" exported="true" pages="0,,1,,2," selected="1">
     <remark page="0" value="2人"/>
     <remark page="1" value="3人"/>
     <remark page="2" value="4人"/>
@@ -33,7 +33,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="265,150" size="2097,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="324,103" size="1217,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
       <gearXY controller="cStie" pages="0,1,2" values="265,150|324,103|833,148"/>
       <gearSize controller="cStie" pages="1,2" values="1217,502,1,1|887,502,1,1" default="2097,502,1,1"/>
       <relation target="" sidePair="width-width%,height-height%,top-top"/>
@@ -81,7 +81,9 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="-1732,-1096" default="616,100"/>
     </image>
-    <text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b203_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
+    <text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}">
+      <gearText controller="cStie" default="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
+    </text>
     <list id="n54_jzul" name="list_HuEffect" xy="0,33" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>

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

@@ -3,7 +3,7 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
-  <controller name="getCard" pages="0,,1," selected="0"/>
+  <controller name="getCard" homePageType="specific" homePage="1" pages="0,,1," selected="0"/>
   <controller name="seletedGetCard" pages="0,,1," selected="0"/>
   <controller name="tip" pages="0,,1," selected="0"/>
   <controller name="showGuoHu" pages="0,,1," selected="0"/>
@@ -21,7 +21,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n32_kxhm" name="List_HandCard" xy="37,975" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
+    <list id="n32_kxhm" name="List_HandCard" xy="37,973" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
       <relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
       <item/>
       <item/>
@@ -75,21 +75,11 @@
       <item/>
       <item/>
     </list>
-    <list id="n38_shqd" name="Btn_HandCard" xy="2295,976" size="175,191" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
+    <list id="n38_shqd" name="Btn_HandCard" xy="2295,976" size="175,191" aspect="true" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
       <item/>
     </list>
-    <image id="n41_kzuz" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="457,809" size="1314,208" group="n48_kzuz" aspect="true"/>
-    <component id="n45_kzuz" name="btn_guohu" src="kzuz148" fileName="Main_new/Main/Component/btn_guohu.xml" xy="2248,859" size="200,107" group="n48_kzuz" aspect="true">
-      <Button controller="showGuoHu" page="0"/>
-    </component>
-    <component id="n47_kzuz" name="btn_buguohu" src="kzuz149" fileName="Main_new/Main/Component/btn_buguohu.xml" xy="1927,857" size="200,107" group="n48_kzuz" aspect="true">
-      <Button controller="showGuoHu" page="0"/>
-    </component>
-    <group id="n48_kzuz" name="showGuoHu" xy="457,809" size="1991,208" advanced="true">
-      <gearDisplay controller="showGuoHu" pages="1"/>
-    </group>
     <component id="n49_ogwn" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2961,-1477" size="2022,111">
       <gearXY controller="3d" pages="0,1" values="-2961,-1477|517,-145"/>
       <gearSize controller="3d" pages="0,1" values="2022,111,1,1|300,117,1,1"/>
@@ -102,10 +92,6 @@
       <item/>
       <item/>
     </list>
-    <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="184,657">
-      <gearDisplay controller="tip" pages="1"/>
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
     <component id="n51_ogwn" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2533,-1563" size="11,249"/>
     <component id="n53_ogwn" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2143,-1300" size="1,1"/>
     <component id="n54_ogwn" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-1759,-1372" size="1,1"/>
@@ -114,5 +100,19 @@
       <gearXY controller="3d" pages="0" values="-2193,-1423" default="616,100"/>
     </image>
     <text id="n57_ogwn" name="Text_CardInfo" xy="-2587,110" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
+    <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="184,657">
+      <gearDisplay controller="tip" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
+    <image id="n41_kzuz" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="457,809" size="1314,208" group="n48_kzuz" aspect="true"/>
+    <component id="n45_kzuz" name="btn_guohu" src="kzuz148" fileName="Main_new/Main/Component/btn_guohu.xml" xy="2248,859" size="200,107" group="n48_kzuz" aspect="true">
+      <Button controller="showGuoHu" page="0"/>
+    </component>
+    <component id="n47_kzuz" name="btn_buguohu" src="kzuz149" fileName="Main_new/Main/Component/btn_buguohu.xml" xy="1927,857" size="200,107" group="n48_kzuz" aspect="true">
+      <Button controller="showGuoHu" page="0"/>
+    </component>
+    <group id="n48_kzuz" name="showGuoHu" xy="457,809" size="1991,208" advanced="true">
+      <gearDisplay controller="showGuoHu" pages="1"/>
+    </group>
   </displayList>
 </component>

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" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="3"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="1"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -27,7 +27,7 @@
       <gearDisplay controller="state" pages="0,2"/>
       <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="84,778" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="730,-60" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="87,787|84,778|85,786" default="730,-60"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
@@ -36,40 +36,40 @@
       <gearDisplay controller="state" pages="0,2"/>
       <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="1867,24" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2701,486" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,28|1867,24|1868,21" default="2007,876"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
     </component>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="741,-1172" 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,-1172" 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="1,-887" group="n90_8sat"/>
+    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="3,-887" group="n90_8sat"/>
-    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2483,-384" 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,-384" size="110,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="263,-889" group="n90_8sat">
+    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="265,-889" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="1,-1172" size="2592,863" advanced="true">
+    <group id="n90_8sat" name="n90" xy="3,-1172" size="2592,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="1594,-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>
     <component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
-    <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-12724,794" group="n36_k3io">
+    <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-16242,794" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
-      <gearXY controller="action" pages="2,0,1" values="5709,794|-12724,794|5853,170"/>
+      <gearXY controller="action" pages="2,0,1" values="8054,794|-16242,794|5853,170"/>
       <Button icon="ui://v0j9abjygq7m48"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,480" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-3503,480" group="n36_k3io" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1921,487" group="n36_k3io" scale="0.9,1">
+    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-3093,487" group="n36_k3io" scale="0.9,1">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://v0j9abjygq7m4i"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="-12724,480" size="10987,414" visible="false" advanced="true">
+    <group id="n36_k3io" name="n36" xy="-16242,480" size="13332,414" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@@ -103,15 +103,16 @@
     <group id="n100_dnw9" name="n100" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,657" size="408,114" group="n125_pkx5">
+    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,589" size="408,114" group="n125_pkx5"/>
-      <gearDisplay controller="action" pages="0"/>
+    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,589" size="408,114" group="n125_pkx5"/>
-    </component>
+    <group id="n125_pkx5" name="readyBtn" xy="810,589" size="912,114" advanced="true">
-    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,522" size="408,114" group="n125_pkx5"/>
-    <component id="n124_pkx5" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,522" size="408,114" group="n125_pkx5"/>
-    <group id="n125_pkx5" name="readyBtn" xy="810,522" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
+    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,727" size="408,114">
+      <gearDisplay controller="action" pages="0"/>
+      <relation target="n125_pkx5" sidePair="top-bottom"/>
+    </component>
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false">
       <relation target="n155_gi99" sidePair="left-left"/>
     </component>
@@ -184,41 +185,39 @@
       <relation target="n159_ckvb" sidePair="center-center,middle-middle"/>
     </graph>
     <graph id="n163_qz7i" name="n163" xy="-125,-102" size="2832,1436" group="n168_qz7i" type="rect" lineSize="0" fillColor="#80000000"/>
-    <list id="n164_qz7i" name="list_showNext" xy="131,52" size="2264,1084" group="n168_qz7i" layout="flow_hz" overflow="scroll" lineGap="26" colGap="32" defaultItem="ui://v0j9abjyqz7i11m" autoClearItems="true">
+    <list id="n164_qz7i" name="list_showNext" xy="131,52" size="2264,1084" group="n168_qz7i" layout="flow_hz" overflow="scroll" margin="22,0,10,0" lineGap="32" colGap="27" defaultItem="ui://v0j9abjyqz7i11m" autoClearItems="true">
-      <item url="ui://v0j9abjyrw7jw9" title="0" name="ui://Main_Majiang/202_101"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwa" title="1" name="ui://Main_Majiang/202_102"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwb" title="2" name="ui://Main_Majiang/202_103"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwc" title="3" name="ui://Main_Majiang/202_104"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwd" title="4" name="ui://Main_Majiang/202_105"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwe" title="5" name="ui://Main_Majiang/202_106"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwf" title="6" name="ui://Main_Majiang/202_107"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwg" title="7" name="ui://Main_Majiang/202_108"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwh" title="8" name="ui://Main_Majiang/202_109"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwr" title="9" name="ui://Main_Majiang/202_201"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jws" title="10" name="ui://Main_Majiang/202_202"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwt" title="11" name="ui://Main_Majiang/202_203"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwu" title="12" name="ui://Main_Majiang/202_204"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwv" title="13" name="ui://Main_Majiang/202_205"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jww" title="14" name="ui://Main_Majiang/202_206"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwx" title="15" name="ui://Main_Majiang/202_207"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwy" title="16" name="ui://Main_Majiang/202_208"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jwz" title="17" name="ui://Main_Majiang/202_209"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx0" title="18" name="ui://Main_Majiang/202_301"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx1" title="19" name="ui://Main_Majiang/202_302"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx2" title="20" name="ui://Main_Majiang/202_303"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx3" title="21" name="ui://Main_Majiang/202_304"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx4" title="22" name="ui://Main_Majiang/202_305"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx5" title="23" name="ui://Main_Majiang/202_306"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx6" title="24" name="ui://Main_Majiang/202_307"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx7" title="25" name="ui://Main_Majiang/202_308"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx8" title="26" name="ui://Main_Majiang/202_309"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jx9" title="27" name="ui://Main_Majiang/202_401"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jxa" title="28" name="ui://Main_Majiang/202_402"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jxb" title="29" name="ui://Main_Majiang/202_403"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jxc" title="30" name="ui://Main_Majiang/202_404"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jxd" title="31" name="ui://Main_Majiang/202_501"/>
+      <item/>
-      <item url="ui://v0j9abjyrw7jxe" title="32" name="ui://Main_Majiang/202_502"/>
-      <item url="ui://v0j9abjyrw7jxf" title="33" name="ui://Main_Majiang/202_503"/>
       <item/>
       <item/>
     </list>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="3"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="1"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -15,20 +15,20 @@
       <relation target="" sidePair="center-center"/>
       <relation target="n261_ogwn" sidePair="bottom-top"/>
     </component>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,891" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0" values="1189,849" default="89,789"/>
+      <gearXY controller="state" pages="0" values="1189,891" default="89,789"/>
       <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="87,788" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2314,294" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2,3" values="1888,519|2004,77|2311,292|2314,294" default="1194,274"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
+    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,229" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
@@ -58,19 +58,19 @@
       <relation target="n224_ogwn" sidePair="right-right"/>
     </component>
     <component id="n226_ogwn" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
-    <component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-12724,794" group="n230_ogwn">
+    <component id="n227_ogwn" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="-14734,794" group="n230_ogwn">
       <gearDisplay controller="action" pages="0,1"/>
-      <gearXY controller="action" pages="2,0,1" values="5709,794|-12724,794|5853,170"/>
+      <gearXY controller="action" pages="2,0,1" values="7049,794|-14734,794|5853,170"/>
       <Button icon="ui://v0j9abjygq7m48"/>
     </component>
-    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,480" group="n230_ogwn" visible="false">
+    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-3001,480" group="n230_ogwn" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-1921,487" group="n230_ogwn" scale="0.9,1">
+    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2591,487" group="n230_ogwn" scale="0.9,1">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://v0j9abjygq7m4i"/>
     </component>
-    <group id="n230_ogwn" name="n230" xy="-12724,480" size="10987,414" visible="false" advanced="true">
+    <group id="n230_ogwn" name="n230" xy="-14734,480" size="12327,414" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@@ -104,15 +104,16 @@
     <group id="n243_ogwn" name="n243" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n244_ogwn" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,657" size="408,114" group="n247_ogwn">
+    <component id="n245_ogwn" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,589" size="408,114" group="n247_ogwn"/>
-      <gearDisplay controller="action" pages="0"/>
+    <component id="n246_ogwn" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,589" size="408,114" group="n247_ogwn"/>
-    </component>
+    <group id="n247_ogwn" name="readyBtn" xy="810,589" size="912,114" advanced="true">
-    <component id="n245_ogwn" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,522" size="408,114" group="n247_ogwn"/>
-    <component id="n246_ogwn" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,522" size="408,114" group="n247_ogwn"/>
-    <group id="n247_ogwn" name="readyBtn" xy="810,522" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
+    <component id="n244_ogwn" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1062,721" size="408,114">
+      <gearDisplay controller="action" pages="0"/>
+      <relation target="n247_ogwn" sidePair=""/>
+    </component>
     <component id="n248_ogwn" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false"/>
     <text id="n249_ogwn" name="text_time" xy="132,15" size="159,56" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
     <component id="n250_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n253_ogwn">

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

@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="175,191" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="jing" pages="0,,1," selected="1"/>
+  <controller name="jing" pages="0,,1," selected="0"/>
   <controller name="move" pages="0,,1," selected="0"/>
   <controller name="out" pages="0,,1," selected="1"/>
+  <controller name="showhang" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
+  <controller name="special_jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" url="ui://Main_Majiang/b201_203" fill="scaleFree">
+    <loader id="n3_hp0b" name="icon" xy="15,20" size="144,158" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
-      <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
+      <gearXY controller="button" pages="0,1" values="15,20|0,-35"/>
+      <gearSize controller="showhang" pages="1" values="144,158,1,1" default="175,191,1,1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="71,12" size="101,145" aspect="true">
+    <group id="n13_jzul" name="showHand" xy="15,20" size="144,158" advanced="true">
+      <gearXY controller="showhang" pages="0,1" values="0,0|15,20"/>
+    </group>
+    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="71,32" size="85,122" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="out" pages="0,1" values="71,12|71,12" duration="0.1"/>
+      <gearXY controller="out" pages="0,1" values="71,32|71,32" duration="0.1"/>
+      <gearSize controller="showhang" pages="1" values="85,122,1,1" default="101,145,1,1"/>
+      <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="n3_hp0b" sidePair="top-top"/>
+    </image>
+    <image id="n14_jzul" name="special_jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="69,7" size="85,122" aspect="true">
+      <gearDisplay controller="special_jing" pages="1"/>
+      <gearXY controller="out" pages="0,1" values="69,8|69,7" duration="0.1"/>
+      <gearSize controller="showhang" pages="1" values="85,122,1,1" default="101,145,1,1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="n3_hp0b" sidePair="top-top"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="2"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="0"/>
   <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,7 +14,7 @@
     <component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="87,788" default="1189,909"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
@@ -23,7 +23,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="2311,292" default="1888,519"/>
       <relation target="" sidePair="middle-middle"/>
@@ -32,7 +32,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="left-right,bottom-middle"/>
     </component>
-    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
+    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="1865,29" default="1189,223"/>
       <relation target="" sidePair="center-center,top-top"/>
@@ -41,7 +41,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="top-top"/>
     </component>
-    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
+    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="491,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="91,521" default="491,519"/>
       <relation target="" sidePair="middle-middle,right-left"/>
@@ -105,15 +105,16 @@
     <group id="n315_ogwn" name="n315" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n316_ogwn" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,657" size="408,114" group="n319_ogwn">
+    <component id="n317_ogwn" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,589" size="408,114" group="n319_ogwn"/>
-      <gearDisplay controller="action" pages="0"/>
+    <component id="n318_ogwn" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,589" size="408,114" group="n319_ogwn"/>
-    </component>
+    <group id="n319_ogwn" name="readyBtn" xy="810,589" size="912,114" advanced="true">
-    <component id="n317_ogwn" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1314,522" size="408,114" group="n319_ogwn"/>
-    <component id="n318_ogwn" name="btn_closeRoom" src="xblm1an" fileName="Main_new/Main/Component/btn_gameDismissRoom.xml" xy="810,522" size="408,114" group="n319_ogwn"/>
-    <group id="n319_ogwn" name="readyBtn" xy="810,522" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
+    <component id="n316_ogwn" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1065,724" size="408,114">
+      <gearDisplay controller="action" pages="0"/>
+      <relation target="n319_ogwn" sidePair="top-bottom"/>
+    </component>
     <component id="n320_ogwn" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false"/>
     <text id="n321_ogwn" name="text_time" xy="132,15" size="159,56" group="n325_ogwn" font="ui://27vd145bh35o7ika" fontSize="42" color="#ffffff" align="center" letterSpacing="3" autoSize="none" text="14:13"/>
     <component id="n322_ogwn" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="27,21" size="101,43" group="n325_ogwn">

wb_new_ui/assets/Main_Majiang/package.xml

@@ -972,7 +972,7 @@
     <component id="am7vt5" name="OutCard_self_jiangxi.xml" path="/Main_new/Main/" exported="true"/>
     <component id="tlwqt6" name="Fz_0_3.xml" path="/component/card/" exported="true"/>
     <component id="tlwqt7" name="Fz_0_jiangxi_4.xml" path="/component/card/" exported="true"/>
-    <image id="pn9mt8" name="Group 38.png" path="/Main_new/Main/Image/"/>
+    <image id="pn9mt8" name="Group 38.png" path="/Main_new/Main/Image/" smoothing="false" disableTrim="true"/>
     <component id="pn9mt9" name="OutCard_top_jaingxi.xml" path="/component/card/" exported="true"/>
     <component id="pn9mtb" name="Btn_Card_new_4.xml" path="/Main_new/Main/" exported="true"/>
     <component id="pn9mtc" name="OutCard_self_new_4.xml" path="/Main_new/Main/" exported="true"/>

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

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: d9f45c8ec791b144baf8a9663f8389b1
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
-  assetBundleVariant: 

wb_unity_pro/Assets/Modules/FairyGUI/Scripts/Core/Text/TextField.cs

@@ -991,10 +991,16 @@ namespace FairyGUI
 						{
 							HtmlElement imageElement = HtmlElement.GetElement(HtmlElementType.Image);
 							imageElement.Set("src", emoji.url);
-							if (emoji.width != 0)
+							//原版直接使用固定大小
+							/*						if (emoji.width != 0)
 														imageElement.Set("width", emoji.width);
 													if (emoji.height != 0)
-								imageElement.Set("height", emoji.height);
+														imageElement.Set("height", emoji.height);*/
+
+							// 动态跟随字体大小
+							int fontSize = _richTextField.textFormat.size;
+							imageElement.Set("width", fontSize);
+							imageElement.Set("height", fontSize);
 							if (highSurrogate)
 								imageElement.text = source.Substring(j, 2);
 							else

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -8,50 +8,34 @@
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.2",
+    "ver": "1.0.36",
-    "name": "春天",
-    "check": true,
-    "version": "1.0.2",
-    "game_id": "65",
-    "bundle": "extend/poker/chuntian"
-  },
-  {
-    "ver": "1.0.3",
-    "name": "梭哈",
-    "check": true,
-    "version": "1.0.3",
-    "game_id": "90",
-    "bundle": "extend/poker2/suoha"
-  },
-  {
-    "ver": "1.0.35",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.35",
+    "version": "1.0.36",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.38",
+    "ver": "1.0.39",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.38",
+    "version": "1.0.39",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.22",
+    "ver": "1.0.23",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.22",
+    "version": "1.0.23",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.21",
+    "ver": "1.0.22",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.21",
+    "version": "1.0.22",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

wb_unity_pro/ProjectSettings/ProjectSettings.asset

@@ -178,8 +178,8 @@ PlayerSettings:
   buildNumber:
     iPhone: 1
   AndroidBundleVersionCode: 12
-  AndroidMinSdkVersion: 20
+  AndroidMinSdkVersion: 26
-  AndroidTargetSdkVersion: 26
+  AndroidTargetSdkVersion: 29
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 0