创建玩法，修改玩法，跳转创建玩法

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -233,6 +233,7 @@ end
 -- 添加玩法
 function M:OnEvtAddPlay(evt_data)
     local group = DataManager.groups:get(self.groupId)
+    evt_data.gameType = ExtendManager.GetGameData(evt_data.gameId).gameType
     group:addPlay(evt_data)
     local pid = evt_data.id
     DispatchEvent(self._dispatcher, GroupMgrEvent.AddPlay, pid)

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -15,7 +15,8 @@ end
 local _LocalConfigAllGame = {
     -- 10, 33,
     -- 90,
-    66,22,90
+    -- 22,
+    66,90
 }
 
 local FilterGame = function(games)

lua_probject/base_project/Game/IGameInfo.lua

@@ -21,10 +21,45 @@ function M:SelectedCardNum()
 end
 
 function M:SelectedConfigData()
-	return {}
+	local data = {}
+	local com_editSetting = self.gl_view:GetModeData().data._config:GetChild("com_editSetting")
+
+    self.cGps = com_editSetting:GetController("cGps")
+    self.cTuoguan = com_editSetting:GetController("cTuoguan")
+	    -- GPS设置
+    local dis = 0
+    if self.cGps.selectedIndex == 0 then
+        dis = 100
+    elseif self.cGps.selectedIndex == 1 then
+        dis = 500
+    elseif self.cGps.selectedIndex == 2 then
+        dis = 0
+    end
+    data.GPSDetection = dis
+
+    -- 托管
+    local time = 0
+    if self.cTuoguan.selectedIndex == 1 then
+        time = 30
+    elseif self.cTuoguan.selectedIndex == 2 then
+        time = 60
+    elseif self.cTuoguan.selectedIndex == 3 then
+        time = 120
+    end
+    data.tuoguan_active_time = time
+
+	--其余默认值
+	data.isNonnegative = 1
+	data.hp_no_limit = 0
+	data.tuoguan = true
+	data.tuoguan_active_timeIndex = self.cTuoguan.selectedIndex
+	data.tuoguan_result_type = 1
+
+	return data
 end
 
 function M:FillData()
+
 end
 
 function M:ShowRoomPrice(ctype)
@@ -58,14 +93,6 @@ function M:ShowVariablePrice(ctype)
 			tex_price.text = price
 		end
 	end
-
-	-- 显示房主支付、aa支付的价格，tex_aa/tex_owner
-	-- local tex_aa = self._config:GetChild("tex_aa")
-	-- local tex_owner = self._config:GetChild("tex_owner")
-	-- local opt = self._config:GetController("round").selectedIndex
-	-- local price = self._game_data[string.format("pay%s_%s", opt + 1, self._maxPlayer)]
-	-- tex_aa.text = math.ceil(price / self._maxPlayer)
-	-- tex_owner.text = price
 end
 
 function M:SetDefault()
@@ -126,4 +153,49 @@ function M:LoadConfigOneInfo(data, hpdata, name)
 	return returnString
 end
 
+function M:GetHpData()
+	local hpData = {}
+	-- 通用设置
+	local com_editSetting = self._config:GetChild("com_editSetting")
+
+	local cJiesan = com_editSetting:GetController("cJiesan")
+	local cGongneng = com_editSetting:GetController("cGongneng")
+	local cChat = com_editSetting:GetController("cChat")
+	local cMisslie = com_editSetting:GetController("cMisslie")
+
+	-- 解散
+	hpData.JieShan = cJiesan.selectedIndex + 1
+	-- 功能
+	hpData.GongNeng = cGongneng.selectedIndex + 1
+	-- 开启聊天
+	hpData.BanChat = cChat.selectedIndex
+	-- 开启表情互动
+	hpData.BanMissile = cMisslie.selectedIndex
+
+	--一下是大联盟数据,全部采取默认值
+	hpData.type = 1
+	hpData.rewards_val = 100
+	hpData.anchou_rewards_val = 100
+	hpData.xipai_rewards_val = 100
+	hpData.rewards_type = 1
+	hpData.xipai_rewardType = 3
+	hpData.anchou_rewardType = 3
+	hpData.rewardValueType = 1
+	hpData.anchou_rewardValueType = 1
+	hpData.xipai_rewardValueType = 1
+	hpData.limitPlay = 1000
+	hpData.limitloot = 0
+	hpData.limitInRoom = 0
+	hpData.limitPump = 0
+	hpData.basePump = 0
+	hpData.robot_room = 0
+	hpData.tex_times_room = 1000
+	hpData.times = 1000
+	hpData.rewards_list = {}
+	hpData.rewards_list.cb_proportion = 0
+	hpData.rewards_list.UpperLimit = 0
+	hpData.rewards_list.UpperLimitReward = 0
+	return hpData
+end
+
 return M

lua_probject/base_project/Game/View/FamilyViewZuo.lua

@@ -93,7 +93,7 @@ function M:FamilyTableRenderer(index, obj)
     local roomList = self._group.rooms
     local tmp
     local showDeatilFct = function()
-        
+
     end
     if index < #playList then -- 默认玩法，开桌子之类的
         tmp = playList[index + 1]
@@ -105,8 +105,11 @@ function M:FamilyTableRenderer(index, obj)
             end)
         end
         obj:GetChild('icon').onClick:Set(function(context)
-            self:ClickTableShowDetail(context,{type =1})
+            self:ClickTableShowDetail({ type = 1, info = tmp, index = index })
         end)
+        if self._view:GetController('showPlayDetail').selectedIndex == 1 then
+            self:ClickTableShowDetail({ type = 1, info = tmp, index = index })
+        end
     elseif index - #playList < #roomList then --存在的桌子
         local roomInfo = roomList[index - #playList + 1]
         tmp = self._group:getPlay(roomInfo.pid)
@@ -122,13 +125,16 @@ function M:FamilyTableRenderer(index, obj)
                 btn:GetController('zuo').selectedIndex = 0
                 btn:GetChild("btn_head").icon = "ui://Family/icon_luozuo"
                 btn.onClick:Set(function(context)
-                    self:ClickJoinRoom(context, tmp, roomInfo)
+                    self:ClickJoinRoom(context, roomInfo)
                 end)
             end
         end
         obj:GetChild('icon').onClick:Set(function(context)
-            self:ClickTableShowDetail(context,{type =2,info=roomInfo})
+            self:ClickTableShowDetail({ type = 2, info = roomInfo, index = index })
         end)
+        if self._view:GetController('showPlayDetail').selectedIndex == 1 then
+            self:ClickTableShowDetail({ type = 2, info = roomInfo, index = index })
+        end
     end
     obj:GetController('playerNum').selectedIndex = tmp.maxPlayers - 2
     obj:GetChild('text_playName').text = tmp.name
@@ -209,19 +215,83 @@ function M:ClickMachRoom(context, playinfo)
     )
 end
 
-function M:ClickTableShowDetail(context,data)
+--点击桌子查看信息
+function M:ClickTableShowDetail(data)
     local data = data or {}
     if data.type then
-        if data.type == 1 then
-            
-        elseif data.type == 2 then
+        self._view:GetController('showPlayDetail').selectedIndex = 1
+        local detailView = self._view:GetChild('comp_playDetail')
+        local detailType = detailView:GetController('type')
+        local tableIcon = self._viewList_tableList:GetChildAt(data.index):GetChild('icon')
+        local gxy = tableIcon:LocalToGlobal(Vector2.New(tableIcon.width, tableIcon.height) / 2)
+        detailView.xy = self._view:GlobalToLocal(gxy) - Vector2.New(detailView.width / 2, detailView.height)
+        local playinfo = data.info
 
