10.24

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -169,6 +169,7 @@ function M:connect(host, groupId, callback)
                     group.isWatch = res.Data.isWatch
                     group.messageCount = res.Data.messageCount
                     group.isShow = res.Data.isShow
+                    group.isOpenStartRoom = res.Data.isShowBeginRoom
                     group.joinsData = {}
                 else
                     self.code = SocketCode.ExceptionOnConnect

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -43,7 +43,7 @@ function M:FG_GroupList(callback)
                 group.show_num = tem.show_num
                 group.isShow = tem.isShow
                 group.isOpenChatRoom = tem.isOpenChatRoom
-                group.isOpenStartRoom = tem.isShowBeginRoom or 0 --	--是否显示开始房间 0显示 1隐藏
+                -- group.isOpenStartRoom = tem.isShowBeginRoom or 0 --	--是否显示开始房间 0显示 1隐藏
                 group.isWatch = tem.isWatch
                 group.wechatId = tem.wechatId
                 group.groupDiamo = tem.groupDiamo

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -183,7 +183,8 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 				ExtendHotupdate.UpdateGame(game_info, function()
 					-- res.ReturnCode = -2
 					-- callback(res)
-					self:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
+
+					self:PublicJoinRoom(Protocol.WEB_FG_JOIN_ROOM, json["room_id"], tem, callback, group_id, pid)
 				end)
 				return
 			end

lua_probject/base_project/Game/ControllerManager.lua

@@ -39,14 +39,16 @@ end
 
 function ControllerManager.ChangeController(type)
     printlog("lingmeng code ChangeController", _currenController, type)
-    pt("lingmeng code ChangeController", _currenController, type)
+    pt(_currenController)
-    printlog("lingmeng code ChangeController", _currenController ~= nil)
+    pt(type)
-    if (_currenController ~= nil and not string.find(_currenController.class, "GameController")) then
+    printlog("lingmeng code ChangeController", type == GameController)
+    if (_currenController ~= nil and not (string.find(_currenController.class, "GameController") and type == GameController)) then
         _currenController:OnExit()
     end
     _currenController = ControllerManager.GetController(type)
     printlog("lingmeng code ChangeController2", _currenController, type)
-    pt("lingmeng code ChangeController2", _currenController, type)
+    pt(_currenController)
+    pt(type)
     _currenController:OnEnter()
     return _currenController
 end

lua_probject/base_project/Game/ExtendHotupdate.lua

@@ -58,11 +58,13 @@ function ExtendHotupdate.UpdateGameList(list, callback)
     end
 
     local _version_view = UIPackage.CreateObjectFromURL("ui://Hotupdate/Version")
-    _version_view.x = (GRoot.inst.width - _version_view.width) / 2
+    -- _version_view.x = (GRoot.inst.width - _version_view.width) / 2
     _version_view:GetChild("tex_info").text = "正在检查资源。。。"
     local _pd = _version_view:GetChild("pb_progress")
     _pd.value = 0
     GRoot.inst:AddChild(_version_view)
