江西同步

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

@@ -101,6 +101,7 @@ function M:init(url)
 				contentPane:AddRelation(self._root_view, RelationType.Right_Right)
 				self._view.x = GRoot.inst.width - self._view.width - offset
 			end
+			print("lingmeng", PopPanel.height, self._view.height)
 			self._view.y = (PopPanel.height - self._view.height) * 0.5
 			click_item.xy = self._view.xy
 			click_item.width = self._view.width

lua_probject/base_project/Game/View/FGAssistView.lua

@@ -11,7 +11,7 @@ function FGAssistView.new(blur_view, group_id, callback)
     self.class = "FGAssistView"
     self._blur_view = blur_view
     self._full = true
-    self._anim_pop = 1
+    self._anim_pop = 2
     self._animation = true
     self.group_id = group_id
 
@@ -30,6 +30,16 @@ end
 function M:init(url)
     BaseWindow.init(self, url)
     self.lst_player = self._view:GetChild("lst_player")
+    self.lst_player:SetVirtual()
+    self.lst_player.itemRenderer = function(index, obj)
+        self:PlayerRenderer(index, obj)
+    end
+    self.lst_player.scrollPane.onPullUpRelease:Set(
+        function()
+            self:GetOnlinePlayers(self.lst_player.numItems)
+        end
+    )
+
     local btn_refresh = self._view:GetChild("btn_refresh")
     btn_refresh.onClick:Set(function()
         self:ReloadView()
@@ -48,6 +58,22 @@ function M:FillData()
     -- end
 end
 
+function M:PlayerRenderer(index, obj)
+    local i = index + 1
+    obj:GetChild('tex_name').text = self._data_number[i].nick
+    local btn_invite = obj:GetChild('btn_invite')
+    btn_invite:GetController('online').selectedIndex = self._data_number[i].uid ==
+        DataManager.SelfUser.account_id and 0 or self._data_number[i].online
+    obj:GetController('type').selectedIndex = self._data_number[i].online
+    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(),
+            function()
+            end)
+    end)
+end
+
 -- function M:GetOnlinePlayers()
 --     local mgr_ctr = ControllerManager.GetController(GroupMgrController)
 --     mgr_ctr:FG_GetOnlinePlayers(function(res)
@@ -60,12 +86,32 @@ end
 --         end
 --     end)
 -- end
-function M:GetOnlinePlayers()
+function M:GetOnlinePlayers(index)
+    index = index or 0
     print("lingmeng GetOnlinePlayers", self.group_id)