+        detailView:GetChild('btn_createRoom').onClick:Set(function(context)
+            self:ClickMachRoom(context, data.info)
+        end)
+
+        detailView:GetChild('btn_joinRoom').onClick:Set(function(context)
+            self:ClickJoinRoom(context, data.info)
+        end)
+
+        detailView:GetChild('btn_inviteRoom').onClick:Set(function(context)
+            ViewUtil:ErrorTip("暂时还未联通微信")
+        end)
+
+        detailView:GetChild('btn_delRoom').onClick:Set(function(context)
+            self:JieSanRomm(self._group.id,data.info.id)
+        end)
+
+        if data.type == 1 then
+            detailType.selectedIndex = 0
+        elseif data.type == 2 then
+            local stype = 1
+            if self._group.lev and self._group.lev == 1 then
+                stype = stype + 2
+            end
+            if playinfo.plist and #playinfo.plist > 0 and playinfo.plist[1].aid == DataManager.SelfUser.account_id then
+                stype = stype + 1
+            end
+            playinfo = self._group:getPlay(playinfo.pid)
+            detailType.selectedIndex = stype
         end
+        detailView:GetChild('text_playDetail').text = ExtendManager.GetExtendConfig(playinfo.gameId):GetGameInfo()
+            :LoadConfigToDetail(playinfo.config, playinfo.hpData)
     end
 end
 
+--点击解散房间
+function M:JieSanRomm(groupId, roomId)
+    local _curren_msg =
+        MsgWindow.new(
+            self._root_view,
+            '确定要解散该房间吗？',
+            MsgWindow.MsgMode.OkAndCancel
+        )
+    _curren_msg.onOk:Add(
+        function()
+            ViewUtil.ShowModalWait2(self._root_view)
+            local fgCtr = ControllerManager.GetController(NewGroupController)
+
+            fgCtr:FG_RemoveRoom(
+                groupId,
+                roomId,
+                function(res)
+                    ViewUtil.CloseModalWait2()
+                    if res.ReturnCode ~= 0 then
+                        ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
+                        return
+                    end
+                end
+            )
+        end
+    )
+    _curren_msg:Show()
+end
+
 --点击桌子进入游戏
-function M:ClickJoinRoom(context, playinfo, room)
+function M:ClickJoinRoom(context, room)
     local group = DataManager.CurrenGroup
     local roomCtr = ControllerManager.GetController(RoomController)
     roomCtr:PublicJoinRoom(
@@ -243,7 +313,8 @@ function M:ClickJoinRoom(context, playinfo, room)
             else
                 UpdateBeat:Remove(self.OnUpdate, self)
                 FamilyView.lastId = group.id
-                ViewManager.ChangeView(ViewManager.View_Main, playinfo.gameId, { _flag_showTip = true })
+                ViewManager.ChangeView(ViewManager.View_Main, self._group:getPlay(room.pid).gameId,
+                    { _flag_showTip = true })
                 ViewUtil.CloseModalWait2()
             end
         end,

lua_probject/base_project/Game/View/FamilyZuo/FamilyGamePlay.lua

@@ -0,0 +1,143 @@
+local FamilyGamePlayView = {}
+
+local M = FamilyGamePlayView
+
+function FamilyGamePlayView.new(data, callback)
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = "FamilyGamePlayView"
+    self._data = data or {}
+    self._callback = callback
+    self._close_destroy = true
+    self._full = true
+    self._full_offset = false
+    self:init("ui://Family/FamilyGamePlay")
+    return self
+end
+
+function M:init(url)
+    getmetatable(M).__index.init(self, url)
+
+    local view = self._view
+    self._viewList_left = view:GetChild('list_left')
+    self._viewList_left.itemRenderer = handler(self, self.GameTypeRenderer)
+    self._viewList_left.onClickItem:Set(handler(self, self.GameTypeClick))
+
+    self._viewComp_GameList = view:GetChild('page').component
+    self._viewList_GameList = self._viewComp_GameList:GetChild('list_left')
+    self._viewList_GameList.itemRenderer = handler(self, self.GameListRenderer)
+    self._viewList_GameList.onClickItem:Set(handler(self, self.GameListClick))
+
+    self.orderList = { { name = "麻将", list = {} }, { name = "扑克", list = {} }, { name = "字牌", list = {} } }
+
+    self._viewComp_GameList:GetChild('btn_confirm').onClick:Set(handler(self, self.ClickCreate))
+
+    self:FillData()
+end
+
+--创建玩法大分类--
+function M:GameTypeRenderer(index, obj)
+    local info = self.orderList[index + 1]
+    obj:GetChild('text_down').text = info.name
+    obj:GetChild('text_up').text = info.name
+end
+
+function M:GameTypeClick(context)
+    self._viewList_GameList.numItems = #self.orderList[context.sender.selectedIndex + 1].list
+end
+
+--玩法列表--
+function M:GameListRenderer(index, obj)
+    local info = self.orderList[self._viewList_left.selectedIndex + 1].list[index + 1]
+    obj.text = info.name
+end
+
+function M:GameListClick(context)
+    local info = self.orderList[self._viewList_left.selectedIndex + 1].list[context.sender.selectedIndex + 1]
+    local mode = ExtendManager.GetExtendConfig(info.game_id):GetGameInfo()
+    ViewUtil.LoadPage(self._viewComp_GameList:GetChild('page'), mode:GetPageURL(), function(view)
+        mode._config = view
+        mode:FillData()
+        if self._data.playInfo then
+            mode:LoadConfigData(json.decode(self._data.playInfo.config))
+        end
+    end)
+end
+
+-----------------
+
+--点击创建玩法
+function M:ClickCreate()
+    ViewUtil.ShowModalWait2(self._root_view)
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    local group = DataManager.CurrenGroup
+    local info = self.orderList[self._viewList_left.selectedIndex + 1].list[self._viewList_GameList.selectedIndex + 1]
+    local mod = ExtendManager.GetExtendConfig(info.game_id):GetGameInfo()
+    local _data = mod:SelectedConfigData()
+    local hpData = mod:GetHpData()
+    _data.game_id = info.game_id
+    self.table_color = 0
+    local functionName = self._data.playInfo and fgCtr.FG_UpdatePlay or fgCtr.FG_AddPlay
+    functionName(fgCtr, group.id, info.game_id, _data, info.name, hpData, 1, group.type, self.table_color,
+        function(res)
+            if self._is_destroy then
+                return
+            end
+            ViewUtil.CloseModalWait2()
+
+            if res.ReturnCode == 0 then
+                ViewUtil.ErrorTip(-1, "添加玩法成功")
+                if self._callback then
+                    self._callback()
+                end
+                self:Destroy()
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, "添加玩法失败！")
+            end
+        end)
+end
+
+function M:FillData()
+    local games = DataManager.SelfUser.games
+    local playInfo = self._data.playInfo
+    local selectType = 0
+    local selectGame = 0
+    local chooseGameId
+    if playInfo then
+        selectType = playInfo.gameType - 1
+        chooseGameId = playInfo.gameId
+    end
+    for i, v in ipairs(games) do
+        if chooseGameId == v.game_id then
+            selectGame = #self.orderList[v.gameType].list
+        end
+        table.insert(self.orderList[v.gameType].list, v)
+    end
+    self._viewList_left.numItems = #self.orderList
+    self._viewList_left.selectedIndex = selectType
+    self._viewList_GameList.numItems = #self.orderList[selectType + 1].list
+    self._viewList_GameList.selectedIndex = selectGame
+    if #self.orderList[selectType + 1].list > 0 then
+        self:GameListClick({ sender = { selectedIndex = selectGame } })
+    end
+
+
+    self:Show()
+end
+
+-- 打开窗口
+function M:Show()
+    getmetatable(M).__index.Show(self)
+end
+
+-- 关闭窗口
+function M:Close()
+    getmetatable(M).__index.Close(self)
+end
+
+-- 销毁窗口
+function M:Destroy()
+    getmetatable(M).__index.Destroy(self)
+end
+
+return M

lua_probject/base_project/Game/View/FamilyZuo/FamilyPlayListView.lua

@@ -1,3 +1,5 @@
+local FamilyManagerView = import(".FamilyManagerView")
+
 local FamilyPlayListView = {}
 
 local M = FamilyPlayListView
@@ -15,9 +17,17 @@ end
 
 function M:init(url)
     getmetatable(M).__index.init(self,url)
+    local view = self._view
+
+    view:GetChild('btn_addPlay').onClick:Set(handler(self,self.AddPlayClick))
+    
     self:FillData()
 end
 