+    _version_view:MakeFullScreen()
+    _version_view:AddRelation(GRoot.inst, RelationType.Size)
 
     coroutine.start(__update_check, list, function(progress, finish)
         _pd.value = progress * 100

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

@@ -153,6 +153,11 @@ function M:RecursionSearchRank(fgCtr, index, begin_time, end_time)
                 table.sort(self.scoreRanks, function(a, b)
                     return a.score > b.score
                 end)
+                if #self.roundRanks > 0 then
+                    self._view:GetController('noPeople').selectedIndex = 0
+                else
+                    self._view:GetController('noPeople').selectedIndex = 1
+                end
                 self._viewList_round.numItems = #self.roundRanks
                 self._viewList_score.numItems = #self.winRanks
                 self._viewList_win.numItems = #self.scoreRanks

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

@@ -59,7 +59,11 @@ function M:init(url, lev, res)
         inputData.showText = "小提示\n1.设置为0分时表示进入牌局不受限制\n2.每天未读的输分高于设置的分数后无法进入牌局"
         ViewUtil.ShowOneInput(inputData, function(text)
             -- print("lingmeng修改扑克进入限制分", text)
-            fgCtr:FG_SetJoinScore(self.groupId, info.uid, tonumber(text), MJScore, function(res)
+            if text == "" then
+                ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
+                return
+            end
+            fgCtr:FG_SetJoinScore(self.groupId, info.uid, tonumber(text) or 0, MJScore, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -79,7 +83,11 @@ function M:init(url, lev, res)
         inputData.showText = "小提示\n1.设置为0分时表示进入牌局不受限制\n2.每天未读的输分高于设置的分数后无法进入牌局"
         ViewUtil.ShowOneInput(inputData, function(text)
             -- print("lingmeng修改扑克进入限制分", text)
-            fgCtr:FG_SetJoinScore(self.groupId, info.uid, MJScore, tonumber(text), function(res)
+            if text == "" then
+                ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
+                return
+            end
+            fgCtr:FG_SetJoinScore(self.groupId, info.uid, MJScore, tonumber(text) or 0, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else

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

@@ -202,7 +202,11 @@ function FamilyNumberRecord.New(root, page)
             else
                 day = 2
             end
-            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text), self.MJScore, function(res)
+            if text == "" then
+                ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
+                return
+            end
+            fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text) or 0, self.MJScore, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -228,7 +232,11 @@ function FamilyNumberRecord.New(root, page)
             else
                 day = 2
             end
-            fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text), function(res)
+            if text == "" then
+                ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
+                return
+            end
+            fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text) or 0, function(res)
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -302,6 +310,19 @@ function FamilyNumberRecord.New(root, page)
         self.rankNumber.round = 0
     end
 
+    local btn_reflash = self._view:GetChild('btn_reflash')
+    btn_reflash.onClick:Set(function()
+        btn_reflash.touchable = false
+        btn_reflash.grayed = true
+        self:OnClickNumberRank(group_id, self.rankNumber.uid, 0)
+        self._view:GetChild('text_numberRecordTime').text = os.date('%Y-%m-%d  %H:%M:%S', os.time())
+        coroutine.start(function()
+            coroutine.wait(3)
+            btn_reflash.touchable = true
+            btn_reflash.grayed = false
+        end)
+    end)
+
     fgCtr:FG_GetConsumeStat(group_id, self._data_leftTime, self._data_rightTime, function(res)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
@@ -561,6 +582,8 @@ function M:NumverRankRenderer(groupId)
             tonumber(info.score))
         obj:GetChild('btn_lookRecord').onClick:Set(function()
             self.ctr_numberRecord.selectedIndex = 1
+            self.rankNumber.uid = info.uid
+            self.rankNumber.round = info.round
             if self._ctr_day.selectedIndex ~= self._ctr_myday.selectedIndex then
                 self._ctr_myday.selectedIndex = self._ctr_day.selectedIndex
             else
@@ -569,8 +592,6 @@ function M:NumverRankRenderer(groupId)
             self._view:GetChild('text_numberRecordName').text = info.nick
             self._view:GetChild('text_numberRecordID').text = string.format("ID:%s", info.uid)
             ImageLoad.Load(info.portrait, self._view:GetChild('btn_numberRecordHead')._iconObject)
-            self.rankNumber.uid = info.uid
-            self.rankNumber.round = info.round
         end)
     end
 end
@@ -584,7 +605,7 @@ function M:OnClickSortType()
 end
 
 function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
-    fgCtr:FG_GetMemberRank_2(self.group_id, 0, index * 2, 2, self._data_leftTime, self._data_rightTime,
+    fgCtr:FG_GetMemberRank_2(self.group_id, 0, index * 67, 67, self._data_leftTime, self._data_rightTime,
         self._data_seletedType, self._data_sortType,
         function(res)
             if res.ReturnCode ~= 0 then
@@ -602,6 +623,18 @@ function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
                 else
                     round = math.floor(round / 2)
                     self.showRank = self.rank
+                    table.sort(self.showRank, function(a, b)
+                        if self._data_sortType and self._data_sortType == 1 then
+                            return a.score < b.score
+                        else
+                            return a.score > b.score
+                        end
+                    end)
+                    if #self.showRank > 0 then
+                        self._view:GetController('noPeople').selectedIndex = 0
+                    else
+                        self._view:GetController('noPeople').selectedIndex = 1
+                    end
                     self._viewList_numverRecord.numItems = #self.showRank
                 end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -639,6 +639,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
     local show_num = all_num
     if self._group.lev == 3 and self._group.isOpenStartRoom == 1 then
         show_num = #playList + #readyRoom
+        self._view:GetChild('n364').text = string.format("已开启***桌游戏")
     end
     self._view:GetChild('btn_showALlStartRoom'):GetController('isOpen').selectedIndex = self._group.isOpenStartRoom
     list_room.itemRenderer = function(index, obj)
@@ -664,7 +665,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomCtr:PublicJoinRoom(
                     Protocol.WEB_FG_JOIN_ROOM,
                     readyRoom[newIndex].id,
-                    id,
+                    true,
                     function(response)
                         if (response.ReturnCode == -1) then
                             ViewUtil.CloseModalWait2()
@@ -735,7 +736,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomCtr:PublicJoinRoom(
                     Protocol.WEB_FG_MATCH_ROOM,
                     "",
-                    false,
+                    true,
                     function(response)
                         if (response.ReturnCode == -1) then
                             ViewUtil.CloseModalWait2()
@@ -795,7 +796,7 @@ function M:FillSameRoomInfo(obj, type, playInfo)
     local roomName = playInfo.name
     roomName = Utils.TextOmit(roomName, 6, "")
     obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
-    obj:GetChild('game_type').text = string.format("（%s）%s", playInfo.game_name, roomName)
+    obj:GetChild('game_type').text = string.format("   (%s) %s", playInfo.game_name, roomName)
     obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = type
     obj:GetChild('btn_watch').visible = self._group.isWatch and self._group.isWatch == 1
     obj:GetChild('btn_jiesan').visible = self._group.lev < 3

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

@@ -49,9 +49,14 @@ function M:init(url)
             ViewUtil.ErrorTip(-1, "请输入正确的用户ID")
             return
         end
+        if not tonumber(text_num) or tonumber(text_num) == 0 then
+            ViewUtil.ErrorTip(-1, "请输入赠送数量")
+            return
+        end
         local _curren_msg = MsgWindow.new(self._root_view,
-            string.format("是否要赠送%s房卡给用户：%s(%d)", text_num, self._view:GetChild('text_name').text, text_id),
+            string.format("确定赠送玩家(%s)%s房卡吗？", self._view:GetChild('text_name').text, text_num),
             MsgWindow.MsgMode.OkAndCancel)
+        _curren_msg._new_hide = false
         _curren_msg.onOk:Add(function()
             local lobbyCtr = ControllerManager.GetController(LoddyController)
             lobbyCtr:GiftDiamond(

lua_probject/base_project/Game/View/LobbyView.lua

@@ -154,7 +154,14 @@ function M:InitView(url)
 
     local btn_diamo = self._view:GetChild("btn_diamo")
     btn_diamo.onClick:Add(function()
-
+        btn_diamo.touchable = false
+        btn_diamo:GetChild('n6').grayed = true
+        self:GetPlayerInfoData()
+        coroutine.start(function()
+            coroutine.wait(3)
+            btn_diamo.touchable = true
+            btn_diamo:GetChild('n6').grayed = false
+        end)
     end)
 
     local btn_customerService = self._view:GetChild("btn_customerService")

lua_probject/base_project/Game/View/LoginView.lua

@@ -10,6 +10,7 @@ function LoginView.new()
     local self = setmetatable({}, { __index = M })
     self.class = "LoginView"
     self._full = true
+    self._full_offset = false
     self:init()
     return self
 end
@@ -29,6 +30,7 @@ function M:init()
     -- -- print(GameApplication.Instance.accountTest and 1 or 0)
     view:GetController("test").selectedIndex = GameApplication.Instance.accountTest and 1 or 0
     self.agree = view:GetController("agree");
+    self.agree.selectedIndex = 1
     -- Utils.LoadBg("loginbg", view)
     if GameApplication.Instance.accountTest then
         local json_data = Utils.LoadLocalFile("userId")

lua_probject/base_project/Game/View/PlayBackView.lua

@@ -27,7 +27,8 @@ function M:init()
     UIPackage.AddPackage('base/chat/ui/Chat')
     self.cmdList = self._room.cmdList
     self._eventmap = {}
-    -- self._full = true
+    self._full = true
+    self._full_offset = false
     self._put_map = false
     self._new_hide = false
     self._queue = false

lua_probject/base_project/Game/View/ResultView.lua

@@ -101,7 +101,7 @@ end
 
 function M:init(url, isBigFull)
     self._animation = false
-    self._scale = true
+    -- self._scale = true
     self._full = false
     if self._root then
         self._view = UIPackage.CreateObjectFromURL(url)

lua_probject/base_project/Game/View/WitnessView.lua

@@ -13,7 +13,8 @@ function M:init()
     UIPackage.AddPackage('base/chat/ui/Chat')
 
     self._eventmap = {}
-    self._scale = true
+    -- self._scale = true
+    self._full = true
     self._full_offset = false
     self.class = "MainView"
     self._style = 1
@@ -42,6 +43,10 @@ function M:InitView(url)
     self._state = self._view:GetController("state")
 
     self.com_notice = self._view:GetChild("com_notice")
+
+    if self._room.self_player.entrust then
+        self:MarkSelfTuoguan()
+    end
 end
 
 function M:EventInit()
@@ -191,11 +196,14 @@ function M:EventInit()
         -- 托管状态变化
         if t == 5 then
             if p == DataManager.CurrenRoom.self_player then
+                local player_info = self._player_info[self:GetPos(p.seat)]
                 if p.entrust then
                     self:closeTipOnTuoguan()
                     self:MarkSelfTuoguan()
+                    player_info:MarkTuoguan()
                 else
                     self:UnmarkSelfTuoguan()
+                    player_info:UnmarkTuoguan()
                 end
             else
                 local player_info = self._player_info[self:GetPos(p.seat)]
@@ -209,6 +217,17 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(GameEvent.AddScore, handler(self, self.OnAddScoreAnimation))
+
+    _gamectr:AddEventListener(
+        GameEvent.PlayerState,
+        function(...)
+            printlog("lingmeng OnEventOnlineState")
+            local arg = { ... }
+            local p = arg[1]
+            local info = self._player_info[self:GetPos(p.seat)]
+            info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
+        end
+    )
 end
 
 -- 标记自己托管
@@ -217,10 +236,11 @@ function M:MarkSelfTuoguan()
         return
     end
 
-
     self._com_tuoguan = UIPackage.CreateObjectFromURL('ui://Common/com_tuoguan_self')
     local com_tuoguan = self._com_tuoguan
-    GRoot.inst:AddChild(com_tuoguan)
+    self._view:AddChildAt(com_tuoguan, self._view:GetChildIndex(self._view:GetChild('btn_setting')) - 1)
+    -- GRoot.inst:AddChild(com_tuoguan)
+    com_tuoguan:GetChild('btn_cancel_tuoguan').visible = false
     com_tuoguan:MakeFullScreen()
     com_tuoguan:Center()
 end
@@ -358,22 +378,52 @@ function M:OnUpdate()
         end
     end
 
-    local _left_time = self._left_time
+    local _left_time = self._left_time or 0
-    if _left_time and (_left_time > 0) then
+    if (_left_time > 0) then
         _left_time = _left_time - deltaTime
         _left_time = math.max(0, _left_time)
         local leftTime = math.floor(_left_time)
+        --旧的拼接方式
+        -- if leftTime < 10 then
+        --     self._tex_leftTime.text = '0' .. tostring(leftTime)
+        --     for i = 2, 4 do
+        --         local text = self["_tex_leftTime" .. i]
+        --         if text then
+        --             text.text = '0' .. tostring(leftTime)
+        --         end
+        --     end
+        -- else
+        --     self._tex_leftTime.text = tostring(leftTime)
+        --     for i = 2, 4 do
+        --         local text = self["_tex_leftTime" .. i]
+        --         if text then
+        --             text.text = tostring(leftTime)
+        --         end
+        --     end
+        -- end
         self._tex_leftTime.text = string.format("%02d", _left_time)
         self._left_time = _left_time
         -- 桌面計時器聲音
         if not self._curtime then
             self._curtime = 15
         end
-        if leftTime <= 3 and self._curtime ~= leftTime and leftTime ~= 0 then
+        if leftTime <= self._leftTime_xiangling and self._curtime ~= leftTime and leftTime ~= 0 then
             self._curtime = leftTime
             GameApplication.Instance:PlaySound('base/common/sound/timeup_alarm.mp3')
         end
+        if self._leftTime_bianhong then
+            if leftTime <= 5 then
+                if self._tex_leftTime:GetController('poker_Color') then
+                    self._tex_leftTime:GetController('poker_Color').selectedIndex = 1
+                end
             else
+                if self._tex_leftTime:GetController('poker_Color') then
+                    self._tex_leftTime:GetController('poker_Color').selectedIndex = 0
+                end
+            end
+        end
+    else
+        self:onLeftTimeOver()
         if self._tex_leftTime then
             self._tex_leftTime.text = '00'
         end
@@ -386,6 +436,10 @@ function M:OnUpdate()
     end
 end
 
+function M:onLeftTimeOver()
+
+end
+
 function M:DestroyPlayerInfo()
     for i = 1, #self._player_info do
         self._player_info[i]:Destroy()

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

@@ -208,12 +208,21 @@ function M:FillWitnessData(pd_data)
     room.left_count = _tableInfo["left_card"]
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
+    local playerList = _tableInfo["playerData"]
     room.curren_round = _tableInfo["round"]
     room.witness_player_list = _tableInfo["playerSpectatorData"]
+    room._flag_updateWitness = true
+    self:FillPlayerData(playerList)
+    local jing = _tableInfo["jing"]
+    if jing then
+        room.jing = jing
+    end
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
+        local tem = _info_list[i]
         local _jp = _info_list[i]
-        local p = room:NewPlayer()
+        local playerid = tem["aid"]
+        local p = room:GetPlayerById(playerid)
         p.seat = _jp["seat"]
         local online = _jp["online"]
         p.line_state = online

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

@@ -217,16 +217,21 @@ function M:FillWitnessData(pd_data)
     room.left_count = _tableInfo["left_card"]
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
+    local playerList = _tableInfo["playerData"]
     room.curren_round = _tableInfo["round"]
     room.witness_player_list = _tableInfo["playerSpectatorData"]
+    room._flag_updateWitness = true
+    self:FillPlayerData(playerList)
     local jing = _tableInfo["jing"]
     if jing then
         room.jing = jing
     end
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
+        local tem = _info_list[i]
         local _jp = _info_list[i]
-        local p = room:NewPlayer()
+        local playerid = tem["aid"]
+        local p = room:GetPlayerById(playerid)
         p.seat = _jp["seat"]
         local online = _jp["online"]
         p.line_state = online

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

@@ -218,16 +218,21 @@ function M:FillWitnessData(pd_data)
     room.left_count = _tableInfo["left_card"]
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
+    local playerList = _tableInfo["playerData"]
     room.curren_round = _tableInfo["round"]
     room.witness_player_list = _tableInfo["playerSpectatorData"]
+    room._flag_updateWitness = true
+    self:FillPlayerData(playerList)
     local jing = _tableInfo["jing"]
     if jing then
         room.jing = jing
     end
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
+        local tem = _info_list[i]
         local _jp = _info_list[i]
-        local p = room:NewPlayer()
+        local playerid = tem["aid"]
+        local p = room:GetPlayerById(playerid)
         p.seat = _jp["seat"]
         local online = _jp["online"]
         p.line_state = online

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

@@ -209,12 +209,21 @@ function M:FillWitnessData(pd_data)
     room.left_count = _tableInfo["left_card"]
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
+    local playerList = _tableInfo["playerData"]
     room.curren_round = _tableInfo["round"]
     room.witness_player_list = _tableInfo["playerSpectatorData"]
+    room._flag_updateWitness = true
+    self:FillPlayerData(playerList)
+    local jing = _tableInfo["jing"]
+    if jing then
+        room.jing = jing
+    end
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
+        local tem = _info_list[i]
         local _jp = _info_list[i]
-        local p = room:NewPlayer()
+        local playerid = tem["aid"]
+        local p = room:GetPlayerById(playerid)
         p.seat = _jp["seat"]
         local online = _jp["online"]
         p.line_state = online

lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua

@@ -21,6 +21,10 @@ function M:FillData(view, index)
 
     -- if oldGameVersion == 1 then
     self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Label_Detail_Play")
+
+    local com_editSetting = self._config:GetChild("com_editSetting")
+
+    com_editSetting:GetController("cGps").selectedIndex = 2
     -- else
     --     self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast_yueyang")
     -- end

lua_probject/extend_project/extend/poker/runfast/EXWitnessView.lua

@@ -631,6 +631,7 @@ function M:EventInit()
 
             self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0,
                 remaincards)
+            self._ctr_inClear.selectedIndex = 0
             self.result_view:SetDestroryCallback(function()
                 for i = 1, #self._player_card_info do
                     local card_info = self._player_card_info[i]
@@ -742,6 +743,19 @@ function M:EventInit()
             head_info:UpdateScore(player.total_score)
         end
     end)
+
+    --覆盖原始闹钟，原始闹钟仅限麻将使用
+    _gamectr:AddEventListener(
+        GameEvent.TupGuanOpen,
+        function(...)
+            ---- print("刷新托管数据=====")
+            local arg = { ... }
+            local p = arg[1]
+            local player_card_info = self._player_card_info[self:GetPos(p.seat)]
+            self._tex_leftTime = player_card_info._view_comp_clock
+            self._left_time = tonumber(arg[3]) or 0
+        end
+    )
 end
 
 function M:NewPlayerCardInfoView(tem, index)

lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua

@@ -1169,6 +1169,17 @@ function M:EventInit()
             self._popEvent = true
         end)
     end)
+
+    _gamectr:AddEventListener(
+        GameEvent.PlayerState,
+        function(...)
+            printlog("lingmeng OnEventOnlineState")
+            local arg = { ... }
+            local p = arg[1]
+            local info = self._player_info[self:GetPos(p.seat)]
+            info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
+        end
+    )
 end
 
 function M:ReConnectForStart()

lua_probject/extend_project/extend/poker/runfast/RunFast_RightPanelView.lua

@@ -4,7 +4,7 @@ local M = RunFast_RightPanelView
 local function __init(self, mainView, view)
     local right_panel = view
 
-    local btn_setting = mainView._view:GetChild("Btn_Setting")
+    local btn_setting = mainView._view:GetChild("btn_setting")
     btn_setting.onClick:Set(function()
         local _settingView = mainView:NewSettingView()
         _settingView:Show()

lua_probject/extend_project/extend/poker2/suoha/ExRightPanelView.lua

@@ -4,7 +4,7 @@ local M = EXRightPanelView
 local function __init(self, mainView, view)
     local right_panel = view
 
-    local btn_setting = mainView._view:GetChild("Btn_Setting")
+    local btn_setting = mainView._view:GetChild("btn_setting")
     btn_setting.onClick:Set(function()
         local _settingView = mainView:NewSettingView()
         _settingView:Show()

lua_probject/main_project/main/majiang/MJWitnessView.lua

@@ -32,7 +32,6 @@ end
 
 function M:InitView()
     local room = self._room
-
     UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
     getmetatable(M).__index.InitView(self,
         string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
@@ -59,6 +58,8 @@ function M:InitView()
     self._view:GetChild('wanfa_text').text = gamePlay
 
     self._laiziMove = self._view:GetTransition('laiziMove')
+    self._leftTime_xiangling = 3
+    self._left_time = 0
 end
 
 function M:ClickSetting()

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
+  <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="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -9,7 +9,7 @@
   <controller name="voice" pages="0,,1," selected="0"/>
   <controller name="Inclear" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
-  <controller name="check" pages="0,,1," selected="1"/>
+  <controller name="check" pages="0,,1," selected="0"/>
   <displayList>
     <graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
@@ -187,7 +187,7 @@
     <text id="n133_ckvb" name="Text_Time" xy="720,58" size="101,56" group="n131_ckvb" font="FZCuYuan-M03" fontSize="42" color="#ffffff" letterSpacing="2" singleLine="true" text="18:18">
       <relation target="n132_ckvb" sidePair="center-center,top-bottom"/>
     </text>
-    <component id="n128_ckvb" name="Btn_Setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1832,22" size="90,78" group="n131_ckvb">
+    <component id="n128_ckvb" name="btn_setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1832,22" size="90,78" group="n131_ckvb">
       <relation target="" sidePair="left-center%,top-top"/>
     </component>
     <image id="n134_ckvb" name="n134" src="n9qrclq" fileName="Main_New/Image/gamexzmj_68.png" xy="854,27" size="203,62" group="n131_ckvb">
@@ -226,24 +226,6 @@
       <gearDisplay controller="voice" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n158_ukp7" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" pkg="v0j9abjy" xy="1260,909" group="n164_ukp7">
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <graph id="n159_ukp7" name="bg_playback" xy="0,-1" size="2532,1170" group="n164_ukp7" type="rect" lineSize="0" fillColor="#00ffffff">
-      <gearDisplay controller="state" pages="3"/>
-    </graph>
-    <component id="n160_ukp7" name="btn_rule_back" src="ukp7tcqo" fileName="Main_new/Main/Component/btn_normol(1).xml" xy="215,34" size="115,111" group="n163_ukp7">
-      <gearDisplay controller="state" pages="3"/>
-      <Button icon="ui://9n9stu2eukp7tcqp"/>
-    </component>
-    <component id="n161_ukp7" name="btn_back_lobby" src="ukp7tcqq" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="87,58" size="81,75" group="n163_ukp7" scale="2,2">
-      <gearDisplay controller="state" pages="3"/>
-    </component>
-    <component id="n162_ukp7" name="panel_record" src="lj2n7inp" fileName="component/record/Record_New.xml" pkg="27vd145b" xy="0,853" group="n163_ukp7">
-      <gearDisplay controller="state" pages="3"/>
-    </component>
-    <group id="n163_ukp7" name="huifang" xy="0,34" size="2532,984" group="n164_ukp7" advanced="true"/>
-    <group id="n164_ukp7" name="playback" xy="0,-1" size="2532,1170"/>
     <component id="n174_bgcf" name="n174" src="bm7dtcrd" fileName="Main_New/Component/btn_bg.xml" xy="0,0" size="2532,1170">
       <gearDisplay controller="check" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
@@ -277,6 +259,24 @@
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
     <graph id="n173_bgcf" name="click" xy="15,14" size="552,432" type="rect" lineSize="0" fillColor="#00ffffff"/>
+    <component id="n158_ukp7" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" pkg="v0j9abjy" xy="1260,909" group="n164_ukp7">
+      <relation target="" sidePair="center-center"/>
+    </component>
+    <graph id="n159_ukp7" name="bg_playback" xy="0,-1" size="2532,1170" group="n164_ukp7" type="rect" lineSize="0" fillColor="#00ffffff">
+      <gearDisplay controller="state" pages="3"/>
+    </graph>
+    <component id="n160_ukp7" name="btn_rule_back" src="ukp7tcqo" fileName="Main_new/Main/Component/btn_normol(1).xml" xy="215,34" size="115,111" group="n163_ukp7">
+      <gearDisplay controller="state" pages="3"/>
+      <Button icon="ui://9n9stu2eukp7tcqp"/>
+    </component>
+    <component id="n161_ukp7" name="btn_back_lobby" src="ukp7tcqq" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="87,58" size="81,75" group="n163_ukp7" scale="2,2">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <component id="n162_ukp7" name="panel_record" src="lj2n7inp" fileName="component/record/Record_New.xml" pkg="27vd145b" xy="0,853" group="n163_ukp7">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <group id="n163_ukp7" name="huifang" xy="0,34" size="2532,984" group="n164_ukp7" advanced="true"/>
+    <group id="n164_ukp7" name="playback" xy="0,-1" size="2532,1170"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_3.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -8,7 +8,7 @@
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <controller name="Inclear" pages="0,,1," selected="0"/>
-  <controller name="witness" pages="0,,1," selected="1"/>
+  <controller name="witness" pages="0,,1," selected="0"/>
   <displayList>
     <graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
@@ -62,9 +62,6 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <component id="n68_pwv4" name="panel_record" src="rayb5j" fileName="component/record/Record.xml" pkg="27vd145b" xy="379,240">
-      <gearDisplay controller="state" pages="3"/>
-    </component>
     <text id="n61_agtp" name="tex_version" xy="1225,2164" size="130,38" scale="1.5,1.5" fontSize="30" color="#ffffff" align="center" autoSize="none" text="V2.0.2">
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
@@ -77,7 +74,7 @@
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
     <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="974,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
-    <component id="n84_q50p" name="btn_back_lobby" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="510,1878" size="58,75" group="n86_q50p" scale="1.5,1.5">
+    <component id="n84_q50p" name="btn_back_lobby__" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="510,1878" size="58,75" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
     <component id="n85_q50p" name="btn_rule--" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="332,1878" group="n86_q50p" scale="1.5,1.5"/>
@@ -126,33 +123,33 @@
     </component>
     <graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
     <component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/>
-    <component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2359,17" size="156,126" group="n121_ckvb">
+    <component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2372,4" size="156,126" group="n121_ckvb">
-      <gearXY controller="state" pages="0,1,2,3" values="2359,17|2359,17|2336,32|2372,294" default="2359,17"/>
+      <gearXY controller="state" pages="0,1,2,3" values="2359,17|2359,17|2336,32|2372,4" default="2359,17"/>
       <relation target="" sidePair="right-right,middle-middle"/>
     </component>
-    <component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="18,586" size="157,131" group="n121_ckvb">
+    <component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="9,721" size="157,131" group="n121_ckvb">
       <gearXY controller="state" pages="0,1,2,3" values="18,586|18,586|80,495|9,721" default="18,586"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n156_11k4t" name="player_info3" src="11k4tcq6" fileName="Main_New/PlayerHead_3.xml" xy="18,17" size="156,126" group="n121_ckvb">
+    <component id="n156_11k4t" name="player_info3" src="11k4tcq6" fileName="Main_New/PlayerHead_3.xml" xy="21,16" size="156,126" group="n121_ckvb">
-      <gearXY controller="state" pages="0,1,2,3" values="18,17|18,17|2336,32|2372,294" default="18,17"/>
+      <gearXY controller="state" pages="0,1,2,3" values="18,17|18,17|2336,32|21,16" default="18,17"/>
       <relation target="" sidePair="right-right,middle-middle"/>
     </component>
-    <group id="n121_ckvb" name="playiinfo" xy="18,17" size="2497,700"/>
+    <group id="n121_ckvb" name="playiinfo" xy="9,4" size="2519,848"/>
     <component id="n69_sdax" name="player_card_info_1" src="ckvbcjl" fileName="Main_New/Player_card_info_1.xml" xy="126,841" group="n122_ckvb">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="664,177" group="n122_ckvb" scale="0.9,0.9" touchable="false">
+    <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="668,222" group="n122_ckvb" scale="0.9,0.9" touchable="false">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
-    <component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="292,178" group="n122_ckvb" scale="0.9,0.9" touchable="false">
+    <component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="305,251" group="n122_ckvb" scale="0.9,0.9" touchable="false">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
-    <group id="n122_ckvb" name="playCardInfo" xy="126,177" size="2298,992"/>
+    <group id="n122_ckvb" name="playCardInfo" xy="126,222" size="2302,947"/>
     <component id="n152_n9qr" name="btn_inviteFamily" src="n9qrcly" fileName="Main_new/Main/Component/btn_normol.xml" xy="2404,264" size="129,243">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="right-right"/>
@@ -168,7 +165,7 @@
       <gearDisplay controller="action" pages="0,1"/>
       <relation target="" sidePair="width-width%,height-height%,center-center,top-middle%"/>
     </component>
-    <component id="n148_n9qr" name="btn_back_lobby" src="ckvbcjd" fileName="Main_New/Component/Btn_CloseRoom.xml" xy="1300,481" group="n126_ckvb" visible="false">
+    <component id="n148_n9qr" name="btn_back_lobby__" src="ckvbcjd" fileName="Main_New/Component/Btn_CloseRoom.xml" xy="1300,481" group="n126_ckvb" visible="false">
       <relation target="" sidePair="right-right,top-middle"/>
     </component>
     <group id="n126_ckvb" name="readyBtn" xy="831,481" size="866,360" advanced="true">
@@ -200,7 +197,7 @@
     <text id="n133_ckvb" name="Text_Time" xy="720,58" size="101,56" group="n131_ckvb" font="FZCuYuan-M03" fontSize="42" color="#ffffff" letterSpacing="2" singleLine="true" text="18:18">
       <relation target="n132_ckvb" sidePair="center-center,top-bottom"/>
     </text>
-    <component id="n128_ckvb" name="Btn_Setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1832,22" size="90,78" group="n131_ckvb">
+    <component id="n128_ckvb" name="btn_setting" src="ckvbcj6" fileName="Main_New/Component/Btn_Setting.xml" xy="1832,22" size="90,78" group="n131_ckvb">
       <relation target="" sidePair="left-center%,top-top"/>
     </component>
     <image id="n134_ckvb" name="n134" src="n9qrclq" fileName="Main_New/Image/gamexzmj_68.png" xy="854,27" size="203,62" group="n131_ckvb">
@@ -255,10 +252,28 @@
       <relation target="" sidePair="width-width,height-height"/>
       <Button controller="witness" page="0"/>
     </component>
-    <component id="n162_ukp7" name="comp_witness" src="bm7dtcr7" fileName="Main_New/Component/comp_witness.xml" xy="2097,30">
+    <component id="n162_ukp7" name="comp_witness" src="bm7dtcr7" fileName="Main_New/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
+    <component id="n167_o2zr" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" pkg="v0j9abjy" xy="1260,910" group="n173_o2zr">
+      <relation target="" sidePair="center-center"/>
+    </component>
+    <graph id="n168_o2zr" name="bg_playback" xy="0,0" size="2532,1170" group="n173_o2zr" type="rect" lineSize="0" fillColor="#00ffffff">
+      <gearDisplay controller="state" pages="3"/>
+    </graph>
+    <component id="n169_o2zr" name="btn_rule_back" src="ukp7tcqo" fileName="Main_new/Main/Component/btn_normol(1).xml" xy="215,35" size="115,111" group="n172_o2zr">
+      <gearDisplay controller="state" pages="3"/>
+      <Button icon="ui://9n9stu2eukp7tcqp"/>
+    </component>
+    <component id="n170_o2zr" name="btn_back_lobby" src="ukp7tcqq" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="87,59" size="81,75" group="n172_o2zr" scale="2,2">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <component id="n171_o2zr" name="panel_record" src="lj2n7inp" fileName="component/record/Record_New.xml" pkg="27vd145b" xy="0,854" group="n172_o2zr">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
+    <group id="n172_o2zr" name="huifang" xy="0,35" size="2532,984" group="n173_o2zr" advanced="true"/>
+    <group id="n173_o2zr" name="playback" xy="0,0" size="2532,1170"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

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

@@ -2,9 +2,12 @@
 <component size="66,66" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n4_kxhm" name="n4" src="v5m57d0q" fileName="NumberRecord/Image/Rectangle 271.png" xy="0,0" size="66,66"/>
+    <image id="n4_kxhm" name="n4" src="v5m57d0q" fileName="NumberRecord/Image/Rectangle 271.png" xy="0,0" size="66,66">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <image id="n3_kxhm" name="n3" src="v5m57d0p" fileName="NumberRecord/Image/Ellipse 38.png" xy="4,4" size="58,58">
       <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </image>
   </displayList>
   <Button mode="Check"/>

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

@@ -10,7 +10,7 @@
     <image id="n20_jzul" name="n20" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="813,16" size="6,119"/>
     <image id="n23_jzul" name="n23" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="1847,16" size="6,119"/>
     <image id="n21_jzul" name="n21" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="2150,16" size="6,119"/>
-    <component id="n0_jrro" name="n0" src="jrro7cxm" fileName="NumberRecord/Component/Multiple_choose.xml" xy="24,42">
+    <component id="n0_jrro" name="n0" src="jrro7cxm" fileName="NumberRecord/Component/Multiple_choose.xml" xy="9,20" size="105,111">
       <Button controller="seleted" page="1"/>
     </component>
     <text id="n2_jrro" name="text_gameName" xy="120,37" size="200,75" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="麻将麻将&#xA;">

wb_new_ui/assets/Family/Rank/comp_rank.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2432,1170">
   <controller name="top_list" pages="0,,1,,2," selected="0"/>
+  <controller name="noPeople" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n20_g71b" name="n20" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="0,0" size="2531,1170" group="n2_jydr">
       <relation target="" sidePair="width-width,height-height"/>
@@ -60,5 +61,8 @@
       <relation target="n13_jydr" sidePair="width-width,left-left"/>
     </list>
     <group id="n14_jydr" name="body" xy="366,428" size="1794,697"/>
+    <text id="n22_100mb" name="text_noPlayer" xy="700,688" size="1152,154" font="ui://27vd145bg2mo7ij0" fontSize="112" color="#a8312f" align="center" vAlign="middle" autoSize="none" text="该时间段没人上榜！">
+      <gearDisplay controller="noPeople" pages="1"/>
+    </text>
   </displayList>
 </component>

wb_new_ui/assets/Login/Main.xml

@@ -4,7 +4,7 @@
   <controller name="agree" exported="true" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n89_z7hi" name="n89" src="z7hi7cjl" fileName="bg/loggin_bg.png" pkg="27vd145b" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>
     <image id="n74_xn94" name="n74" src="xn9417" fileName="hall_girl_bg@2x.png" pkg="0khx14ar" xy="718,247">
       <relation target="" sidePair="width-width%,height-height%,center-center,top-top%"/>
@@ -14,14 +14,14 @@
       <relation target="" sidePair=""/>
     </component>
     <group id="n27" name="login" xy="516,720" size="1500,165" advanced="true">
-      <relation target="" sidePair="center-center"/>
+      <relation target="" sidePair="center-center,top-top%"/>
     </group>
     <component id="n87_gxzn" name="Check_agree" src="gxzn7cjk" fileName="component/main/component/Checkbox_agree.xml" xy="999,992" group="n84_i2za">
-      <Button controller="agree" page="1"/>
+      <Button checked="true" controller="agree" page="1"/>
     </component>
     <component id="n83_i2za" name="btn_showText" src="i2za7cjh" fileName="component/main/component/btn_showText.xml" xy="1091,992" group="n84_i2za"/>
     <group id="n84_i2za" name="login_down" xy="999,992" size="620,84" advanced="true">
-      <relation target="" sidePair="center-center"/>
+      <relation target="" sidePair="center-center,top-top%"/>
     </group>
   </displayList>
 </component>

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

@@ -35,12 +35,12 @@
       <gearXY controller="site" pages="2,0,1" values="-69,-40|-33,-57|154,0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <component id="n31_e54q" name="chat" src="gq7m76" fileName="component/MsgBubble1.xml" xy="-153,32" size="216,67" alpha="0" touchable="false" pkg="27vd145b"/>
+    <component id="n31_e54q" name="chat" src="gq7m76" fileName="component/head/MsgBubble1.xml" pkg="27vd145b" xy="-153,32" size="216,67" alpha="0" touchable="false"/>
-    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/Face3.xml" xy="0,0" alpha="0" touchable="false" pkg="27vd145b"/>
+    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/head/Face3.xml" pkg="27vd145b" xy="0,0" alpha="0" touchable="false"/>
-    <image id="n51_l9ll" name="n51" src="sx7x14g" fileName="Main_new/Main/Image/gamechatback1.png" xy="85,4" size="157,65" scale="1.3,1.3">
+    <image id="n51_l9ll" name="n51" src="sx7x14g" fileName="Main_new/Main/Image/gamechatback1.png" xy="-165,14" size="157,65" scale="1.3,1.3" flip="hz">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
-    <component id="n52_l9ll" name="mask_voice" src="gq7m61" fileName="component/VoiceMask(1).xml" xy="111,10" touchable="false" pkg="27vd145b">
+    <component id="n52_l9ll" name="mask_voice" src="100mb7jg4" fileName="component/head/VoiceMask2.xml" pkg="27vd145b" xy="-127,20" touchable="false">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
     <component id="n39_nip5" name="mask_piao" src="gq7m65" fileName="component/piao_niao/mask_piao.xml" xy="-5,97" touchable="false">

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,41 +1,41 @@
 [
   {
-    "ver": "1.0.47",
+    "ver": "1.0.49",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.47",
+    "version": "1.0.49",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.66",
+    "ver": "1.0.68",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.66",
+    "version": "1.0.68",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.69",
+    "ver": "1.0.71",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.69",
+    "version": "1.0.71",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.53",
+    "ver": "1.0.55",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.53",
+    "version": "1.0.55",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.52",
+    "ver": "1.0.54",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.52",
+    "version": "1.0.54",
     "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.8",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]