-    pt(DataManager.groups)
+    local group = DataManager.groups:get(self.group_id)
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GroupMembers12(self.group_id, 0, 10, 2, 2, function(res)
+    if not group then
+        fgCtr:FG_GroupList(function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
+            end
         end)
+    end
+    if #group.members == 0 or index ~= 0 then
+        fgCtr:FG_GroupMembers12(self.group_id, 0, index + 10, 2, 2, function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
+            else
+                self._data_number = group.members
+                self.lst_player.numItems = #group.members
+            end
+        end)
+    else
+        self._data_number = group.members
+        self.lst_player.numItems = #group.members
+    end
+    pt(self._data_number)
 end
 
 local function _showLeftTime(item, time)
@@ -127,28 +173,28 @@ function M:ShowOnlinePlayers()
 end
 
 function M:OnUpdate()
-    local deltaTime = Time.deltaTime
-    self._timer = self._timer + deltaTime
-    if self._timer >= 1 then
-        self._timer = 0
+    -- local deltaTime = Time.deltaTime
+    -- self._timer = self._timer + deltaTime
+    -- if self._timer >= 1 then
+    --     self._timer = 0
 
-        if self.lst_player.numChildren == 0 then return end
-        for i = 1, #self.players do
-            local p = self.players[i]
-            local invite_time = _list_invite_time[p.uid]
-            if invite_time then
-                local i_timer = os.time() - invite_time
-                local item = self.lst_player:GetChildAt(i - 1)
-                if not item then break end
-                if i_timer < 15 then
-                    _showLeftTime(item, 15 - i_timer)
-                else
-                    item:GetController("enable").selectedIndex = 0
-                    _list_invite_time[p.uid] = nil
-                end
-            end
-        end
-    end
+    --     if self.lst_player.numChildren == 0 then return end
+    --     for i = 1, #self.players do
+    --         local p = self.players[i]
+    --         local invite_time = _list_invite_time[p.uid]
+    --         if invite_time then
+    --             local i_timer = os.time() - invite_time
+    --             local item = self.lst_player:GetChildAt(i - 1)
+    --             if not item then break end
+    --             if i_timer < 15 then
+    --                 _showLeftTime(item, 15 - i_timer)
+    --             else
+    --                 item:GetController("enable").selectedIndex = 0
+    --                 _list_invite_time[p.uid] = nil
+    --             end
+    --         end
+    --     end
+    -- end
 end
 
 function M:Close()

lua_probject/base_project/Game/View/MainView.lua

@@ -470,12 +470,10 @@ function M:InitView(url, isHideIpAdds)
     -------------------------lingmeng---------------------------
     _view:GetChild('text_roomId').text = string.format("房间:%s", self._room.room_id)
 
-    local btn_invite = self._view:GetChild('btn_invite')
-    if btn_invite then
-        print("lingmeng init FGAssist", self._room.group_id)
-        pt(DataManager.groups)
+    local btn_inviteFamily = self._view:GetChild('btn_inviteFamily')
+    if btn_inviteFamily then
         UIPackage.AddPackage('base/newgroup/ui/FGAssist')
-        btn_invite.onClick:Set(function()
+        btn_inviteFamily.onClick:Set(function()
             local panel_assist = FGAssistView.new(self._root_view, self._room.group_id, function()
                 print("lingmeng assistcallback")
             end)

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

@@ -668,14 +668,15 @@ function M:__FangziTip(tip, weight)
         if index == tip.tip_num then
             type.selectedIndex = 0
             obj.onClick:Set(function()
-                --测试暂时取消过提示
-                -- local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
-                -- guo_msg.onOk:Add(function()
-                _gamectr:SendAction(0)
                 _ctr_tips.selectedIndex = 0
-                --     guo_msg:Close()
-                -- end)
-                -- guo_msg:Show()
+                if tip.is_hu then
+                    info._ctr_showGuoHu.selectedIndex = 1
+                    info._viewBtn_guoHu.onClick:Set(function()
+                        _gamectr:SendAction(0)
+                    end)
+                else
+                    _gamectr:SendAction(0)
+                end
             end)
         else
             index = index + 1

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

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

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

@@ -199,7 +199,6 @@ function M:FillWitnessData(pd_data)
     room.banker_seat = bank_seat
     room.curren_turn_seat = active_seat
     room.curren_round = _tableInfo["round"]
-
     local _info_list = _tableInfo["playerData"]
     for i = 1, #_info_list do
         local _jp = _info_list[i]
@@ -247,6 +246,7 @@ function M:FillWitnessData(pd_data)
 
         room:AddPlayer(p)
     end
+    room.self_player.self_user = DataManager.SelfUser
 end
 
 function M.HandCardSortAndJing(a, b)

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

@@ -1,113 +1,110 @@
-
-
-
 ---
 local M = {}
 
 
 --- Create a new RoomConfig
 function M.new(config)
-	setmetatable(M,{__index = RoomConfig})
-	local self = setmetatable({}, {__index = M})
-	RoomConfig.init(self,config)
-	self.config=config
+	setmetatable(M, { __index = RoomConfig })
+	local self = setmetatable({}, { __index = M })
+	RoomConfig.init(self, config)
+	self.config = config
 	self.class = "RoomConfig"
 	self.round = config["times"]
 	self.maxPlayers = config["maxPlayers"]
 	self.fengding = config["fengding"]
 	self.wanfa = config["wanfa"]
-	self.qiduijiafan=config["qiduijiafan"]
-	self.shoudailongjiafan=config["shoudailongjiafan"]
-	self.loudilongjiafan=config["loudilongjiafan"]
-	self.bunengchi=config["bunengchi"]
+	self.qiduijiafan = config["qiduijiafan"]
+	self.shoudailongjiafan = config["shoudailongjiafan"]
+	self.loudilongjiafan = config["loudilongjiafan"]
+	self.bunengchi = config["bunengchi"]
 
 	return self
 end
 
 function M:GetDes(sp)
 	sp = sp or "                    "
-	local count=0			
+	local count = 0
 	local str = self.round and self.round .. "局" .. "                                      " or ""
-	str = str .. RoomConfig.GetDes(self, sp).."\n"
+	str = str .. RoomConfig.GetDes(self, sp) .. "\n"
 
 
 	if (self.fengding) then
 		str = str .. "封顶"
-		count=count+1
-		if count%2==0 then
-			str = str .."\n"
+		count = count + 1
+		if count % 2 == 0 then
+			str = str .. "\n"
 		else
-			sp1=""
-			local strL=2
-			for i=1,strL do
-				sp1=sp1.."    "
+			sp1 = ""
+			local strL = 2
+			for i = 1, strL do
+				sp1 = sp1 .. "    "
 			end
-			str = str .. sp1..sp
+			str = str .. sp1 .. sp
 		end
 	end
 
 	if (self.qiduijiafan) then
-		local strL=2
-		str = str .."可胡七对"
+		local strL = 2
+		str = str .. "可胡七对"
 		if self.qiduijiafan then
-			str = str .."翻倍"
-			strL=0
+			str = str .. "翻倍"
+			strL = 0
 		end
-		count=count+1
-		if count%2==0 then
-			str = str .."\n"
+		count = count + 1
+		if count % 2 == 0 then
+			str = str .. "\n"
 		else
-			sp1=""
-			for i=1,strL do
-				sp1=sp1.."    "
+			sp1 = ""
+			for i = 1, strL do
+				sp1 = sp1 .. "    "
 			end
-			str = str .. sp1..sp
+			str = str .. sp1 .. sp
 		end
 	end
 
 
 	if self.shoudailongjiafan then
-		str = str .."手逮龙加番"
-		count=count+1
-			if count%2==0 then
-				str = str .."\n"
+		str = str .. "手逮龙加番"
+		count = count + 1
+		if count % 2 == 0 then
+			str = str .. "\n"
 		else
-				sp1=""
-				local strL=2
-				for i=1,strL do
-					sp1=sp1.."    "
+			sp1 = ""
+			local strL = 2
+			for i = 1, strL do
+				sp1 = sp1 .. "    "
 			end
-				str = str .. sp1..sp
+			str = str .. sp1 .. sp
 		end
 	end
 
 	if self.loudilongjiafan then
-		str = str .."落地龙"
-		count=count+1
-			if count%2==0 then
-				str = str .."\n"
+		str = str .. "落地龙"
+		count = count + 1
+		if count % 2 == 0 then
+			str = str .. "\n"
 		else
-				sp1=""
-				local strL=3
-				for i=1,strL do
-					sp1=sp1.."    "
+			sp1 = ""
+			local strL = 3
+			for i = 1, strL do
+				sp1 = sp1 .. "    "
 			end
-				str = str .. sp1..sp
+			str = str .. sp1 .. sp
 		end
 	end
 
 	if self.bunengchi then
-		str = str .."不能吃"
-		count=count+1
-			if count%2==0 then
-				str = str .."\n"
+		str = str .. "不能吃"
+		count = count + 1
+		if count % 2 == 0 then
+			str = str .. "\n"
 		else
-				sp1=""
-				local strL=3
-				for i=1,strL do
-					sp1=sp1.."    "
+			sp1 = ""
+			local strL = 3
+			for i = 1, strL do
+				sp1 = sp1 .. "    "
 			end
-				str = str .. sp1..sp
+			str = str .. sp1 .. sp
 		end
 	end
 
@@ -116,7 +113,6 @@ function M:GetDes(sp)
 	return str
 end
 
-
 function M:GetDes2(sp)
 	sp = sp or "  "
 	local str = RoomConfig.GetDes(self, sp)
@@ -127,9 +123,9 @@ function M:GetDes2(sp)
 
 
 	if (self.qiduijiafan) then
-		str = str .."可胡七对"
+		str = str .. "可胡七对"
 		if self.qiduijiafan then
-			str = str .."-翻倍"
+			str = str .. "-翻倍"
 		end
 		str = str .. sp
 	end
@@ -140,20 +136,17 @@ function M:GetDes2(sp)
 	return str
 end
 
-
 function M:GetGameJS()
-	local gamerulepanel= UIPackage.CreateObjectFromURL("ui://Extend_MJ_NanCheng/gamerule")
+	local gamerulepanel = UIPackage.CreateObjectFromURL("ui://Extend_MJ_NanCheng/gamerule")
 	return gamerulepanel
 end
 
-
 function M:GetGameSMSize()
-  return 467,500
+	return 467, 500
 end
 
-
 function M:GetGameName()
-  return "个旧麻将"
+	return "南城麻将"
 end
 
 return M

lua_probject/extend_project/extend/zipai/fulushou/main/FZData.lua

@@ -9,23 +9,23 @@ RB_FZTypeFLS =
 
     Chi = 1,
     Peng = 2,
-	Gang=3,
-	SGang=4,
-	Zhao=5,
-	SZhao=6,
+    Gang = 3,
+    SGang = 4,
+    Zhao = 5,
+    SZhao = 6,
     HU = 7,
 }
 
 local FZTipList = {
     tip_map_id = nil,
-    tip_map_type = nil
+    tip_map_type = nil,
 }
 
 local M = FZTipList
 
 function M.new()
     local self = {}
-    setmetatable(self,{__index = FZTipList})
+    setmetatable(self, { __index = FZTipList })
     self.tip_map_id = {}
     self.tip_map_type = {}
     return self
@@ -38,7 +38,7 @@ function M:AddTip(tip)
         tiplist = {}
         self.tip_map_type[tip.weight] = tiplist
     end
-    tiplist[#tiplist+1] = tip
+    tiplist[#tiplist + 1] = tip
 end
 
 return M

lua_probject/main_project/main/majiang/FZData.lua

@@ -44,7 +44,8 @@ FZType =
 
 local FZTipList = {
     tip_map_id = nil,
-    tip_map_type = nil
+    tip_map_type = nil,
+    is_hu = false
 }
 
 local M = FZTipList
@@ -55,11 +56,15 @@ function M.new()
     self.tip_map_id = {}
     self.tip_map_type = {}
     self.tip_num = 0
+    self.is_hu = false
     return self
 end
 
 function M:AddTip(tip)
     self.tip_map_id[tip.id] = tip
+    if not self.is_hu then
+        self.is_hu = tip.type == FZType.HU
+    end
     local tiplist = self.tip_map_type[tip.weight]
     if not tiplist then
         tiplist = {}

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -40,15 +40,23 @@ function M:init()
     self._view_getCard = self._view:GetChild('Btn_HandCard')
     self._view_FZTips = self._view:GetChild('Comp_FZTips')
     self._area_allDown = self._view:GetChild('area_allDown')
+    self._viewBtn_guoHu = self._view:GetChild('btn_guohu')
+    self._viewBtn_buGuoHu = self._view:GetChild('btn_buguohu')
+
 
     self._ctr_seletedGet = self._view:GetController('seletedGetCard')
     self._ctr_tip = self._view:GetController('tip')
+    self._ctr_showGuoHu = self._view:GetController('showGuoHu')
 
     self._area_allDown.onClick:Set(function()
         self._view_handCardList.selectedIndex = -1
         self._click_index = self._view_handCardList.selectedIndex
         self._ctr_seletedGet.selectedIndex = 1
     end)
+
+    self._viewBtn_buGuoHu.onClick:Set(function()
+        self._ctr_tip.selectedIndex = 1
+    end)
 end
 
 function M:ShowHuTip(card_list)

wb_new_ui/assets/Common/PopPanel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" opaque="false" initName="PopPanel">
+<component size="2532,1170" opaque="false" initName="PopPanel">
   <displayList>
     <graph id="n0_hznk" name="click_item" xy="1041,183" size="295,278" alpha="0" type="rect"/>
   </displayList>

wb_new_ui/assets/Common/UIPanel.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" opaque="false">
   <displayList>
-    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="1334,750" visible="false"/>
+    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="1334,750" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
   <transition name="left_pop">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>
     <item time="0" type="XY" target="n1_hznk" tween="true" startValue="-1400,0" endValue="0,0" duration="6"/>
-    <item time="6" type="XY" target="n1_hznk" tween="true" startValue="0,0"/>
+    <item time="6" type="XY" target="n1_hznk" value="0,0"/>
   </transition>
   <transition name="right_pop">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>
     <item time="0" type="XY" target="n1_hznk" tween="true" startValue="1400,0" endValue="0,0" duration="6"/>
-    <item time="6" type="XY" target="n1_hznk" tween="true" startValue="0,0"/>
+    <item time="6" type="XY" target="n1_hznk" value="0,0"/>
   </transition>
   <transition name="left_pop_back">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>

wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,90" extention="Button">
-  <controller name="online" pages="0,,1," selected="0"/>
+  <controller name="online" pages="0,,1,,3," selected="2"/>
   <displayList>
     <image id="n1_kzuz" name="n1" src="kzuzhod" fileName="invite/image/invite/Group 347.png" xy="0,0">
       <gearDisplay controller="online" pages="1"/>
     </image>
     <image id="n2_kzuz" name="n2" src="kzuzhoe" fileName="invite/image/invite/Group 348.png" xy="0,0">
-      <gearDisplay controller="online" pages="0"/>
+      <gearDisplay controller="online" pages="0,3"/>
     </image>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>

wb_new_ui/assets/FGAssist/invite/component/invite/item_invite.xml

@@ -7,8 +7,9 @@
     <component id="n2_cioe" name="btn_head" src="kzuzhof" fileName="invite/component/invite/btn_head.xml" xy="6,6"/>
     <text id="n3_cioe" name="tex_name" xy="153,36" size="161,49" fontSize="36" color="#444444" vAlign="middle" autoSize="shrink" text="ddddddd"/>
     <text id="n4_cioe" name="tex_id" xy="98,49" size="161,34" visible="false" fontSize="30" color="#5c3c16" vAlign="middle" autoSize="shrink" text="ID:123456"/>
-    <component id="n8_cioe" name="btn_invite" src="cioehnc" fileName="invite/component/invite/btn_invite.xml" xy="513,27">
+    <component id="n8_cioe" name="btn_invite" src="cioehnc" fileName="invite/component/invite/btn_invite.xml" xy="513,27" touchable="false">
       <gearDisplay controller="enable" pages="0"/>
+      <gearLook controller="type" pages="0,2" values="1,0,0,0|1,0,0,0" default="1,0,0,1"/>
     </component>
     <image id="n9_pxf0" name="n9" src="pxf0ho7" fileName="invite/image/invite/yqhs.png" xy="406,21" size="70,52" group="n11_pxf0" visible="false"/>
     <text id="n10_pxf0" name="tex_left_time" xy="421,31" size="39,32" group="n11_pxf0" fontSize="22" color="#ffffff" text="15s"/>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="104,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_kzuz" name="n0" src="kzuz140" fileName="Main_new/Main/Image/opt_hu_no_nor.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_kzuz" name="n1" src="kzuz141" fileName="Main_new/Main/Image/opt_hu_no_sec.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="104,56" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_kzuz" src="kzuz143" name="n0" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <image id="n1_kzuz" src="kzuz144" name="n1" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="411,138">
+  <controller name="lev" pages="0,,1," selected="0"/>
+  <displayList>
+    <component id="n0_kzuz" name="btn_head" src="pkx5sz" fileName="Main_new/Main/Component/btn_head.xml" xy="24,24" size="96,96" aspect="true"/>
+    <text id="n1_kzuz" name="text_name" xy="144,27" size="265,42" fontSize="30" color="#444444" autoSize="shrink" text="微型姓名"/>
+    <component id="n2_kzuz" name="btn_tick" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="144,77" size="117,47">
+      <gearDisplay controller="lev" pages="1"/>
+      <Button icon="ui://v0j9abjykzuz14c"/>
+    </component>
+  </displayList>
+</component>

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

@@ -6,6 +6,7 @@
   <controller name="getCard" 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="1"/>
   <displayList>
     <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
       <gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@@ -86,5 +87,15 @@
     <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="-325,-170">
       <gearDisplay controller="tip" pages="1"/>
     </component>
+    <image id="n41_kzuz" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="413,-137" 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="2204,-87" 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="1883,-89" size="200,107" group="n48_kzuz" aspect="true">
+      <Button controller="showGuoHu" page="0"/>
+    </component>
+    <group id="n48_kzuz" name="showGuoHu" xy="413,-137" 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

@@ -235,5 +235,10 @@
     <text id="n181_kw9h" name="n181" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
       <gearDisplay controller="state" pages="4"/>
     </text>
+    <component id="n183_kzuz" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2409,213" size="123,252">
+      <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"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1130,18 +1130,18 @@
     <image id="k0pa11r" name="b201_403.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa11s" name="b201_402.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa11t" name="b201_401.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11u" name="b201_309.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11v" name="b201_308.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11w" name="b201_307.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11x" name="b201_306.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11y" name="b201_305.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa11z" name="b201_304.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa120" name="b201_303.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa121" name="b201_302.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa122" name="b201_301.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa123" name="b201_209.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa124" name="b201_208.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa125" name="b201_207.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11u" name="b201_209.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11v" name="b201_208.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11w" name="b201_207.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11x" name="b201_206.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11y" name="b201_205.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa11z" name="b201_204.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa120" name="b201_203.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa121" name="b201_202.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa122" name="b201_201.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa123" name="b201_309.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa124" name="b201_308.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa125" name="b201_307.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa126" name="b201_102.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa127" name="b201_103.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa128" name="b201_104.png" path="/images/cards3/1/" exported="true"/>
@@ -1150,12 +1150,12 @@
     <image id="k0pa12b" name="b201_107.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa12c" name="b201_502.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa12d" name="b201_108.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12e" name="b201_201.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12f" name="b201_202.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12g" name="b201_203.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12h" name="b201_204.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12i" name="b201_205.png" path="/images/cards3/1/" exported="true"/>
-    <image id="k0pa12j" name="b201_206.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12e" name="b201_301.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12f" name="b201_302.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12g" name="b201_303.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12h" name="b201_304.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12i" name="b201_305.png" path="/images/cards3/1/" exported="true"/>
+    <image id="k0pa12j" name="b201_306.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa12k" name="b201_109.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa12l" name="b201_503.png" path="/images/cards3/1/" exported="true"/>
     <image id="k0pa12m" name="b202_101.png" path="/images/cards3/2/" exported="true"/>
@@ -1208,6 +1208,18 @@
     <component id="inqx13x" name="Player_card_info_2_2.xml" path="/Main_new/Main_new_2/"/>
     <component id="o8k813y" name="PlayerHead2_2.xml" path="/Main_new/Main_new_2/"/>
     <image id="vum113z" name="b201_0.png" path="/images/cards3/" exported="true"/>
+    <image id="kzuz140" name="opt_hu_no_nor.png" path="/Main_new/Main/Image/"/>
+    <image id="kzuz141" name="opt_hu_no_sec.png" path="/Main_new/Main/Image/"/>
+    <image id="kzuz142" name="opt_hu_tips.png" path="/Main_new/Main/Image/"/>
+    <image id="kzuz143" name="opt_hu_yes_nor.png" path="/Main_new/Main/Image/"/>
+    <image id="kzuz144" name="opt_hu_yes_sec.png" path="/Main_new/Main/Image/"/>
+    <component id="kzuz148" name="btn_guohu.xml" path="/Main_new/Main/Component/"/>
+    <component id="kzuz149" name="btn_buguohu.xml" path="/Main_new/Main/Component/"/>
+    <image id="kzuz14a" name="Group 346.png" path="/Main_new/Main/Image/"/>
+    <component id="kzuz14b" name="comp_witness.xml" path="/Main_new/Main/Component/"/>
+    <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/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>