+function M:AddPlayClick()
+    FamilyManagerView.new({frsitIndex=2})
+end
+
 function M:FillData()
     self:Show()
 end

lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_GamePlayView.lua

@@ -1,4 +1,5 @@
 local GroupGameSettingView = import("..NewGroup.MngView.GroupGameSettingView_jaingxi")
+local FamilyGamePlay = import(".FamilyGamePlay")
 
 local ManagerChild_GamePlayView = {}
 
@@ -20,21 +21,13 @@ function M:init(url)
         return
     end
     local page = root._view:GetChild('page')
-    self:LoadPage(page, url, function(view)
+    ViewUtil.LoadPage(page, url, function(view)
         local group = DataManager.CurrenGroup
         self._view = view
         view:GetChild('list_gameName').itemRenderer = handler(self, self.GamePlayRenderer)
         view:GetChild('list_gameName').onClickItem:Set(handler(self, self.GamePlayClick))
         view:GetChild('btn_addPlay').onClick:Set(function()
-            local tem = GroupGameSettingView.new(self.blur_view, group.id, 0, nil, function(play)
-                group:addPlay(play)
-                if #DataManager.CurrenGroup.playList == 1 then
-                    self:FillData()
-                else
-                    view:GetChild('list_gameName').numItems = #DataManager.CurrenGroup.playList
-                end
-            end)
-            tem:Show()
+            FamilyGamePlay.new({},handler(self,self.FillData))
         end)
         view:GetChild('btn_delPlay').onClick:Set(function()
             local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -59,28 +52,13 @@ function M:init(url)
             _curren_msg:Show()
         end)
         view:GetChild('btn_updatePlay').onClick:Set(function()
-
+            FamilyGamePlay.new({playInfo = DataManager.CurrenGroup.playList[view:GetChild('list_gameName').selectedIndex + 1]},handler(self,self.FillData))
         end)
 
         self:FillData()
     end)
 end
 
---确保页面加载后再渲染初始化数据
-function M:LoadPage(loader, url, callback)
-    loader.url = url
-
-    if loader.component then
-        callback(loader.component)
-    else
-        FrameTimer.New(function()
-            if loader.component then
-                callback(loader.component)
-            end
-        end, 1):Start()
-    end
-end
-
 function M:GamePlayRenderer(index, obj)
     obj.text = DataManager.CurrenGroup.playList[index + 1].name
 end
@@ -102,7 +80,11 @@ end
 function M:FillData()
     local playList = DataManager.CurrenGroup.playList
     local view = self._view
-    view:GetChild('list_gameName').numItems = #playList
+    if view:GetChild('list_gameName').numItems == #playList then
+        view:GetChild('list_gameName'):RefreshVirtualList()
+    else
+        view:GetChild('list_gameName').numItems = #playList
+    end
     if #playList > 0 then
         view:GetChild('list_gameName').selectedIndex = 0
         self:GamePlayClick()

lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_PlayerView.lua

@@ -19,7 +19,7 @@ function M:init(url)
     end
     ViewUtil.ShowModalWait2()
     local page = root._view:GetChild('page')
-    self:LoadPage(page, url, function(view)
+    ViewUtil.LoadPage(page, url, function(view)
         self._view = view
         view:GetController('page').onChanged:Set(handler(self, self.PageChanged))
         view:GetChild('list_menber').itemRenderer = handler(self, self.MenberItemRenderer)
@@ -28,21 +28,6 @@ function M:init(url)
     end)
 end
 
---确保页面加载后再渲染初始化数据
-function M:LoadPage(loader, url, callback)
-    loader.url = url
-
-    if loader.component then
-        callback(loader.component)
-    else
-        FrameTimer.New(function()
-            if loader.component then
-                callback(loader.component)
-            end
-        end, 1):Start()
-    end
-end
-
 function M:MenberItemRenderer(index, obj)
     local numberInfo = self._fillData[index + 1]
     if not self._fillType or self._fillType == 1 then

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -430,3 +430,18 @@ function ViewUtil.__openWx()
     GameApplication.Instance:WXOnlyOpen(1, function(...)
     end)
 end
+
+--确保页面加载后再渲染初始化数据
+function ViewUtil.LoadPage(loader, url, callback)
+    loader.url = url
+
+    if loader.component then
+        callback(loader.component)
+    else
+        FrameTimer.New(function()
+            if loader.component then
+                callback(loader.component)
+            end
+        end, 1):Start()
+    end
+end

lua_probject/base_project/table/Table_Error_code.lua

@@ -38,7 +38,7 @@ Table_Error_code_Map = {
 	[28] = { id = 28, note = "多次登录失败，禁止登录,请过段时间再次尝试" },
 	-- [101] = { id = 101, note = "请检查您的网络设置" }, --请检查您的网络设置，暂时注释
 	[102] = { id = 102, note = "网络连接超时" },
-	[500] = { id = 500, note = "" },
+	-- [500] = { id = 500, note = "" },
 	[999] = { id = 999, note = "未知错误" },
 	[17] = { id = 17, note = "奖券不足" },
 	[53] = { id = 53, note = "与桌上玩家IP相同，进入房间失败" },

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

@@ -38,66 +38,35 @@ function M:FillData()
             com_editSetting:GetController("oneRound").selectedIndex = 0
         end
     end)
-    -- if oldGameVersion == 2 then
-    -- 	self._config:GetController("xipai").selectedIndex = 0
+end
 
-    -- 	self.xipaiValueText = self._config:GetChild('xipaifen')
-    -- 	self.xipaiValueText.text = 1
-    -- 	self.xipaiValue = 1
+function M:FillDataNew()
+    self._maxPlayer = 4   -- 默认玩家人数
+    self._roundChoice = 3 -- 回合选项数
+    self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_FuZhou/Label_Detail_83")
 
-    -- 	self.anchouValueText = self._config:GetChild('anchoufen')
-    -- 	self.anchouValueText.text = 1
-    -- 	self.anchouValue = 1
+    local jiangmaSlider = self._config:GetChild("n92")
+    jiangmaSlider.onChanged:Set(function()
+        self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
+    end)
 
-    -- 	local btn_cr = self._config:GetChild('sdsrbtn')
-    -- 	btn_cr.onClick:Set(
-    -- 		function()
-    -- 			local gniv = GroupNumberInputView_Game.new(nil, function(num)
-    -- 				local value = limit
-    -- 				if otype == 1 then
-    -- 					value = value + ad2d(num)
-    -- 				elseif otype == -1 then
-    -- 					value = value - ad2d(num)
-    -- 				else
-    -- 					value = ad2d(num)
-    -- 				end
+    local com_editSetting = self._config:GetChild("com_editSetting")
 
-    -- 				if value < 0 then
-    -- 					ViewUtil.ErrorTip(1, "输入数据异常！")
-    -- 				end
+    com_editSetting:GetController("cGps").selectedIndex = 2
 
-    -- 				self.xipaiValueText.text = value / 1000
-    -- 				self.xipaiValue = value / 1000
-    -- 			end, 3, nil)
-    -- 			gniv:Show()
-    -- 		end
-    -- 	)
-
-
-    -- 	local btn_cr2 = self._config:GetChild('anchoubtn')
-    -- 	btn_cr2.onClick:Set(
-    -- 		function()
-    -- 			local gniv = GroupNumberInputView_Game.new(nil, function(num)
-    -- 				local value = limit
-    -- 				if otype == 1 then
-    -- 					value = value + ad2d(num)
-    -- 				elseif otype == -1 then
-    -- 					value = value - ad2d(num)
-    -- 				else
-    -- 					value = ad2d(num)
-    -- 				end
-
-    -- 				if value < 0 then
-    -- 					ViewUtil.ErrorTip(1, "输入数据异常！")
-    -- 				end
-
-    -- 				self.anchouValueText.text = value / 1000
-    -- 				self.anchouValue = value / 1000
-    -- 			end, 3, nil)
-    -- 			gniv:Show()
-    -- 		end
-    -- 	)
-    -- end
+    local ctr_round = self._config:GetController("round")
+    if ctr_round.selectedIndex == 0 then
+        com_editSetting:GetController("oneRound").selectedIndex = 1
+    else
+        com_editSetting:GetController("oneRound").selectedIndex = 0
+    end
+    self._config:GetController("round").onChanged:Set(function()
+        if ctr_round.selectedIndex == 0 then
+            com_editSetting:GetController("oneRound").selectedIndex = 1
+        else
+            com_editSetting:GetController("oneRound").selectedIndex = 0
+        end
+    end)
 end
 
 local _help_url = "ui://Info_MJ_FuZhou/Com_help"
@@ -120,6 +89,10 @@ function M:GetPlayList()
     return _play_list
 end
 
+function M:GetPageURL()
+    return "ui://Info_MJ_FuZhou/Label_Detail_83"
+end
+
 function M:SelectedConfigData()
     local _config = self._config
     local round = _config:GetController("round").selectedIndex + 1

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

@@ -16,11 +16,13 @@ function EXGameInfo.new(blur_view)
 end
 
 function M:FillData(view, index)
+    getmetatable(M).__index:FillData(view, index)
     self._maxPlayer = 2   -- 默认玩家人数
     self._roundChoice = 5 -- 回合选项数
 
     -- if oldGameVersion == 1 then
-    self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_DuoDuo/Label_Detail_Play")
+
+        self._config = UIPackage.CreateObjectFromURL(self:GetPageURL())
 
     local com_editSetting = self._config:GetChild("com_editSetting")
 
@@ -79,6 +81,10 @@ function M:GetIconUrl1()
     return _icon_url1
 end
 
+function M:GetPageURL()
+    return "ui://Info_Poker_DuoDuo/Label_Detail_Play"
+end
+
 local _play_list = { "15张玩法", "16张玩法" }
 function M:GetPlayList()
     return _play_list
@@ -158,6 +164,7 @@ function M:LoadConfigData(data)
 end
 
 function M:SelectedConfigData()
+    local _data = getmetatable(M).__index:SelectedConfigData()
     local _config = self._config
     local round = _config:GetController("round").selectedIndex
     local handcard = _config:GetController("handcard").selectedIndex
@@ -207,7 +214,6 @@ function M:SelectedConfigData()
     end
 
     ----
-    local _data = {}
     _data["account_id"] = DataManager.SelfUser.Id
     -- _data["AA"] = AA
     -- _data["willBeOut"] = willBeOut + 1

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

@@ -20,7 +20,8 @@ function M:FillData(view, index)
     self._roundChoice = 5 -- 回合选项数
 
     -- if oldGameVersion == 1 then
-    self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Label_Detail_Play")
+            -- self._config = UIPackage.CreateObjectFromURL(self:GetPageURL())
+
 
     local com_editSetting = self._config:GetChild("com_editSetting")
 
@@ -79,6 +80,10 @@ function M:GetIconUrl1()
     return _icon_url1
 end
 
+function M:GetPageURL()
+    return "ui://Info_Poker_RunFastNew/Label_Detail_Play"
+end
+
 local _play_list = { "15张玩法", "16张玩法" }
 function M:GetPlayList()
     return _play_list

wb_new_ui/assets/Common/buttons/Btn_CheckBox.xml

@@ -1,10 +1,15 @@
 <?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"/>
+<component size="55,53" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n3_ej1i" name="icon" xy="0,0" size="100,20" fill="scaleFree">
+    <image id="n4_ksft" name="n4" src="ksftb7jhm" fileName="images/checkBox_down.png" xy="-2,-2">
+      <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
-    </loader>
+    </image>
+    <image id="n5_ksft" name="n5" src="ksftb7jhn" fileName="images/checkBox_up.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
   <Button mode="Check"/>
 </component>

wb_new_ui/assets/Common/buttons/Btn_CheckBoxWithText.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="55,53" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <component id="n3_ksft" name="n3" src="ej1ib7jgg" fileName="buttons/Btn_CheckBox.xml" xy="0,0" size="55,53">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <text id="n4_ksft" name="title" xy="58,2" pivot="0,0.5" size="61,49" font="ui://27vd145bej1ib7jgh" fontSize="36" color="#8f736c" autoClearText="true" text="123">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/buttons/Btn_Choose.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="53,53" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n3_ksft" name="n3" src="ksftb7jhp" fileName="images/choose_up.png" xy="0,-1" size="54,56">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n4_ksft" name="n4" src="ksftb7jho" fileName="images/choose_down.png" xy="-1,-2" size="55,57">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/buttons/Btn_ChooseWithText.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="53,53" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <component id="n3_ksft" name="n3" src="ksftb7jhl" fileName="buttons/Btn_Choose.xml" xy="0,0" size="53,53">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <text id="n4_ksft" name="title" xy="58,26" pivot="0,0.5" size="0,0" font="ui://27vd145bej1ib7jgh" fontSize="36" color="#8f736c" autoClearText="true" text="">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/buttons/Btn_ScrollText.xml

@@ -2,7 +2,9 @@
 <component size="200,100" overflow="scroll" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n3_cl8p" name="title" xy="0,0" size="200,0" font="ui://27vd145bej1ib7jgl" fontSize="28" color="#846a6a" autoSize="height" text=""/>
+    <text id="n3_cl8p" name="title" xy="0,0" size="200,0" font="ui://27vd145bej1ib7jgl" fontSize="28" color="#846a6a" autoSize="height" text="">
+      <relation target="" sidePair="width-width"/>
+    </text>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Common/buttons/Btn_TextWithCheckBox.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="53,53" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <component id="n3_ksft" name="n3" src="ej1ib7jgg" fileName="buttons/Btn_CheckBox.xml" xy="0,0" size="53,53">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <text id="n4_ksft" name="title" xy="-2,26" pivot="1,0.5" size="0,0" font="ui://27vd145bej1ib7jgh" fontSize="36" color="#8f736c" autoClearText="true" text="">
+      <relation target="" sidePair="middle-middle,right-left"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/buttons/Btn_TextWithChoose.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="53,53" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <component id="n3_ksft" name="n3" src="ksftb7jhl" fileName="buttons/Btn_Choose.xml" xy="0,0" size="53,53">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <text id="n4_ksft" name="title" xy="-2,26" pivot="1,0.5" size="0,0" font="ui://27vd145bej1ib7jgh" fontSize="36" color="#8f736c" autoClearText="true" text=""/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/package.xml

@@ -2248,6 +2248,16 @@
     <image id="cl8pb7jhi" name="btn_bg1WithText1.png" path="/images/" scale="9grid" scale9grid="50,17,100,34"/>
     <component id="cl8pb7jhj" name="Btn_Bg1WithText1.xml" path="/buttons/" exported="true"/>
     <component id="cl8pb7jhk" name="Btn_Bg2WithText.xml" path="/buttons/" exported="true"/>
+    <component id="ksftb7jhl" name="Btn_Choose.xml" path="/buttons/" exported="true"/>
+    <image id="ksftb7jhm" name="checkBox_down.png" path="/images/"/>
+    <image id="ksftb7jhn" name="checkBox_up.png" path="/images/"/>
+    <image id="ksftb7jho" name="choose_down.png" path="/images/"/>
+    <image id="ksftb7jhp" name="choose_up.png" path="/images/"/>
+    <component id="ksftb7jhr" name="Btn_TextWithCheckBox.xml" path="/buttons/" exported="true"/>
+    <component id="ksftb7jhs" name="Btn_ChooseWithText.xml" path="/buttons/" exported="true"/>
+    <component id="ksftb7jht" name="Btn_CheckBoxWithText.xml" path="/buttons/" exported="true"/>
+    <component id="ksftb7jhu" name="Btn_TextWithChoose.xml" path="/buttons/" exported="true"/>
+    <image id="ksftb7jhv" name="bg_common_di.png" path="/images/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048" rotation="true">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Family/FamilyGamePlay/FamilyGamePlay.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <component id="n0_hnnb" name="bg" src="ej1ib7jgi" fileName="Bg_Title.xml" pkg="27vd145b" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n2_hnnb" name="n2" src="jo5dbt7d8r" fileName="FamilyManager/image/bg_listLeft.png" xy="0,0" size="342,1170">
+      <relation target="n3_hnnb" sidePair="width-width,height-height,left-left,top-top"/>
+    </image>
+    <list id="n3_hnnb" name="list_left" xy="0,0" size="342,1170" overflow="scroll" defaultItem="ui://htcn7v3rhnnbbt7d9y">
+      <relation target="" sidePair="height-height,left-left,bottom-bottom"/>
+      <item title="成员管理" icon="ui://htcn7v3rjo5dbt7d8t"/>
+      <item title="快速组局" icon="ui://htcn7v3rjo5dbt7d8u"/>
+    </list>
+    <loader id="n4_hnnb" name="page" xy="341,0" size="2193,1170" url="ui://htcn7v3rhnnbbt7dc4" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
+    </loader>
+    <component id="n1_hnnb" name="btn_close" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2341,0" size="191,117">
+      <relation target="" sidePair="right-right,top-top"/>
+      <Button icon="ui://htcn7v3rhnnbbt7d9x"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyGamePlay/component/Child_GamePlayChild_Left.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="383,168" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n3_hnnb" name="n3" src="hnnbbt7dc5" fileName="FamilyGamePlay/image/bg_gamePlay_gameDown.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n4_hnnb" name="n4" src="hnnbbt7dc6" fileName="FamilyGamePlay/image/bg_line_gamePlay_gameUp.png" xy="25,166">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <text id="n5_hnnb" name="title" xy="191,72" pivot="0.5,0.5" size="0,0" font="ui://27vd145bej1ib7jgl" fontSize="55" color="#fff6d8" text="">
+      <gearColor controller="button" pages="0" values="#fff6d8,#000000" default="#7c3814,#000000"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Family/FamilyGamePlay/component/Child_GamePlayLeft.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="397,168" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n3_jo5d" name="n3" src="jo5dbt7d8q" fileName="SameImage/bg_familyManager_down.png" xy="0,0" size="402,176">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n4_jo5d" name="n4" src="jo5dbt7d8s" fileName="SameImage/btn_familyManager_up.png" xy="0,0" size="397,168">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <text id="n6_jo5d" name="text_down" xy="76,43" pivot="0.5,0.5" size="244,79" font="ui://27vd145bej1ib7jgh" fontSize="60" color="#7c3814" text="成员管理">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n7_hnnb" name="text_up" xy="76,44" pivot="0.5,0.5" size="244,79" font="ui://27vd145bej1ib7jgh" fontSize="60" color="#fff6d8" text="成员管理">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Family/FamilyGamePlay/component/GamePlayChild_TypePage.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2185,1170">
+  <displayList>
+    <image id="n2_hnnb" name="n2" src="hnnbbt7dc8" fileName="FamilyGamePlay/image/bg_gamePlay_left.png" xy="0,0">
+      <relation target="" sidePair="height-height,left-left,bottom-bottom"/>
+    </image>
+    <list id="n1_hnnb" name="list_left" xy="0,0" size="383,1168" overflow="scroll" defaultItem="ui://htcn7v3rhnnbbt7dc7">
+      <relation target="" sidePair="height-height,left-left,bottom-bottom"/>
+      <item title="成员管理" icon="ui://htcn7v3rjo5dbt7d8t"/>
+      <item title="快速组局" icon="ui://htcn7v3rjo5dbt7d8u"/>
+    </list>
+    <image id="n10_ksft" name="n10" src="l8fnb7jgs" fileName="images/bg_tongyong.png" pkg="27vd145b" xy="385,1006" size="1801,164">
+      <relation target="" sidePair="width-width,bottom-bottom"/>
+    </image>
+    <image id="n9_ksft" name="n9" src="ksftb7jhv" fileName="images/bg_common_di.png" pkg="27vd145b" xy="384,0" size="1801,1015">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n3_hnnb" name="page" xy="384,0" size="1801,1005" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <component id="n5_ksft" name="btn_confirm" src="l8fnb7jh7" fileName="buttons/Btn_Bg1WithText.xml" pkg="27vd145b" xy="1555,1020" size="533,134">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button title="保存" titleFontSize="58"/>
+    </component>
+    <text id="n6_ksft" name="n6" xy="428,1126" size="572,34" font="ui://27vd145bej1ib7jgh" fontSize="24" color="#929292" text="注:房卡在第一局牌局结算后扣除,提前解散不扣除房卡">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </text>
+    <component id="n7_ksft" name="btn_checkGps" src="ksftb7jhr" fileName="buttons/Btn_TextWithCheckBox.xml" pkg="27vd145b" xy="610,1061">
+      <Button title="GPS检测："/>
+    </component>
+    <component id="n8_ksft" name="btn_checkWang" src="ksftb7jhr" fileName="buttons/Btn_TextWithCheckBox.xml" pkg="27vd145b" xy="1062,1061">
+      <Button title="网络地址检测："/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Family/Main_zuo.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
   <controller name="showList" pages="0,,1," selected="0"/>
-  <controller name="showPlayDetail" pages="0,,1," selected="1"/>
+  <controller name="showPlayDetail" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n0_ej1i" name="n0" src="ej1ibt7d7s" fileName="Main_zuo/image/bg_family.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
@@ -81,7 +81,7 @@
     <graph id="n35_thoe" name="click_closePlayDetail" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="showPlayDetail" pages="1"/>
     </graph>
-    <component id="n26_thoe" name="comp_playDetail" src="thoebt7d9v" fileName="Main_zuo/component/comp_playDetail.xml" xy="43,72" pivot="0.5,1">
+    <component id="n26_thoe" name="comp_playDetail" src="thoebt7d9v" fileName="Main_zuo/component/comp_playDetail.xml" xy="0,0" pivot="0.5,1">
       <gearDisplay controller="showPlayDetail" pages="1"/>
     </component>
   </displayList>

wb_new_ui/assets/Family/Main_zuo/component/comp_playDetail.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="679,366">
-  <controller name="type" pages="0,,1,,2,,3,,4," selected="3"/>
+  <controller name="type" pages="0,,1,,2,,4,,3," selected="3"/>
   <displayList>
     <image id="n26_thoe" name="n26" src="cl8pbt7d9t" fileName="Main_zuo/image/bg_playdetail_table.png" xy="0,0" group="n34_thoe"/>
     <text id="n27_thoe" name="n27" xy="266,2" size="148,49" group="n34_thoe" font="ui://27vd145bej1ib7jgl" fontSize="36" color="#9c5a20" text="玩法说明"/>
     <image id="n28_thoe" name="n28" src="cl8pbt7d9u" fileName="Main_zuo/image/icon_palyDetail_point.png" xy="32,70" group="n34_thoe"/>
     <component id="n29_thoe" name="text_playDetail" src="cl8pb7jhg" fileName="buttons/Btn_ScrollText.xml" pkg="27vd145b" xy="45,58" size="604,192" group="n34_thoe">
-      <Button title="玩法"/>
+      <Button title="玩法玩法玩法玩法玩法玩法玩法玩法玩法玩法玩法"/>
     </component>
     <component id="n30_thoe" name="btn_createRoom" src="cl8pb7jhk" fileName="buttons/Btn_Bg2WithText.xml" pkg="27vd145b" xy="242,271" size="196,66" group="n34_thoe">
       <gearDisplay controller="type" pages="0"/>
       <Button title="创建房间" titleFontSize="36"/>
     </component>
-    <component id="n31_thoe" name="btn_joinRoom" src="cl8pb7jhk" fileName="buttons/Btn_Bg2WithText.xml" pkg="27vd145b" xy="29,273" size="196,66" group="n34_thoe">
+    <component id="n31_thoe" name="btn_joinRoom" src="cl8pb7jhk" fileName="buttons/Btn_Bg2WithText.xml" pkg="27vd145b" xy="111,273" size="196,66" group="n34_thoe">
       <gearDisplay controller="type" pages="1,2,3,4"/>
-      <gearXY controller="type" pages="1,2" values="241,273|111,273" default="29,273"/>
+      <gearXY controller="type" pages="1,2,4" values="241,273|111,273|111,273" default="29,273"/>
       <Button title="参加" titleFontSize="36"/>
     </component>
     <component id="n32_thoe" name="btn_inviteRoom" src="cl8pb7jhk" fileName="buttons/Btn_Bg2WithText.xml" pkg="27vd145b" xy="243,273" size="196,66" group="n34_thoe">
@@ -22,8 +22,8 @@
       <gearXY controller="type" pages="2" values="383,273" default="243,273"/>
       <Button title="邀请" titleFontSize="36"/>
     </component>
-    <component id="n33_thoe" name="btn_delRoom" src="hmu5b7jhb" fileName="buttons/Btn_Bg2WithText1.xml" pkg="27vd145b" xy="457,273" size="196,66" group="n34_thoe">
-      <gearDisplay controller="type" pages="3"/>
+    <component id="n33_thoe" name="btn_delRoom" src="hmu5b7jhb" fileName="buttons/Btn_Bg2WithText1.xml" pkg="27vd145b" xy="383,273" size="196,66" group="n34_thoe">
+      <gearDisplay controller="type" pages="4,3"/>
       <Button title="解散" titleFontSize="36"/>
     </component>
     <group id="n34_thoe" name="playDetail" xy="0,0" size="679,366" advanced="true"/>

wb_new_ui/assets/Family/fontType1/FamilyFont1.fnt

@@ -0,0 +1,39 @@
+info size=80 resizable=true colored=false
+char id=26412 img=hnnbbt7db1 xoffset=0 yoffset=0 xadvance=0
+char id=25805 img=hnnbbt7dbl xoffset=0 yoffset=0 xadvance=0
+char id=25104 img=hnnbbt7dbm xoffset=0 yoffset=0 xadvance=0
+char id=24471 img=hnnbbt7dbn xoffset=0 yoffset=0 xadvance=0
+char id=22320 img=hnnbbt7dbo xoffset=0 yoffset=0 xadvance=0
+char id=26007 img=hnnbbt7dbp xoffset=0 yoffset=0 xadvance=0
+char id=31649 img=hnnbbt7dbq xoffset=0 yoffset=0 xadvance=0
+char id=40657 img=hnnbbt7dbr xoffset=0 yoffset=0 xadvance=0
+char id=32993 img=hnnbbt7dbt xoffset=0 yoffset=0 xadvance=0
+char id=22522 img=hnnbbt7dc1 xoffset=0 yoffset=0 xadvance=0
+char id=32489 img=hnnbbt7dbw xoffset=0 yoffset=0 xadvance=0
+char id=35745 img=hnnbbt7dbu xoffset=0 yoffset=0 xadvance=0
+char id=35760 img=hnnbbt7dbv xoffset=0 yoffset=0 xadvance=0
+char id=31105 img=hnnbbt7dbx xoffset=0 yoffset=0 xadvance=0
+char id=23616 img=hnnbbt7dby xoffset=0 yoffset=0 xadvance=0
+char id=24555 img=hnnbbt7dbz xoffset=0 yoffset=0 xadvance=0
+char id=29702 img=hnnbbt7dc0 xoffset=0 yoffset=0 xadvance=0
+char id=21382 img=hnnbbt7dbk xoffset=0 yoffset=0 xadvance=0
+char id=24405 img=hnnbbt7dbj xoffset=0 yoffset=0 xadvance=0
+char id=25490 img=hnnbbt7dbi xoffset=0 yoffset=0 xadvance=0
+char id=36305 img=hnnbbt7dbh xoffset=0 yoffset=0 xadvance=0
+char id=35774 img=hnnbbt7db2 xoffset=0 yoffset=0 xadvance=0
+char id=21490 img=hnnbbt7db3 xoffset=0 yoffset=0 xadvance=0
+char id=36895 img=hnnbbt7db4 xoffset=0 yoffset=0 xadvance=0
+char id=21516 img=hnnbbt7db5 xoffset=0 yoffset=0 xadvance=0
+char id=32479 img=hnnbbt7db6 xoffset=0 yoffset=0 xadvance=0
+char id=23627 img=hnnbbt7db7 xoffset=0 yoffset=0 xadvance=0
+char id=23567 img=hnnbbt7db8 xoffset=0 yoffset=0 xadvance=0
+char id=34892 img=hnnbbt7db9 xoffset=0 yoffset=0 xadvance=0
+char id=21592 img=hnnbbt7dba xoffset=0 yoffset=0 xadvance=0
+char id=25112 img=hnnbbt7dbb xoffset=0 yoffset=0 xadvance=0
+char id=27490 img=hnnbbt7dbc xoffset=0 yoffset=0 xadvance=0
+char id=32622 img=hnnbbt7dbd xoffset=0 yoffset=0 xadvance=0
+char id=20027 img=hnnbbt7dbe xoffset=0 yoffset=0 xadvance=0
+char id=26700 img=hnnbbt7dbf xoffset=0 yoffset=0 xadvance=0
+char id=23376 img=hnnbbt7dbg xoffset=0 yoffset=0 xadvance=0
+char id=32452 img=hnnbbt7dbs xoffset=0 yoffset=0 xadvance=0
+char id=20316 img=hnnbbt7dc2 xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Family/package.xml

@@ -501,7 +501,7 @@
     <image id="jo5dbt7d9e" name="btn_addPlay.png" path="/FamilyManager/image/"/>
     <image id="jo5dbt7d9f" name="btn_del.png" path="/FamilyManager/image/"/>
     <image id="jo5dbt7d9g" name="btn_revise.png" path="/FamilyManager/image/"/>
-    <image id="cax7bt7d9h" name="btn_close2.png" path="/Main_zuo/image/"/>
+    <image id="cax7bt7d9h" name="btn_close1.png" path="/SameImage/"/>
     <image id="l8fnbt7d9i" name="btn_chongFangka.png" path="/Main_zuo/image/"/>
     <component id="l8fnbt7d9j" name="FamilyRoomCard.xml" path="/FamilyRoomCard/" exported="true"/>
     <image id="l8fnbt7d9k" name="休闲场充值.png" path="/FamilyRoomCard/image/"/>
@@ -515,6 +515,53 @@
     <image id="cl8pbt7d9t" name="bg_playdetail_table.png" path="/Main_zuo/image/"/>
     <image id="cl8pbt7d9u" name="icon_palyDetail_point.png" path="/Main_zuo/image/"/>
     <component id="thoebt7d9v" name="comp_playDetail.xml" path="/Main_zuo/component/"/>
+    <component id="hnnbbt7d9w" name="FamilyGamePlay.xml" path="/FamilyGamePlay/" exported="true"/>
+    <image id="hnnbbt7d9x" name="btn_close2.png" path="/FamilyGamePlay/image/"/>
+    <component id="hnnbbt7d9y" name="Child_GamePlayLeft.xml" path="/FamilyGamePlay/component/"/>
+    <image id="hnnbbt7db1" name="本.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db2" name="设.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db3" name="史.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db4" name="速.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db5" name="同.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db6" name="统.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db7" name="屋.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db8" name="小.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7db9" name="行.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dba" name="员.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbb" name="战.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbc" name="止.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbd" name="置.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbe" name="主.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbf" name="桌.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbg" name="子.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbh" name="跑.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbi" name="排.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbj" name="录.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbk" name="历.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbl" name="操.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbm" name="成.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbn" name="得.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbo" name="地.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbp" name="斗.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbq" name="管.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbr" name="黑.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbs" name="组.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbt" name="胡.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbu" name="计.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbv" name="记.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbw" name="绩.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbx" name="禁.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dby" name="局.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dbz" name="快.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dc0" name="理.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dc1" name="基.png" path="/fontType1/image/"/>
+    <image id="hnnbbt7dc2" name="作.png" path="/fontType1/image/"/>
+    <font id="hnnbbt7dc3" name="FamilyFont1.fnt" path="/fontType1/" exported="true"/>
+    <component id="hnnbbt7dc4" name="GamePlayChild_TypePage.xml" path="/FamilyGamePlay/component/" exported="true"/>
+    <image id="hnnbbt7dc5" name="bg_gamePlay_gameDown.png" path="/FamilyGamePlay/image/"/>
+    <image id="hnnbbt7dc6" name="bg_line_gamePlay_gameUp.png" path="/FamilyGamePlay/image/"/>
+    <component id="hnnbbt7dc7" name="Child_GamePlayChild_Left.xml" path="/FamilyGamePlay/component/"/>
+    <image id="hnnbbt7dc8" name="bg_gamePlay_left.png" path="/FamilyGamePlay/image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Hotupdate/Version.xml

@@ -28,7 +28,7 @@
       <gearDisplay controller="state" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <image id="n32_xx1c" name="n32" src="xn9417" fileName="hall_girl_bg@2x.png" xy="718,247">
+    <image id="n32_xx1c" name="n32" src="xn9417" fileName="hall_girl_bg@2x.png" xy="718,247" visible="false">
       <relation target="" sidePair="width-width%,height-height%,center-center,top-top%"/>
     </image>
     <text id="n34_g6m8" name="tex_info" xy="235,1076" size="2062,64" font="ui://27vd145bh35o7il7" fontSize="48" color="#cccccc" align="center" text="抵制不良游戏 拒绝盗版游戏 注意自我保护 谨防上当受骗 适度游戏伤身 合理安排时间 享受健康生活">

wb_new_ui/assets/Info_Poker_DuoDuo/Label_Detail_Play.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1906,836" overflow="scroll" extention="Label">
+<component size="1801,1005" overflow="scroll" extention="Label">
   <controller name="round" pages="0,,1,,2,,3," selected="0"/>
   <controller name="handcard" pages="0,,1," selected="0"/>
   <controller name="peopleNum" pages="0,,1," selected="0"/>
@@ -11,143 +11,137 @@
   <controller name="wanfa1_5" pages="0,,1," selected="0"/>
   <controller name="wanfa2_1" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n108_11mfw" name="title" xy="220,0" size="134,86" group="n114_11mfw" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="局数">
+    <image id="n123_ksft" name="n123" src="l8fnb7jgs" fileName="images/bg_tongyong.png" pkg="27vd145b" xy="0,0" size="1253,98" group="n114_11mfw"/>
+    <text id="n108_11mfw" name="title" xy="27,0" size="100,64" group="n114_11mfw" font="ui://27vd145bej1ib7jgh" fontSize="48" color="#8f736c" text="局数">
       <relation target="" sidePair="right-right"/>
     </text>
-    <component id="n109_11mfw" name="n109" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,10" group="n114_11mfw">
+    <component id="n109_11mfw" name="n109" src="ksftb7jhs" fileName="buttons/Btn_ChooseWithText.xml" pkg="27vd145b" xy="384,10" group="n114_11mfw">
       <Button checked="true" controller="round" page="0"/>
     </component>
-    <text id="n110_11mfw" name="n110" xy="474,7" size="355,72" group="n114_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="1局（房卡*1）">
-      <gearColor controller="round" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
-    </text>
     <component id="n111_11mfw" name="n111" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1239,10" group="n114_11mfw">
       <Button controller="round" page="1"/>
     </component>
-    <text id="n112_11mfw" name="n112" xy="1329,7" size="386,72" group="n114_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="10局（房卡*2）">
-      <gearColor controller="round" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
-    </text>
-    <image id="n113_11mfw" name="n113" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,90" group="n114_11mfw" visible="false"/>
-    <group id="n114_11mfw" name="roundNum" xy="195,0" size="1520,93" advanced="true"/>
-    <text id="n115_11mfw" name="n115" xy="354,93" size="0,0" group="n121_11mfw" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="">
+    <group id="n114_11mfw" name="roundNum" xy="0,0" size="1305,98" advanced="true"/>
+    <text id="n115_11mfw" name="n115" xy="249,95" size="0,0" group="n121_11mfw" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="">
       <relation target="" sidePair="right-right"/>
     </text>
-    <component id="n116_11mfw" name="n116" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,103" group="n121_11mfw">
+    <component id="n116_11mfw" name="n116" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,105" group="n121_11mfw">
       <Button controller="round" page="2"/>
     </component>
-    <text id="n117_11mfw" name="n117" xy="474,100" size="386,72" group="n121_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="15局（房卡*3）">
+    <text id="n117_11mfw" name="n117" xy="474,102" size="386,71" group="n121_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="15局（房卡*3）">
       <gearColor controller="round" pages="2" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
-    <component id="n118_11mfw" name="n118" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1238,103" group="n121_11mfw">
+    <component id="n118_11mfw" name="n118" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1238,105" group="n121_11mfw">
       <Button controller="round" page="3"/>
     </component>
-    <text id="n119_11mfw" name="n119" xy="1328,100" size="386,72" group="n121_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="20局（房卡*6）">
+    <text id="n119_11mfw" name="n119" xy="1328,102" size="386,71" group="n121_11mfw" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="20局（房卡*6）">
       <gearColor controller="round" pages="3" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
-    <image id="n120_11mfw" name="n120" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,183" group="n121_11mfw"/>
-    <group id="n121_11mfw" name="n121" xy="195,93" size="1519,93" advanced="true"/>
-    <text id="n58_kxhm" name="title" xy="220,186" size="134,86" group="n64_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="手牌">
+    <image id="n120_11mfw" name="n120" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,185" group="n121_11mfw"/>
+    <group id="n121_11mfw" name="n121" xy="195,95" size="1519,93" advanced="true"/>
+    <text id="n58_kxhm" name="title" xy="115,186" size="134,87" group="n64_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="手牌">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n59_kxhm" name="n59" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,196" group="n64_kxhm">
       <Button checked="true" controller="handcard" page="0"/>
     </component>
-    <text id="n60_kxhm" name="n60" xy="474,193" size="226,72" group="n64_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="16张手牌">
+    <text id="n60_kxhm" name="n60" xy="474,193" size="226,71" group="n64_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="16张手牌">
       <gearColor controller="handcard" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n61_kxhm" name="n61" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1238,196" group="n64_kxhm">
       <Button controller="handcard" page="1"/>
     </component>
-    <text id="n62_kxhm" name="n62" xy="1328,193" size="226,72" group="n64_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="15张手牌">
+    <text id="n62_kxhm" name="n62" xy="1328,193" size="226,71" group="n64_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="15张手牌">
       <gearColor controller="handcard" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <image id="n63_kxhm" name="n63" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,276" group="n64_kxhm"/>
-    <group id="n64_kxhm" name="handCardNum" xy="195,186" size="1515,93" advanced="true"/>
-    <text id="n65_kxhm" name="title" xy="220,279" size="134,86" group="n71_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="人数">
+    <group id="n64_kxhm" name="handCardNum" xy="115,186" size="1595,93" advanced="true"/>
+    <text id="n65_kxhm" name="title" xy="115,279" size="134,87" group="n71_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="人数">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n66_kxhm" name="n66" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,289" group="n71_kxhm">
       <Button checked="true" controller="peopleNum" page="0"/>
     </component>
-    <text id="n67_kxhm" name="n67" xy="474,286" size="88,72" group="n71_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="3人">
+    <text id="n67_kxhm" name="n67" xy="474,286" size="88,71" group="n71_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="3人">
       <gearColor controller="peopleNum" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n68_kxhm" name="n68" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1238,289" group="n71_kxhm">
       <Button controller="peopleNum" page="1"/>
     </component>
-    <text id="n69_kxhm" name="n69" xy="1328,286" size="88,72" group="n71_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="2人">
+    <text id="n69_kxhm" name="n69" xy="1328,286" size="88,71" group="n71_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="2人">
       <gearColor controller="peopleNum" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <image id="n70_kxhm" name="n70" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,369" group="n71_kxhm"/>
-    <group id="n71_kxhm" name="peopleNum" xy="195,279" size="1515,93" advanced="true"/>
-    <text id="n72_kxhm" name="title" xy="220,372" size="134,86" group="n78_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="功能">
+    <group id="n71_kxhm" name="peopleNum" xy="115,279" size="1595,93" advanced="true"/>
+    <text id="n72_kxhm" name="title" xy="115,372" size="134,87" group="n78_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="功能">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n73_kxhm" name="n73" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="384,382" group="n78_kxhm">
       <Button checked="true" controller="showCardNum" page="0"/>
     </component>
-    <text id="n74_kxhm" name="n74" xy="474,379" size="217,72" group="n78_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="显示牌数">
+    <text id="n74_kxhm" name="n74" xy="474,379" size="217,71" group="n78_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#51933c" text="显示牌数">
       <gearColor controller="showCardNum" pages="0" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n75_kxhm" name="n75" src="g6uwn" fileName="component/CreatePlay/Component/Single_choose.xml" xy="1238,382" group="n78_kxhm">
       <Button controller="showCardNum" page="1"/>
     </component>
-    <text id="n76_kxhm" name="n76" xy="1328,379" size="270,72" group="n78_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="不显示牌数">
+    <text id="n76_kxhm" name="n76" xy="1328,379" size="270,71" group="n78_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="不显示牌数">
       <gearColor controller="showCardNum" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <image id="n77_kxhm" name="n77" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,462" group="n78_kxhm"/>
-    <group id="n78_kxhm" name="showCardNum" xy="195,372" size="1515,93" advanced="true"/>
-    <text id="n79_kxhm" name="title" xy="220,465" size="134,86" group="n85_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="玩法">
+    <group id="n78_kxhm" name="showCardNum" xy="115,372" size="1595,93" advanced="true"/>
+    <text id="n79_kxhm" name="title" xy="115,465" size="134,87" group="n85_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="玩法">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n80_kxhm" name="n80" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,475" group="n85_kxhm">
       <Button controller="wanfa1_1" page="1"/>
     </component>
-    <text id="n81_kxhm" name="n81" xy="474,472" size="429,72" group="n85_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="三张、飞机可不带">
+    <text id="n81_kxhm" name="n81" xy="474,472" size="429,71" group="n85_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="三张、飞机可不带">
       <gearColor controller="wanfa1_1" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n82_kxhm" name="n82" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1238,475" group="n85_kxhm">
       <Button controller="wanfa1_2" page="1"/>
     </component>
-    <text id="n83_kxhm" name="n83" xy="1328,472" size="535,72" group="n85_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="三张、飞机可少带接完">
+    <text id="n83_kxhm" name="n83" xy="1328,472" size="535,71" group="n85_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="三张、飞机可少带接完">
       <gearColor controller="wanfa1_2" pages="0,1" values="#450f05,#000000|#51933c,#000000"/>
     </text>
-    <group id="n85_kxhm" name="specialPlay1" xy="220,465" size="1643,86" advanced="true"/>
+    <group id="n85_kxhm" name="specialPlay1" xy="115,465" size="1748,87" advanced="true"/>
     <component id="n87_kxhm" name="n87" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,554" group="n92_kxhm">
       <Button controller="wanfa1_3" page="1"/>
     </component>
-    <text id="n88_kxhm" name="n88" xy="474,551" size="163,72" group="n92_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="四带三">
+    <text id="n88_kxhm" name="n88" xy="474,551" size="163,71" group="n92_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="四带三">
       <gearColor controller="wanfa1_3" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n89_kxhm" name="n89" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1238,554" group="n92_kxhm">
       <Button controller="wanfa1_4" page="1"/>
     </component>
-    <text id="n90_kxhm" name="n90" xy="1328,551" size="217,72" group="n92_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="红桃扎鸟">
+    <text id="n90_kxhm" name="n90" xy="1328,551" size="217,71" group="n92_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="红桃扎鸟">
       <gearColor controller="wanfa1_4" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <group id="n92_kxhm" name="specialPlay1" xy="384,551" size="1161,72" advanced="true"/>
     <component id="n94_kxhm" name="n94" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,626" group="n99_kxhm">
       <Button controller="wanfa1_5" page="1"/>
     </component>
-    <text id="n95_kxhm" name="n95" xy="474,623" size="354,72" group="n99_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="首局黑桃3必出">
+    <text id="n95_kxhm" name="n95" xy="474,623" size="354,71" group="n99_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="首局黑桃3必出">
       <gearColor controller="wanfa1_5" pages="0,1" values="#450f05,#000000|#51933c,#000000"/>
     </text>
     <component id="n96_kxhm" name="n96" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1188,626" group="n99_kxhm" visible="false"/>
-    <text id="n97_kxhm" name="n97" xy="1278,623" size="217,72" group="n99_kxhm" visible="false" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="五个字啦"/>
+    <text id="n97_kxhm" name="n97" xy="1278,623" size="217,71" group="n99_kxhm" visible="false" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="五个字啦"/>
     <image id="n98_kxhm" name="n98" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,706" group="n99_kxhm"/>
     <group id="n99_kxhm" name="specialPlay1" xy="195,623" size="1515,86" advanced="true"/>
-    <text id="n100_kxhm" name="title" xy="220,709" size="134,86" group="n106_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="特殊">
+    <text id="n100_kxhm" name="title" xy="115,709" size="134,87" group="n106_kxhm" font="ui://kvqb1gbig6uwm" fontSize="66" color="#450f05" text="特殊">
       <relation target="" sidePair="right-right"/>
     </text>
     <component id="n101_kxhm" name="n101" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="384,719" group="n106_kxhm">
       <Button controller="wanfa2_1" page="1"/>
     </component>
-    <text id="n102_kxhm" name="n102" xy="474,716" size="874,72" group="n106_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="只出一张加扣10分，出2-3张加扣5分">
+    <text id="n102_kxhm" name="n102" xy="474,716" size="874,71" group="n106_kxhm" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="只出一张加扣10分，出2-3张加扣5分">
       <gearColor controller="wanfa2_1" pages="1" values="#51933c,#000000" default="#450f05,#000000"/>
     </text>
     <component id="n103_kxhm" name="n103" src="g6uws" fileName="component/CreatePlay/Component/Multiple_choose.xml" xy="1188,719" group="n106_kxhm" visible="false"/>
-    <text id="n104_kxhm" name="n104" xy="1278,716" size="217,72" group="n106_kxhm" visible="false" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="五个字啦"/>
+    <text id="n104_kxhm" name="n104" xy="1278,716" size="217,71" group="n106_kxhm" visible="false" font="ui://kvqb1gbig6uwq" fontSize="54" color="#450f05" text="五个字啦"/>
     <image id="n105_kxhm" name="n105" src="g6uwr" fileName="component/CreatePlay/Image/Line 2.png" xy="195,799" group="n106_kxhm"/>
-    <group id="n106_kxhm" name="specialPlay2" xy="195,709" size="1515,93" advanced="true"/>
+    <group id="n106_kxhm" name="specialPlay2" xy="115,709" size="1595,93" advanced="true"/>
     <component id="n107_ofwa" name="com_editSetting" src="g6uwv" fileName="component/CreatePlay/Component/com_editSetting.xml" xy="0,802"/>
   </displayList>
 </component>

wb_new_ui/assets/Login/Main.xml

@@ -7,7 +7,7 @@
     <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,left-left,top-top"/>
     </image>
-    <image id="n74_xn94" name="n74" src="xn9417" fileName="hall_girl_bg@2x.png" pkg="0khx14ar" xy="718,247">
+    <image id="n74_xn94" name="n74" src="xn9417" fileName="hall_girl_bg@2x.png" pkg="0khx14ar" xy="718,247" visible="false">
       <relation target="" sidePair="width-width%,height-height%,center-center,top-top%"/>
     </image>
     <component id="n77_9q7v" name="btn_id" src="11mfw7ckt" fileName="component/main/component/Btn_id.xml" xy="1362,720" size="654,165" group="n27"/>

wb_new_ui/assets/NewGroup/mgr/component/play_set/panel_play_set.xml

@@ -76,7 +76,7 @@
         <item title="离线5分钟托管" value="7"/>
       </ComboBox>
     </component>
-    <component id="n143_r4s4" name="comb_result" src="r4s4hry" fileName="tuoguan/ComboBox1.xml" xy="843,135" size="245,47" group="n146_r4s4" controller="type,1">
+    <component id="n143_r4s4" name="comb_result" src="r4s4hry" fileName="tuoguan/ComboBox1.xml" xy="843,136" size="245,47" group="n146_r4s4" controller="type,1">
       <gearDisplay controller="tuoguan" pages="1"/>
       <relation target="" sidePair="center-center%"/>
       <ComboBox visibleItemCount="10" direction="down">