发送带id的邀请协议

lua_probject/base_project/Game/Controller/GameController.lua

@@ -9,6 +9,10 @@ GameEvent = {
     PlayerLeave = 'PlayerLeave',
     -- 玩家进入
     PlayerEnter = 'PlayerEnter',
+    -- 观战玩家离开
+    WitnessPlayerLeave = 'WitnessPlayerLeave',
+    -- 观战玩家进入
+    WitnessPlayerEnter = 'WitnessPlayerEnter',
     -- 玩家准备
     PlayerReady = 'PlayerReady',
     -- 解散
@@ -70,6 +74,9 @@ function M:init(name)
     self._eventmap[Protocol.GAME_EVT_READY_ENTRUST] = self.OnEvtOpenTupGTips
     self._eventmap[Protocol.GAME_EVT_CANCEL_READY_ENTRUST] = self.OnEvtCloseTupGTips
 
+    self._eventmap[Protocol.GAME_EVT_WITNESS_ROOM] = self.OnEvtEnterWitness
+    self._eventmap[Protocol.GAME_EVT_Exit_WITNESS_ROOM] = self.OnEvtExieWitness
+
     --self._eventmap[Protocol.GAME_AUTO_CARD] = self.OnEvtOpenGameHuTuoGtips
 end
 
@@ -632,3 +639,11 @@ function M:OnEvtOpenGameHuTuoGtips(isAuto)
     data.autoCard = isAuto
     _client:send(Protocol.GAME_AUTO_CARD, data)
 end
+
+function M:OnEvtEnterWitness(msg)
+    DispatchEvent(self._dispatcher, GameEvent.WitnessPlayerEnter, msg.tableInfo.playerSpectatorData)
+end
+
+function M:OnEvtExieWitness(msg)
+    DispatchEvent(self._dispatcher, GameEvent.WitnessPlayerLeave, msg.playyer)
+end

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -290,8 +290,9 @@ function M:FG_GetOnlinePlayers(callback)
 end
 
 -- 邀请在线玩家
-function M:FG_InvitePlayer(tag, roomid, pid, game_name, callback)
+function M:FG_InvitePlayer(group_id, tag, roomid, pid, game_name, callback)
     local _data = {}
+    _data.id = group_id
     _data.tagId = tag
     _data.roomid = roomid
     _data.pid = pid

lua_probject/base_project/Game/Data/Room.lua

@@ -35,6 +35,9 @@ local Room = {
     -- 玩家列表
     player_list = nil,
 
+    -- 观战玩家列表
+    witness_player_list = nil,
+
     -- 游戏中
     playing = false,
 
@@ -71,14 +74,14 @@ local M = Room
 --- Create a new Room
 function Room.new()
     local self = {}
-    setmetatable(self, {__index = M})
+    setmetatable(self, { __index = M })
     self:init()
     return self
 end
 
 function M:init()
     self.player_list = {}
-    self.room_config ={}
+    self.room_config = {}
 end
 
 -- 创建玩家
@@ -89,16 +92,14 @@ end
 -- 添加玩家
 function M:AddPlayer(player)
     if (not player) then return end
-    for k , tem  in ipairs(self.player_list) do
+    for k, tem in ipairs(self.player_list) do
-        if(tem.self_user.account_id == player.self_user.account_id) then
+        if (tem.self_user.account_id == player.self_user.account_id) then
             -- tem = player
             self.player_list[k] = player
             return
         end
     end
-    self.player_list[#self.player_list+1] = player
+    self.player_list[#self.player_list + 1] = player
-
-
 end
 
 -- 是否为不可负分房间
@@ -110,24 +111,22 @@ function M:checkHpNonnegative()
     return false
 end
 
-
 -- 删除指定玩家
 -- <param name="player"></param>
 function M:RemovePlayer(player)
-    for i , _player in ipairs(self.player_list) do
+    for i, _player in ipairs(self.player_list) do
         if _player == player then
-            table.remove(self.player_list , i)
+            table.remove(self.player_list, i)
             return
         end
     end
 end
 
-
 -- 获取指定玩家_userid
 -- <param name="id"></param>
 -- <returns></returns>
 function M:GetPlayerById(id)
-    for _ , tem  in pairs(self.player_list) do
+    for _, tem in pairs(self.player_list) do
         if (tem.self_user.account_id == id) then
             return tem
         end
@@ -135,12 +134,11 @@ function M:GetPlayerById(id)
     return nil;
 end
 
-
 -- 获取指定玩家_桌号
 -- <param name="id"></param>
 -- <returns></returns>
 function M:GetPlayerBySeat(seat)
-    for _ , tem  in ipairs(self.player_list) do
+    for _, tem in ipairs(self.player_list) do
         if (tem.seat == seat) then
             return tem
         end
@@ -156,6 +154,7 @@ function M:GetTotalScore(score)
         return score
     end
 end
+
 -- 获取乘倍数前的积分
 function M:GetOriginScore(total_score)
     if self.hpOnOff == 1 then
@@ -164,10 +163,12 @@ function M:GetOriginScore(total_score)
         return total_score
     end
 end
+
 -- 设置房间重连状态
 function M:SetReloadStatus(flag)
     self.reloading = flag
 end
+
 -- 获取房间重连状态
 function M:GetReloadStatus()
     return self.reloading
@@ -186,10 +187,10 @@ function RoomConfig:init(config)
     --不可负分
     self.isNonnegative = config["isNonnegative"]
     self.pid = config["pid"]
-  return self
+    return self
 end
 
-local str_tuoguan = {"当局结算", "二局结算", "三局结算","满局结算"}
+local str_tuoguan = { "当局结算", "二局结算", "三局结算", "满局结算" }
 function RoomConfig:GetDes(sp, str_people_num)
     local str = ""
     if not str_people_num and self.people_num then

lua_probject/base_project/Game/Protocol.lua

@@ -379,6 +379,10 @@ Protocol = {
     GAME_WITNESS_ROOM               = "3013",
     -- 观战退出房间
     GAME_Exit_WITNESS_ROOM          = "3023",
+    -- 观战进入事件
+    GAME_EVT_WITNESS_ROOM           = "3012",
+    -- 观战退出事件
+    GAME_EVT_Exit_WITNESS_ROOM      = "3022",
     -- 进入房间
     GAME_JOIN_ROOM                  = "1002",
 

lua_probject/base_project/Game/View/FGAssistView.lua

@@ -68,7 +68,8 @@ function M:PlayerRenderer(index, obj)
     btn_invite.onClick:Set(function()
         local mgr_ctr = ControllerManager.GetController(GroupMgrController)
         local room = DataManager.CurrenRoom
-        mgr_ctr:FG_InvitePlayer(self._data_number[i].uid, room.room_id, room.play_id, room.room_config:GetGameName(),
+        mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, room.room_id, room.play_id,
+            room.room_config:GetGameName(),
             function()
             end)
     end)

lua_probject/base_project/Game/View/MainView.lua

@@ -481,6 +481,18 @@ function M:InitView(url, isHideIpAdds)
             panel_assist:Show()
         end)
     end
+
+    self._viewBtn_pangGuang = self._view:GetChild('btn_pangGuang')
+    self._view_WitnessPlayer = self._view:GetChild('comp_witness')
+    self._ctr_showWitness = self._view:GetController('witness')
+
+    if self._viewBtn_pangGuang and self._view_WitnessPlayer and self._ctr_showWitness then
+        self._viewBtn_pangGuang.onClick:Set(function()
+            self._ctr_showWitness.selectedIndex = 1
+            self:ShowWitnessPlayer()
+        end)
+    end
+
     ------------------------------------------------------------
 end
 
@@ -520,6 +532,20 @@ function M:continue_game(continue)
     end
 end
 
+--展示观战
+function M:ShowWitnessPlayer()
+    local view_witness = self._ctr_showWitness
+    local player_list = view_witness:GetChild('list_players')
+    local witnessPlayer = self._room.witnessPlayers
+    player_list:SetVirtual()
+    player_list.itemRenderer = function(index, obj)
+        obj:GetChild('text_name').text = witnessPlayer[index + 1].nick
+    end
+    if witnessPlayer then
+        player_list.numItems = #witnessPlayer
+    end
+end
+
 -- 公用的playerinfoview方法，如果扩展有改动可以重写
 function M:InitPlayerInfoView(isHideIpAdds)
     self._player_info = {}
@@ -782,6 +808,32 @@ function M:EventInit()
             end
         end
     )
+
+    _gamectr:AddEventListener(
+        GameEvent.WitnessPlayerEnter,
+        function(...)
+            ---- print("刷新托管数据=====")
+            local arg = { ... }
+            local witnessPlayerList = arg[1]
+            _room.witness_player_list = witnessPlayerList
+        end
+    )
+
+    _gamectr:AddEventListener(
+        GameEvent.WitnessPlayerLeave,
+        function(...)
+            ---- print("刷新托管数据=====")
+            local arg = { ... }
+            local player = arg[1]
+            local witnessPlayerList = _room.witness_player_list
+            for i, _player in ipairs(witnessPlayerList) do
+                if _player.uid == player then
+                    table.remove(witnessPlayerList, i)
+                    return
+                end
+            end
+        end
+    )
 end
 
 -- 设置能否互动,1允许,0禁止

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

@@ -258,7 +258,7 @@ function M:fillResult1(room, peopleNum, total_result)
     local familyIDText = self._view:GetChild("Text_FamilyID")
     print("lingmeng fillResult1")
     pt(room)
-    for i, v in pairs(room.self_player.self_user.games) do
+    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)
         end

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

@@ -246,7 +246,6 @@ function M:FillWitnessData(pd_data)
 
         room:AddPlayer(p)
     end
-    room.self_player.self_user = DataManager.SelfUser
 end
 
 function M.HandCardSortAndJing(a, b)

lua_probject/main_project/main/majiang/MJCheckG.lua

@@ -0,0 +1,42 @@
+-- local EXMainView = import(".EXMainView")
+
+local MJCheckG = {
+}
+local M = MJCheckG
+function MJCheckG.new()
+    setmetatable(M, { __index = BaseWindow })
+    -- setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = 'MJCheckG'
+    self._currenIndex = 0
+    self._close_destroy = true
+    self:init('ui://Common/comp_checkG')
+
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    self._view:GetChild('btn_ok').onClick:Set(function()
+        self:Destroy()
+    end)
+
+    self.valueTemp = 0
+    self.silder = self._view:GetChild('slider_check')
+    local showText = self._view:GetChild('n3')
+
+    self.coroutine = coroutine.start(function(...)
+        self.valueTemp = 0
+        while self.valueTemp < 100 do
+            self.valueTemp = self.valueTemp + math.random(4)
+            self.silder.value = self.valueTemp
+            coroutine.wait(0.1)
+        end
+        showText.text = "检测完成，没有外挂痕迹"
+        coroutine.wait(2)
+        self:Destroy()
+    end)
+end
+
+return M

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -3,6 +3,7 @@ local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
 local TableBG = require("Game.Data.TableBG")
 local MJSettingView = import(".MJSettingViewNew")
 local MJMainRightPanelView = import(".MJMainRightPanelView")
+local MJCheckG = import('.MJCheckG')
 
 local bg_config = {
     { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
@@ -142,6 +143,14 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
         end)
     end
 
+    local checkG = self._view:GetChild('btn_check')
+    if checkG then
+        checkG.onClick:Set(function()
+            local checkG = MJCheckG.new()
+            checkG:Show()
+        end)
+    end
+
     self:InitXiPai()
     self:InitXiPai1()
 end

wb_new_ui/assets/FGAssist/invite/panel_invited.xml

@@ -8,26 +8,27 @@
     <component id="n1_cioe" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="962,0" controller="style,0">
       <relation target="" sidePair="right-right"/>
     </component>
-    <text id="n19_cioe" name="tex_left_time" xy="472,561" pivot="0.5,0.5" anchor="true" size="46,38" fontSize="30" color="#ff0000" singleLine="true" autoClearText="true" text="15s"/>
+    <text id="n19_cioe" name="tex_left_time" xy="472,561" pivot="0.5,0.5" anchor="true" size="53,42" fontSize="30" color="#ff0000" singleLine="true" autoClearText="true" text="15s"/>
     <component id="n20_cioe" name="btn_no" src="cioeho4" fileName="invite/component/invite/btn_invite_action.xml" xy="130,510" size="301,105" group="n22_cioe"/>
     <component id="n21_cioe" name="btn_yes" src="cioeho4" fileName="invite/component/invite/btn_invite_action.xml" xy="586,510" size="293,98" group="n22_cioe">
       <Button icon="ui://vplxondscioeho2"/>
     </component>
-    <group id="n22_cioe" name="n22" xy="130,510" size="749,105" collapsed="true"/>
+    <group id="n22_cioe" name="n22" xy="130,510" size="749,105"/>
     <component id="n23_pxf0" name="btn_refuse" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="403,405" size="388,47">
       <Button title="5分钟之内不再接受邀请"/>
     </component>
-    <text id="n15_cioe" name="n15" xy="311,323" size="155,38" group="n24_p747" fontSize="30" color="#663300" text="游戏类型："/>
+    <text id="n15_cioe" name="n15" xy="311,323" size="154,42" group="n24_p747" fontSize="30" color="#663300" text="游戏类型："/>
-    <text id="n18_cioe" name="tex_game_name" xy="512,323" size="125,38" group="n24_p747" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="长沙麻将"/>
+    <text id="n18_cioe" name="tex_game_name" xy="512,323" size="124,42" group="n24_p747" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="长沙麻将"/>
-    <group id="n24_p747" name="n24" xy="311,323" size="326,38" collapsed="true"/>
+    <group id="n24_p747" name="n24" xy="311,323" size="326,38"/>
-    <text id="n14_cioe" name="n14" xy="311,264" size="155,38" group="n25_p747" fontSize="30" color="#663300" text="包间名称："/>
+    <text id="n14_cioe" name="n14" xy="311,264" size="154,42" group="n25_p747" fontSize="30" color="#663300" text="包间名称："/>
-    <text id="n16_cioe" name="tex_play_name" xy="512,264" size="50,38" group="n25_p747" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="233"/>
+    <text id="n16_cioe" name="tex_play_name" xy="512,264" size="55,42" group="n25_p747" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="233"/>
-    <group id="n25_p747" name="n25" xy="311,264" size="251,38" collapsed="true"/>
+    <group id="n25_p747" name="n25" xy="311,264" size="251,38"/>
-    <text id="n9_cioe" name="n9" xy="339,186" size="125,38" group="n26_p747" fontSize="30" color="#663300" text="邀请人："/>
+    <text id="n9_cioe" name="n9" xy="339,186" size="124,42" group="n26_p747" fontSize="30" color="#663300" text="邀请人："/>
     <component id="n10_cioe" name="btn_head" src="do2f1z" fileName="component/head/Head2.xml" pkg="27vd145b" xy="526,204" pivot="0.5,0.5" anchor="true" group="n13_cioe"/>
-    <text id="n11_cioe" name="tex_name" xy="601,164" size="125,38" group="n13_cioe" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="玩家名字"/>
+    <text id="n11_cioe" name="tex_name" xy="601,164" size="124,42" group="n13_cioe" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="玩家名字"/>
-    <text id="n12_cioe" name="tex_id" xy="601,209" size="132,38" group="n13_cioe" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="iD:123456"/>
+    <text id="n12_cioe" name="tex_id" xy="601,209" size="143,42" group="n13_cioe" fontSize="30" color="#663300" singleLine="true" autoClearText="true" text="iD:123456"/>
     <group id="n13_cioe" name="n13" xy="484,162" size="249,85" group="n26_p747" advanced="true"/>
-    <group id="n26_p747" name="n26" xy="339,162" size="394,85" collapsed="true"/>
+    <group id="n26_p747" name="n26" xy="339,162" size="394,85"/>
+    <loader3D id="n27_sx7x" name="n27" xy="229,-497" size="1053,1042" url="ui://htcn7v3rsx7x7cyw" animation="" skin="" loop="true"/>
   </displayList>
 </component>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n3_sx7x" name="n3" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#73000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button/>
+</component>

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

@@ -2,7 +2,7 @@
 <component size="435,435">
   <displayList>
     <image id="n1_kzuz" name="n1" src="kzuz14d" fileName="Main_new/Main/Image/Group 541.png" xy="0,0"/>
-    <list id="n2_kzuz" name="list_players" xy="13,12" size="422,428" overflow="scroll" defaultItem="ui://v0j9abjykzuz14e">
+    <list id="n2_kzuz" name="list_players" xy="13,12" size="422,428" overflow="scroll" defaultItem="ui://v0j9abjykzuz14e" autoClearItems="true">
       <item/>
       <item/>
     </list>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -43,11 +43,11 @@
       <gearXY controller="site" pages="2,0,1" values="-47,-46|-37,-57|150,0"/>
       <relation target="" sidePair="center-center,top-top"/>
     </text>
-    <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="78,11" size="197,103" alpha="0" touchable="false"/>
+    <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="78,31" size="198,67" alpha="0" touchable="false"/>
     <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/Face3.xml" xy="0,0" alpha="0" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n38_tla5" name="n38" src="gq7m5w" fileName="images/game_icon_07.png" xy="-20,-89">
+    <image id="n38_tla5" name="n38" src="sx7x14g" fileName="Main_new/Main/Image/gamechatback1.png" xy="80,31" scale="1.3,1.3">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
     <component id="n18" name="mask_voice" src="gq7m61" fileName="component/VoiceMask(1).xml" xy="31,-64" touchable="false">

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

@@ -38,7 +38,7 @@
       <gearXY controller="site" pages="2,0,1" values="136,18|-33,-57|154,0"/>
       <relation target="" sidePair="left-left,bottom-middle"/>
     </text>
-    <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="-65,105" size="197,103" alpha="0" touchable="false"/>
+    <component id="n31_e54q" name="chat" src="gq7m76" fileName="component/MsgBubble1.xml" 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"/>
     <image id="n38_tla5" name="n38" src="gq7m5w" fileName="images/game_icon_07.png" xy="-20,-89">
       <gearDisplay controller="mask_voice" pages="1"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -7,47 +7,27 @@
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
   <controller name="more" pages="0,,1," selected="0"/>
+  <controller name="witness" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
-      <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="1" values="71,784" default="1188,897"/>
-      <gearSize controller="state" default="144,144,1,1"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="737,916" size="144,144">
-      <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="1,3,4" values="71,784|71,784|69,774" default="737,916"/>
-      <relation target="n118_pkx5" sidePair="right-left,top-top"/>
-    </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,274" size="144,144">
-      <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
-      <relation target="" sidePair="center-center,top-top"/>
-    </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2031,519" size="108,108">
-      <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="0,1,3,4" values="2031,519|1885,27|1885,27|1897,43" default="1337,909"/>
-      <relation target="n155_gi99" sidePair="left-right,top-top"/>
-    </component>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
     </component>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="357,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
+    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="356,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
-    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-383,-885" group="n90_8sat"/>
+    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-384,-885" group="n90_8sat"/>
-    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2099,-382" size="110,75" group="n90_8sat" scale="2,2">
+    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2098,-382" size="110,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2926,-501" size="58,75" group="n90_8sat" scale="2,2">
+    <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2925,-501" size="58,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="-121,-887" group="n90_8sat">
+    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="-122,-887" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="-383,-1170" size="3367,863" advanced="true">
+    <group id="n90_8sat" name="n90" xy="-384,-1170" size="3367,863" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1985,-344" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1984,-344" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
@@ -147,6 +127,27 @@
     <group id="n179_eqmd" name="center_text" xy="418,469" size="1696,186" advanced="true">
       <relation target="" sidePair="center-center,right-right"/>
     </group>
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
+      <gearDisplay controller="state" pages="0,2"/>
+      <gearXY controller="state" pages="1" values="71,784" default="1188,897"/>
+      <gearSize controller="state" default="144,144,1,1"/>
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </component>
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="737,916" size="144,144">
+      <gearDisplay controller="state" pages="1,3,4"/>
+      <gearXY controller="state" pages="1,3,4" values="71,784|71,784|69,774" default="737,916"/>
+      <relation target="n118_pkx5" sidePair="right-left,top-top"/>
+    </component>
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,274" size="144,144">
+      <gearDisplay controller="state" pages="0,2"/>
+      <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
+      <relation target="" sidePair="center-center,top-top"/>
+    </component>
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2031,519" size="108,108">
+      <gearDisplay controller="state" pages="1,3,4"/>
+      <gearXY controller="state" pages="0,1,3,4" values="2031,519|1885,27|1885,27|1897,43" default="1337,909"/>
+      <relation target="n155_gi99" sidePair="left-right,top-top"/>
+    </component>
     <text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" visible="false" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
     <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1136,375" group="n169_gmbn">
       <gearDisplay controller="state" pages="1,3,4"/>
@@ -239,6 +240,14 @@
       <gearDisplay controller="state" pages="0"/>
       <Button icon="ui://v0j9abjykzuz14a"/>
     </component>
-    <component id="n185_kzuz" name="n185" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2097,30"/>
+    <component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
+      <gearDisplay controller="witness" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+      <Button controller="witness" page="0"/>
+    </component>
+    <component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2097,30">
+      <gearDisplay controller="witness" pages="1"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/MsgBubble1.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="216,103" extention="Label">
+<component size="216,67" extention="Label">
   <displayList>
-    <image id="n0" name="back" src="gq7m5w" xy="2,0" pivot="1,0" size="201,122">
+    <image id="n0" name="back" src="gq7m5w" fileName="images/game_icon_07.png" xy="2,0" pivot="1,0" size="201,67">
       <relation target="n3" sidePair="width-width"/>
     </image>
-    <text id="n3" name="title" xy="31,26" pivot="1,0" size="124,38" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="你太牛了"/>
+    <text id="n3" name="title" xy="31,12" pivot="1,0" size="124,42" fontSize="30" color="#9a5f34" align="center" vAlign="middle" text="你太牛了"/>
   </displayList>
   <relation target="n3" sidePair="width-width"/>
   <transition name="t0">

wb_new_ui/assets/Main_Majiang/component/MsgBubble2.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="198,103" extention="Label">
+<component size="198,67" extention="Label">
   <displayList>
-    <image id="n0" name="back" src="gq7m5w" xy="0,0" pivot="1,0" anchor="true" size="194,122" scale="-1,1">
+    <image id="n0" name="back" src="gq7m5w" fileName="images/game_icon_07.png" xy="0,-1" pivot="1,0" anchor="true" size="165,67" scale="-1,1">
       <relation target="n3" sidePair="width-width"/>
     </image>
-    <text id="n3" name="title" xy="47,27" size="125,38" fontSize="30" color="#ffffff" text="你太牛了"/>
+    <text id="n3" name="title" xy="25,12" size="124,42" fontSize="30" color="#9a5f34" text="你太牛了"/>
   </displayList>
   <relation target="n3" sidePair="width-width"/>
   <transition name="t0">

wb_new_ui/assets/Main_Majiang/package.xml

@@ -213,7 +213,7 @@
     <image id="gq7m5t" name="z02.png" path="/images/" exported="true"/>
     <image id="gq7m5u" name="z01.png" path="/images/" exported="true"/>
     <component id="gq7m5v" name="MsgBubble3.xml" path="/component/" exported="true"/>
-    <image id="gq7m5w" name="game_icon_07.png" path="/images/" exported="true" scale="9grid" scale9grid="44,0,67,122"/>
+    <image id="gq7m5w" name="game_icon_07.png" path="/images/" exported="true" scale="9grid" scale9grid="19,6,44,36"/>
     <component id="gq7m5x" name="Face3.xml" path="/component/" exported="true"/>
     <image id="gq7m5y" name="game_fonts_01.png" path="/font/images/game/" exported="true"/>
     <component id="gq7m5z" name="HeadNameBG.xml" path="/Main_style_2/"/>
@@ -1220,6 +1220,9 @@
     <image id="kzuz14c" name="Group 241(1).png" path="/Main_new/Main/Image/"/>
     <image id="kzuz14d" name="Group 541.png" path="/Main_new/Main/Image/"/>
     <component id="kzuz14e" name="comp_witnessPlayer.xml" path="/Main_new/Main/Component/"/>
+    <component id="sx7x14f" name="btn_bg.xml" path="/Main_new/Main/Component/"/>
+    <image id="sx7x14g" name="gamechatback1.png" path="/Main_new/Main/Image/" scale="9grid" scale9grid="22,13,46,31"/>
+    <image id="sx7x14h" name="gamechatback2.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>