同步

fk101/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua

@@ -777,32 +777,36 @@ end
 
 -- 玩法名字显示
 local function __fillGameItem(self, index, item)
-    local gameName = ""
+    -- local gameName = ""
     if (index == 0) then
-        item.icon = 'ui://NewGroup/quyxtb'
+        item.icon = 'ui://NewGroup/group_quanbu0'
-        gameName = GetGameName(0)
+        -- gameName = GetGameName(0)
-        item:GetChild("n11").text = gameName
+        if self.currentGameItemName == nil or self.lst_game.selectedIndex == index then
-        if self.currentGameItemName == nil then
+            item.icon = 'ui://NewGroup/group_quanbu1'
-            item.icon = 'ui://NewGroup/quyxtb-1'
+            -- item:GetChild("n11").text = ""
-            item:GetChild("n11").text = ""
         end
     else
         local gameId = self.gameIdList[index]
         local config = ExtendManager.GetExtendConfig(gameId)
         local mode = config:GetGameInfo()
         local iconName = mode:GetIconUrl1()
-        item.icon = iconName
+        local last = "0"
-        gameName = GetGameName(gameId)
+        if self.lst_game.selectedIndex == index then
-        item:GetChild("n11").text = gameName
+            last = "1"
+        end
+        printlog("lingmeng __fillGameItem", iconName .. last)
+        item.icon = iconName .. last
+        -- gameName = GetGameName(gameId)
+        -- item:GetChild("n11").text = gameName
     end
 
-    if item.icon == self.currentGameItemName then
+    -- if item.icon == self.currentGameItemName then
-        item.icon = self.currentGameItemName .. "-1"
+    --     item.icon = self.currentGameItemName .. "-1"
-        item:GetChild("n11").text = gameName
+    --     -- item:GetChild("n11").text = gameName
-        if (index == 0) then
+    --     if (index == 0) then
-            item:GetChild("n11").text = ""
+    --         -- item:GetChild("n11").text = ""
-        end
+    --     end
-    end
+    -- end
     item:GetChild("n22").text = index + 1
 end
 

fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua

@@ -4,8 +4,8 @@ local M = EXGameInfo
 
 
 function EXGameInfo.new(blur_view)
-    setmetatable(M, {__index = IGameInfo})
+	setmetatable(M, { __index = IGameInfo })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "EXGameInfo"
 
 	UIPackage.AddPackage("extend/majiang/changsha/ui/Info_MJ_ChangSha")
@@ -15,49 +15,44 @@ end
 function M:FillData()
 	self._maxPlayer = 4   -- 默认玩家人数
 	self._roundChoice = 4 -- 回合选项数
-    if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_ChangSha/Cgm_create_room")
 	else
 		self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_ChangSha/Cgm_create_room_yueyang")
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self._config:GetController("xipai").selectedIndex=0
+		self._config:GetController("xipai").selectedIndex = 0
 
-		self.xipaiValueText=self._config:GetChild('xipaifen')
+		self.xipaiValueText = self._config:GetChild('xipaifen')
-		self.xipaiValueText.text=1
+		self.xipaiValueText.text = 1
-		self.xipaiValue=1
+		self.xipaiValue = 1
 
-		self.anchouValueText=self._config:GetChild('anchoufen')
+		self.anchouValueText = self._config:GetChild('anchoufen')
-		self.anchouValueText.text=1
+		self.anchouValueText.text = 1
-		self.anchouValue=1
+		self.anchouValue = 1
 
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-								ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-							self.xipaiValueText.text=value/1000
+					self.xipaiValueText.text = value / 1000
-							self.xipaiValue=value/1000
+					self.xipaiValue = value / 1000
-						
 				end, 3, nil)
 				gniv:Show()
-						
-						
 			end
 		)
 
@@ -65,37 +60,30 @@ function M:FillData()
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-								ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-							self.anchouValueText.text=value/1000
+					self.anchouValueText.text = value / 1000
-							self.anchouValue=value/1000
+					self.anchouValue = value / 1000
-						
 				end, 3, nil)
 				gniv:Show()
-						
-						
 			end
 		)
-		
 	end
-    
 end
 
-local _help_url= "ui://Info_MJ_ChangSha/Com_help"
+local _help_url = "ui://Info_MJ_ChangSha/Com_help"
 function M:GetHelpUrl()
 	return _help_url
 end
@@ -105,12 +93,12 @@ function M:GetIconUrl()
 	return _icon_url
 end
 
-local _icon_url1 = "ui://Info_MJ_ChangSha/icon1"
+local _icon_url1 = "ui://NewGroup/group_changsha"
 function M:GetIconUrl1()
 	return _icon_url1
 end
 
-local _play_list ={} --{"长沙麻将","三人长沙","二人长沙"}
+local _play_list = {} --{"长沙麻将","三人长沙","二人长沙"}
 function M:GetPlayList()
 	return _play_list
 end
@@ -118,7 +106,7 @@ end
 function M:SelectedConfigData()
 	local _config           = self._config
 	local round             = _config:GetController("round").selectedIndex + 1 --== 0 and 1 or 2
-    self._maxPlayer = _config:GetController("play_list").selectedIndex+2
+	self._maxPlayer         = _config:GetController("play_list").selectedIndex + 2
 
 	local zhuangxian        = _config:GetChild("btn_zhuangxian").selected and true or false
 	-- local piaofen = _config:GetChild("btn_piaofen").selected and true or false
@@ -137,7 +125,8 @@ function M:SelectedConfigData()
 	local niao_type         = _config:GetController("niao").selectedIndex
 	local niao_num          = _config:GetController("niao_num").selectedIndex
 	local niao_db_num       = _config:GetController("niao_db_num").selectedIndex
-    local niao = niao_type == 1 and (niao_db_num == 0 and 1 or 2) or (niao_type == 0 and (niao_num == 0 and 2 or (niao_num == 1 and 4 or 6)) or 2)
+	local niao              = niao_type == 1 and (niao_db_num == 0 and 1 or 2) or
+	(niao_type == 0 and (niao_num == 0 and 2 or (niao_num == 1 and 4 or 6)) or 2)
 	local piao_niao         = _config:GetChild("btn_piao_niao").selected
 	local two_pair          = _config:GetChild("btn_two_pair").selected
 	local no_jiang          = _config:GetChild("btn_no_jiang").selected
@@ -148,42 +137,42 @@ function M:SelectedConfigData()
 	local banyiquan         = _config:GetChild("btn_banyiquan").selected
 	local menqing           = _config:GetChild("btn_menqing").selected
 
-	local fengding_score=0
+	local fengding_score    = 0
 	if _config:GetController("fengding") then
-		fengding_score=_config:GetController("fengding").selectedIndex
+		fengding_score = _config:GetController("fengding").selectedIndex
 	end
 
-	local piao_niao1=0
+	local piao_niao1 = 0
 	if _config:GetController('piao') then
-		piao_niao1=_config:GetController('piao').selectedIndex
+		piao_niao1 = _config:GetController('piao').selectedIndex
 	end
-	local piao1=false
+	local piao1 = false
-	local piao2=false
+	local piao2 = false
-	local piao3=false
+	local piao3 = false
-	local piao_niao_opt=0
+	local piao_niao_opt = 0
-	if piao_niao1==2 then
+	if piao_niao1 == 2 then
-		piao_niao_opt=_config:GetController("piaofen").selectedIndex
+		piao_niao_opt = _config:GetController("piaofen").selectedIndex
 	end
 
-	local xi_pai=false
+	local xi_pai = false
-	local xi_paifen=0
+	local xi_paifen = 0
 	if _config:GetChild("xipai") then
-		xi_pai=_config:GetChild("xipai").selected
+		xi_pai = _config:GetChild("xipai").selected
 	end
 
-	local niaofen_opt=0
+	local niaofen_opt = 0
-	local niaofen_score=1
+	local niaofen_score = 1
-	local difen_score=1
+	local difen_score = 1
-	local kai_gong=0
+	local kai_gong = 0
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		niaofen_opt=_config:GetController("niaoadd").selectedIndex
+		niaofen_opt = _config:GetController("niaoadd").selectedIndex
-		niaofen_score= tonumber(_config:GetController("niaodf").selectedPage)
+		niaofen_score = tonumber(_config:GetController("niaodf").selectedPage)
-		difen_score= tonumber(_config:GetController("jcdifen").selectedPage)
+		difen_score = tonumber(_config:GetController("jcdifen").selectedPage)
-		kai_gong=_config:GetController("kaigang").selectedIndex
+		kai_gong = _config:GetController("kaigang").selectedIndex
 	end
 
 
----------
+	---------
 	local _data = {}
 	_data["opt"] = round
 	_data["maxPlayers"] = self._maxPlayer
@@ -205,14 +194,14 @@ function M:SelectedConfigData()
 	_data["niao_type"] = niao_type
 
 
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_data["niao"] = niao
 	else
 		_data["niao"] = tonumber(_config:GetController("niao_num").selectedPage)
 	end
 
 
-    if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_data["piao_niao"] = piao_niao
 	else
 		_data["piao_niao"] = piao_niao1
@@ -231,36 +220,35 @@ function M:SelectedConfigData()
 	_data['piao2'] = piao2
 	_data['piao3'] = piao3
 
-	auto_piao=false
+	auto_piao = false
-	if piao_niao1==2 then
+	if piao_niao1 == 2 then
 		if piao1 or piao2 or piao3 then
-			auto_piao=true
+			auto_piao = true
 		end
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
 		_data['auto_piao'] = auto_piao
 	end
 
 	_data['xi_pai'] = xi_pai
 	_data['piao_niao_opt'] = piao_niao_opt
 
-	local xi_pai_score=0
+	local xi_pai_score = 0
-	local an_chou_score=0
+	local an_chou_score = 0
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		xi_pai_score=self.xipaiValue
+		xi_pai_score = self.xipaiValue
-		an_chou_score=self.anchouValue
+		an_chou_score = self.anchouValue
 	end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
+	_data['xi_pai_score'] = xi_pai_score * 1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['an_chou_score'] = an_chou_score * 1000
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
 		_data['niaofen_opt'] = niaofen_opt
 		_data['niaofen_score'] = niaofen_score
 		_data['difen_score'] = difen_score
 		_data['kai_gong'] = kai_gong
-		
 	end
 
 
@@ -268,13 +256,11 @@ function M:SelectedConfigData()
 	return _data
 end
 
-
-
 function M:LoadConfigData(data)
 	pt(data)
 	local _config = self._config
 	_config:GetController("round").selectedIndex = data.opt - 1 -- == 1 and 0 or 1
-    _config:GetController("play_list").selectedIndex = data.maxPlayers-2
+	_config:GetController("play_list").selectedIndex = data.maxPlayers - 2
 
 	_config:GetChild("btn_zhuangxian").selected = data.zhuangxian
 	_config:GetChild("btn_zimo").selected = data.zimo
@@ -292,13 +278,14 @@ function M:LoadConfigData(data)
 
 	_config:GetController("niao").selectedIndex = data.niao_type
 
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
-		_config:GetController("niao_num").selectedIndex = data.niao_type ~= 0 and 0 or (data.niao == 4 and 1 or (data.niao == 6 and 2 or 0))
+		_config:GetController("niao_num").selectedIndex = data.niao_type ~= 0 and 0 or
+		(data.niao == 4 and 1 or (data.niao == 6 and 2 or 0))
 	else
-		_config:GetController("niao_num").selectedIndex=data.niao/2-1
+		_config:GetController("niao_num").selectedIndex = data.niao / 2 - 1
 	end
 	_config:GetController("niao_db_num").selectedIndex = data.niao_type ~= 1 and 0 or (data.niao == 1 and 0 or 1)
-    if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_config:GetChild("btn_piao_niao").selected = data.piao_niao
 	end
 	_config:GetChild("btn_two_pair").selected = data.two_pair
@@ -311,40 +298,38 @@ function M:LoadConfigData(data)
 	_config:GetChild("btn_menqing").selected = data.menqing or false
 
 	if _config:GetController("fengding") then
-		_config:GetController("fengding").selectedIndex=data.fengding_score
+		_config:GetController("fengding").selectedIndex = data.fengding_score
 	end
 
 	if _config:GetController("piao") then
-		_config:GetController("piao").selectedIndex=data.piao_niao
+		_config:GetController("piao").selectedIndex = data.piao_niao
-		_config:GetChild('pf1').selected=data.piao1
+		_config:GetChild('pf1').selected = data.piao1
-		_config:GetChild('pf2').selected=data.piao2
+		_config:GetChild('pf2').selected = data.piao2
-		_config:GetChild('pf3').selected=data.piao3
+		_config:GetChild('pf3').selected = data.piao3
 	end
 
 	if _config:GetChild("xipai") then
-		_config:GetChild("xipai").selected=data.xi_pai
+		_config:GetChild("xipai").selected = data.xi_pai
 	end
 
 	if _config:GetController("piaofen") then
-		_config:GetController("piaofen").selectedIndex=data.piao_niao_opt
+		_config:GetController("piaofen").selectedIndex = data.piao_niao_opt
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
+		self.xipaiValueText.text = data.xi_pai_score / 1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValue = data.xi_pai_score / 1000
 
-		self.anchouValueText.text=data.an_chou_score/1000
+		self.anchouValueText.text = data.an_chou_score / 1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValue = data.an_chou_score / 1000
-	end
-	
-	if oldGameVersion==2 then
-		_config:GetController("niaoadd").selectedIndex=data.niaofen_opt or 0
-		_config:GetController("niaodf").selectedIndex=data.niaofen_score-1
-		_config:GetController("jcdifen").selectedIndex=data.difen_score-1
-		_config:GetController("kaigang").selectedIndex=data.kai_gong
 	end
 
+	if oldGameVersion == 2 then
+		_config:GetController("niaoadd").selectedIndex = data.niaofen_opt or 0
+		_config:GetController("niaodf").selectedIndex = data.niaofen_score - 1
+		_config:GetController("jcdifen").selectedIndex = data.difen_score - 1
+		_config:GetController("kaigang").selectedIndex = data.kai_gong
 	end
+end
 
 return M
-            

fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXGameInfo.lua

@@ -3,8 +3,8 @@ local EXGameInfo = {}
 local M = EXGameInfo
 
 function EXGameInfo.new(blur_view)
-    setmetatable(M, {__index = IGameInfo})
+	setmetatable(M, { __index = IGameInfo })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = "EXGameInfo"
 	UIPackage.AddPackage("extend/majiang/hongzhong/ui/Info_MJ_HongZhong")
 	return self
@@ -14,48 +14,43 @@ function M:FillData()
 	self._maxPlayer = 4 -- 默认玩家人数
 	self._roundChoice = 4 -- 回合选项数
 
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_HongZhong/Cgm_create_room")
 	else
 		self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_HongZhong/Cgm_create_room_yueyang")
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self._config:GetController("xipai").selectedIndex=0
+		self._config:GetController("xipai").selectedIndex = 0
 
-		self.xipaiValueText=self._config:GetChild('xipaifen')
+		self.xipaiValueText = self._config:GetChild('xipaifen')
-		self.xipaiValue=1
+		self.xipaiValue = 1
 
-		self.anchouValueText=self._config:GetChild('anchoufen')
+		self.anchouValueText = self._config:GetChild('anchoufen')
-		self.anchouValueText.text=1
+		self.anchouValueText.text = 1
-		self.anchouValue=1
+		self.anchouValue = 1
 
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-						ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-					self.xipaiValueText.text=value/1000
+					self.xipaiValueText.text = value / 1000
-					self.xipaiValue=value/1000
+					self.xipaiValue = value / 1000
-				
 				end, 3, nil)
 				gniv:Show()
-				
-				
 			end
 		)
 
@@ -64,37 +59,30 @@ function M:FillData()
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-						ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-					self.anchouValueText.text=value/1000
+					self.anchouValueText.text = value / 1000
-					self.anchouValue=value/1000
+					self.anchouValue = value / 1000
-				
 				end, 3, nil)
 				gniv:Show()
-				
-				
 			end
 		)
-		
 	end
-	
 end
 
-local _help_url= "ui://Info_MJ_HongZhong/Com_help"
+local _help_url = "ui://Info_MJ_HongZhong/Com_help"
 function M:GetHelpUrl()
 	return _help_url
 end
@@ -104,12 +92,12 @@ function M:GetIconUrl()
 	return _icon_url
 end
 
-local _icon_url1 = "ui://Info_MJ_HongZhong/icon1"
+local _icon_url1 = "ui://NewGroup/group_hongzhong"
 function M:GetIconUrl1()
 	return _icon_url1
 end
 
-local _play_list = {}--{"红中麻将","三人红中","二人红中"}
+local _play_list = {} --{"红中麻将","三人红中","二人红中"}
 function M:GetPlayList()
 	return _play_list
 end
@@ -117,7 +105,7 @@ end
 function M:SelectedConfigData()
 	local _config            = self._config
 	local round              = _config:GetController("round").selectedIndex + 1
-    local people = _config:GetController("play_list").selectedIndex+2
+	local people             = _config:GetController("play_list").selectedIndex + 2
 	local qiangkong          = _config:GetChild("btn_qgh").selected and true or false
 	local qiangkong_niao     = _config:GetChild("btn_qghjm").selected and true or false
 	local seven_pair         = _config:GetChild("btn_qidui").selected and true or false
@@ -132,16 +120,16 @@ function M:SelectedConfigData()
 	local wuguizhuopaojiabei = _config:GetChild("btn_wuhongzhongzuobaofanbei").selected
 
 	----------
-	local piao_niao1=0
+	local piao_niao1         = 0
 	if _config:GetController('piao') then
-		piao_niao1=_config:GetController('piao').selectedIndex
+		piao_niao1 = _config:GetController('piao').selectedIndex
 	end
-	local piao1=false
+	local piao1 = false
-	local piao2=false
+	local piao2 = false
-	local piao3=false
+	local piao3 = false
-	local piao_niao_opt=0
+	local piao_niao_opt = 0
-	if piao_niao1==2 then
+	if piao_niao1 == 2 then
-		piao_niao_opt=_config:GetController("piaofen").selectedIndex
+		piao_niao_opt = _config:GetController("piaofen").selectedIndex
 	end
 
 
@@ -150,29 +138,29 @@ function M:SelectedConfigData()
 		laizi4_hu = _config:GetChild("btn_sihongzhong").selected
 	end
 
-	local hz_hu =false
+	local hz_hu = false
 	if _config:GetChild("btn_wuhongzhong") then
 		hz_hu = _config:GetChild("btn_wuhongzhong").selected
 	end
 
-	local wuguijiabei =false
+	local wuguijiabei = false
 	if _config:GetChild("btn_wuhongzhongzimo") then
 		wuguijiabei = _config:GetChild("btn_wuhongzhongzimo").selected
 	end
 
-	local di_fen=false
+	local di_fen = false
 	if _config:GetController('difen') then
-		di_fen=_config:GetController('difen').selectedIndex
+		di_fen = _config:GetController('difen').selectedIndex
 	end
 
-	local xi_pai=false
+	local xi_pai = false
 	if _config:GetChild("xipai") then
-		xi_pai=_config:GetChild("xipai").selected
+		xi_pai = _config:GetChild("xipai").selected
 	end
 
-	local fengding_score=0
+	local fengding_score = 0
 	if _config:GetController("fengding") then
-		fengding_score=_config:GetController("fengding").selectedIndex
+		fengding_score = _config:GetController("fengding").selectedIndex
 	end
 	----------
 
@@ -185,7 +173,7 @@ function M:SelectedConfigData()
 	_data["qiangkong"] = qiangkong
 	_data["qiangkong_niao"] = not qiangkong and false or qiangkong_niao
 	_data["niao"] = niao_type
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_data["niao_opt"] = niao_type == 2 and 1 or (niao_type == 3 and wo_niao or zha_ma)
 	else
 		_data["niao_opt"] = niao_type == 2 and 1 or (niao_type == 3 and wo_niao or zha_ma)
@@ -196,7 +184,7 @@ function M:SelectedConfigData()
 
 	_data["laizi8"] = laizi
 	_data["AA"] = aa
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_data["piao_niao"] = piao_niao
 	else
 		_data["piao_niao"] = piao_niao1
@@ -213,24 +201,24 @@ function M:SelectedConfigData()
 	_data['di_fen'] = di_fen
 	_data['xi_pai'] = xi_pai
 
-	auto_piao=false
+	auto_piao = false
-	if piao_niao==2 then
+	if piao_niao == 2 then
 		if piao1 or piao2 or piao3 then
-			auto_piao=true
+			auto_piao = true
 		end
 	end
 	_data['auto_piao'] = auto_piao
 	_data['piao_niao_opt'] = piao_niao_opt
 
-	local xi_pai_score=0
+	local xi_pai_score = 0
-	local an_chou_score=0
+	local an_chou_score = 0
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		xi_pai_score=self.xipaiValue
+		xi_pai_score = self.xipaiValue
-		an_chou_score=self.anchouValue
+		an_chou_score = self.anchouValue
 	end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
+	_data['xi_pai_score'] = xi_pai_score * 1000
-	_data['an_chou_score'] = an_chou_score*1000
+	_data['an_chou_score'] = an_chou_score * 1000
 
 	_data["fengding_score"] = fengding_score
 	_data["wuguizhuopaojiabei"] = wuguizhuopaojiabei
@@ -241,8 +229,8 @@ end
 
 function M:LoadConfigData(data)
 	local _config = self._config
-    _config:GetController("round").selectedIndex = data.opt-1
+	_config:GetController("round").selectedIndex = data.opt - 1
-    _config:GetController("play_list").selectedIndex = data.maxPlayers-2
+	_config:GetController("play_list").selectedIndex = data.maxPlayers - 2
 	_config:GetChild("btn_qgh").selected = data.qiangkong
 	_config:GetChild("btn_qghjm").selected = data.qiangkong_niao
 	_config:GetChild("btn_qidui").selected = data.qidui
@@ -257,52 +245,50 @@ function M:LoadConfigData(data)
 
 	_config:GetChild("btn_laizi").selected = data.laizi8
 	_config:GetController("Cost").selectedIndex = data.AA or 0
-	if oldGameVersion==1 then
+	if oldGameVersion == 1 then
 		_config:GetChild("btn_piao_niao").selected = data.piao_niao
 	end
 	_config:GetController("jiangma").selectedIndex = data.jiangma
 
 
 	if _config:GetController("piao") then
-		_config:GetController("piao").selectedIndex=data.piao_niao
+		_config:GetController("piao").selectedIndex = data.piao_niao
-		_config:GetChild('pf1').selected=data.piao1
+		_config:GetChild('pf1').selected = data.piao1
-		_config:GetChild('pf2').selected=data.piao2
+		_config:GetChild('pf2').selected = data.piao2
-		_config:GetChild('pf3').selected=data.piao3
+		_config:GetChild('pf3').selected = data.piao3
 	end
 
 	if _config:GetChild("btn_sihongzhong") then
-		 _config:GetChild("btn_sihongzhong").selected=data.laizi4_hu
+		_config:GetChild("btn_sihongzhong").selected = data.laizi4_hu
-		 _config:GetChild("btn_wuhongzhong").selected=data.hz_hu
+		_config:GetChild("btn_wuhongzhong").selected = data.hz_hu
-		_config:GetChild("btn_wuhongzhongzimo").selected=data.wuguijiabei
+		_config:GetChild("btn_wuhongzhongzimo").selected = data.wuguijiabei
 	end
 
 	if _config:GetController("difen") then
-		 _config:GetController("difen").selectedIndex=data.di_fen
+		_config:GetController("difen").selectedIndex = data.di_fen
 	end
 
 	if _config:GetChild("xipai") then
-		_config:GetChild("xipai").selected=data.xi_pai
+		_config:GetChild("xipai").selected = data.xi_pai
 	end
 
 	if _config:GetController("piaofen") then
-		_config:GetController("piaofen").selectedIndex=data.piao_niao_opt
+		_config:GetController("piaofen").selectedIndex = data.piao_niao_opt
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
+		self.xipaiValueText.text = data.xi_pai_score / 1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValue = data.xi_pai_score / 1000
 
-		self.anchouValueText.text=data.an_chou_score/1000
+		self.anchouValueText.text = data.an_chou_score / 1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValue = data.an_chou_score / 1000
 	end
 
 	if _config:GetController("fengding") then
-		_config:GetController("fengding").selectedIndex=data.fengding_score
+		_config:GetController("fengding").selectedIndex = data.fengding_score
 	end
 
-	_config:GetChild("btn_wuhongzhongzuobaofanbei").selected=data.wuguizhuopaojiabei
+	_config:GetChild("btn_wuhongzhongzuobaofanbei").selected = data.wuguizhuopaojiabei
-	
+end
- end 
 
 return M
-            

fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameInfo.lua

@@ -3,8 +3,8 @@ local EXGameInfo = {}
 local M = EXGameInfo
 
 function EXGameInfo.new(blur_view)
-    setmetatable(M, {__index = IGameInfo})
+    setmetatable(M, { __index = IGameInfo })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = 'EXGameInfo'
     UIPackage.AddPackage('extend/zipai/changdepaohuzi/ui/Extend_Poker_ChangdeWHZ')
     UIPackage.AddPackage('extend/zipai/changdepaohuzi/ui/Info_Poker_ChangdeWHZ')
@@ -16,74 +16,64 @@ function M:FillData()
     self._roundChoice = 3 -- 回合选项数
     self._config = UIPackage.CreateObjectFromURL('ui://Extend_Poker_ChangdeWHZ/Cgm_create_room')
 
-	if oldGameVersion ==1 then
+    if oldGameVersion == 1 then
-		self._config:GetChild("xipai").visible=false
+        self._config:GetChild("xipai").visible = false
     end
 
-    if oldGameVersion==2 then
+    if oldGameVersion == 2 then
-		self._config:GetController("xipai").selectedIndex=1		
+        self._config:GetController("xipai").selectedIndex = 1
-		self.xipaiValueText=self._config:GetChild('xipaifen')
+        self.xipaiValueText = self._config:GetChild('xipaifen')
-		self.xipaiValueText.text=1
+        self.xipaiValueText.text = 1
-		self.xipaiValue=1
+        self.xipaiValue = 1
 
-        self.anchouValueText=self._config:GetChild('anchoufen')
+        self.anchouValueText = self._config:GetChild('anchoufen')
-		self.anchouValueText.text=1
+        self.anchouValueText.text = 1
-		self.anchouValue=1
+        self.anchouValue = 1
 
         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
+                    elseif otype == -1 then
                         value = value - ad2d(num)
                     else
                         value = ad2d(num)
                     end
 
                     if value < 0 then
-								ViewUtil.ErrorTip(1,"输入数据异常！")
+                        ViewUtil.ErrorTip(1, "输入数据异常！")
                     end
 
-							self.xipaiValueText.text=value/1000
+                    self.xipaiValueText.text = value / 1000
-							self.xipaiValue=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
+                    elseif otype == -1 then
                         value = value - ad2d(num)
                     else
                         value = ad2d(num)
                     end
 
                     if value < 0 then
-                                ViewUtil.ErrorTip(1,"输入数据异常！")
+                        ViewUtil.ErrorTip(1, "输入数据异常！")
                     end
 
-                            self.anchouValueText.text=value/1000
+                    self.anchouValueText.text = value / 1000
-                            self.anchouValue=value/1000
+                    self.anchouValue = value / 1000
-                        
                 end, 3, nil)
                 gniv:Show()
-                        
-                        
             end
         )
     end
@@ -191,6 +181,7 @@ function M:FillData()
         end
     )
 end
+
 local _help_url = 'ui://Info_Poker_ChangdeWHZ/Com_help'
 function M:GetHelpUrl()
     return _help_url
@@ -201,12 +192,12 @@ function M:GetIconUrl()
     return _icon_url
 end
 
-local _icon_url1 = "ui://Info_Poker_ChangdeWHZ/icon1"
+local _icon_url1 = "ui://NewGroup/group_paohuzi"
 function M:GetIconUrl1()
     return _icon_url1
 end
 
-local _play_list = {"全名堂","红黑点","多红多番"}
+local _play_list = { "全名堂", "红黑点", "多红多番" }
 function M:GetPlayList()
     return _play_list
 end
@@ -214,7 +205,7 @@ end
 function M:SelectedConfigData()
     local _config = self._config
     local wanfa_C = _config:GetController('btn_Controller').selectedIndex
-    local round = _config:GetController('round').selectedIndex+1 --== 0 and 1 or 2
+    local round = _config:GetController('round').selectedIndex + 1 --== 0 and 1 or 2
     local Cost = _config:GetController('Cost').selectedIndex
     local tun = _config:GetController('tun').selectedIndex
     local fengding = _config:GetController('fengding').selectedIndex
@@ -267,8 +258,8 @@ function M:SelectedConfigData()
         _data['qupai'] = false
     end
 
-	local xi_pai=false
+    local xi_pai = false
-	if oldGameVersion ==2 then
+    if oldGameVersion == 2 then
         if _config:GetChild("xipai") then
             xi_pai = _config:GetChild("xipai").selected
         end
@@ -276,16 +267,16 @@ function M:SelectedConfigData()
 
     _data['xi_pai'] = xi_pai
 
-    local xi_pai_score=0
+    local xi_pai_score = 0
-	local an_chou_score=0
+    local an_chou_score = 0
 
-	if oldGameVersion==2 then
+    if oldGameVersion == 2 then
-		xi_pai_score=self.xipaiValue
+        xi_pai_score = self.xipaiValue
-		an_chou_score=self.anchouValue
+        an_chou_score = self.anchouValue
     end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
+    _data['xi_pai_score'] = xi_pai_score * 1000
-    _data['an_chou_score'] = an_chou_score*1000
+    _data['an_chou_score'] = an_chou_score * 1000
 
     _data['xi_pai'] = xi_pai
     return _data
@@ -327,19 +318,19 @@ function M:LoadConfigData(data)
     end
 
     if _config:GetChild("xipai") then
-		_config:GetChild("xipai").selected=data.xi_pai
+        _config:GetChild("xipai").selected = data.xi_pai
     end
 
 
-    if oldGameVersion==2 then
+    if oldGameVersion == 2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
+        self.xipaiValueText.text = data.xi_pai_score / 1000
-		self.xipaiValue=data.xi_pai_score/1000
+        self.xipaiValue = data.xi_pai_score / 1000
 
-		self.anchouValueText.text=data.an_chou_score/1000
+        self.anchouValueText.text = data.an_chou_score / 1000
-		self.anchouValue=data.an_chou_score/1000
+        self.anchouValue = data.an_chou_score / 1000
     end
-	
 end
+
 function M:OnChangeOption(ctype)
     IGameInfo.OnChangeOption(self, ctype)
     local people = self._config:GetController('renshu')
@@ -350,4 +341,5 @@ function M:OnChangeOption(ctype)
         end
     )
 end
+
 return M

fk101/lua_probject/extend_project/extend/zipai/fulushou/EXGameInfo.lua

@@ -3,8 +3,8 @@ local EXGameInfo = {}
 local M = EXGameInfo
 
 function EXGameInfo.new(blur_view)
-    setmetatable(M, {__index = IGameInfo})
+	setmetatable(M, { __index = IGameInfo })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = 'EXGameInfo'
 	UIPackage.AddPackage('extend/zipai/fulushou/ui/Info_Poker_FuLuShou')
 	return self
@@ -15,47 +15,42 @@ function M:FillData()
 	self._maxPlayer = 3   -- 默认玩家人数
 	self._roundChoice = 2 -- 回合选项数
 	self._config = UIPackage.CreateObjectFromURL('ui://Info_Poker_FuLuShou/Cgm_create_room')
-	if oldGameVersion ==1 then
+	if oldGameVersion == 1 then
-		self._config:GetController("xipai").selectedIndex=0
+		self._config:GetController("xipai").selectedIndex = 0
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self._config:GetController("xipai").selectedIndex=1
+		self._config:GetController("xipai").selectedIndex = 1
 
-		self.xipaiValueText=self._config:GetChild('xipaifen')
+		self.xipaiValueText = self._config:GetChild('xipaifen')
-		self.xipaiValueText.text=1
+		self.xipaiValueText.text = 1
-		self.xipaiValue=1
+		self.xipaiValue = 1
 
-		self.anchouValueText=self._config:GetChild('anchoufen')
+		self.anchouValueText = self._config:GetChild('anchoufen')
-		self.anchouValueText.text=1
+		self.anchouValueText.text = 1
-		self.anchouValue=1
+		self.anchouValue = 1
 
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-								ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-							self.xipaiValueText.text=value/1000
+					self.xipaiValueText.text = value / 1000
-							self.xipaiValue=value/1000
+					self.xipaiValue = value / 1000
-						
 				end, 3, nil)
 				gniv:Show()
-						
-						
 			end
 		)
 
@@ -63,35 +58,29 @@ function M:FillData()
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-						ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-					self.anchouValueText.text=value/1000
+					self.anchouValueText.text = value / 1000
-					self.anchouValue=value/1000
+					self.anchouValue = value / 1000
-				
 				end, 3, nil)
 				gniv:Show()
-				
-				
 			end
 		)
-
 	end
-	
 end
+
 local _help_url = 'ui://Info_Poker_FuLuShou/Com_help'
 function M:GetHelpUrl()
 	return _help_url
@@ -102,7 +91,7 @@ function M:GetIconUrl()
 	return _icon_url
 end
 
-local _icon_url1 = "ui://Info_Poker_FuLuShou/icon1"
+local _icon_url1 = "ui://NewGroup/group_fulushou"
 function M:GetIconUrl1()
 	return _icon_url1
 end
@@ -115,25 +104,25 @@ end
 function M:SelectedConfigData()
 	local _config = self._config
 	local round = _config:GetController('round').selectedIndex == 0 and 1 or 2
-    local renshu = _config:GetController('play_list').selectedIndex +2
+	local renshu = _config:GetController('play_list').selectedIndex + 2
 
-	local xuan_zhuang=_config:GetController('zhuangjia').selectedIndex
+	local xuan_zhuang = _config:GetController('zhuangjia').selectedIndex
-	local piao=_config:GetController('piao').selectedIndex
+	local piao = _config:GetController('piao').selectedIndex
-	local piao1=false
+	local piao1 = false
-	local piao2=false
+	local piao2 = false
-	local piao3=false
+	local piao3 = false
-	local piao4=false
+	local piao4 = false
-	if piao==3 then
+	if piao == 3 then
-		piao1=_config:GetChild('pf1').selected and true or false
+		piao1 = _config:GetChild('pf1').selected and true or false
-		piao2=_config:GetChild('pf2').selected and true or false
+		piao2 = _config:GetChild('pf2').selected and true or false
-		piao3=_config:GetChild('pf3').selected and true or false
+		piao3 = _config:GetChild('pf3').selected and true or false
-		piao4=_config:GetChild('pf4').selected and true or false
+		piao4 = _config:GetChild('pf4').selected and true or false
 	end
-	local fen_diejia=_config:GetController('fen').selectedIndex
+	local fen_diejia = _config:GetController('fen').selectedIndex
 
-	local qing_zui_hu=_config:GetController('qinzuihu').selectedIndex
+	local qing_zui_hu = _config:GetController('qinzuihu').selectedIndex
-	local gang_zhao_liu_xi=_config:GetChild('gangzhao').selected and true or false
+	local gang_zhao_liu_xi = _config:GetChild('gangzhao').selected and true or false
-	local special_peng_peng_hu=_config:GetChild('pengpenghu').selected and true or false
+	local special_peng_peng_hu = _config:GetChild('pengpenghu').selected and true or false
 
 	local piao_fen = _config:GetController('piaofen').selectedIndex
 
@@ -162,24 +151,24 @@ function M:SelectedConfigData()
 	end
 
 
-	local xi_pai=false
+	local xi_pai = false
-	if oldGameVersion ==2 then
+	if oldGameVersion == 2 then
 		if _config:GetChild("xipai") then
 			xi_pai = _config:GetChild("xipai").selected
 		end
 	end
 	_data['xi_pai'] = xi_pai
 
-	local xi_pai_score=0
+	local xi_pai_score = 0
-	local an_chou_score=0
+	local an_chou_score = 0
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		xi_pai_score=self.xipaiValue
+		xi_pai_score = self.xipaiValue
-		an_chou_score=self.anchouValue
+		an_chou_score = self.anchouValue
 	end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
+	_data['xi_pai_score'] = xi_pai_score * 1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['an_chou_score'] = an_chou_score * 1000
 
 
 	return _data
@@ -188,14 +177,14 @@ end
 function M:LoadConfigData(data)
 	local _config = self._config
 
-    _config:GetController('play_list').selectedIndex = data.maxPlayers -2
+	_config:GetController('play_list').selectedIndex = data.maxPlayers - 2
 	_config:GetController('round').selectedIndex = data.opt == 1 and 0 or 1
-	_config:GetController('zhuangjia').selectedIndex= data.xuan_zhuang
+	_config:GetController('zhuangjia').selectedIndex = data.xuan_zhuang
-	_config:GetController('piao').selectedIndex= data.piao
+	_config:GetController('piao').selectedIndex = data.piao
-	_config:GetChild('pf1').selected=data.piao1
+	_config:GetChild('pf1').selected = data.piao1
-	_config:GetChild('pf2').selected=data.piao2
+	_config:GetChild('pf2').selected = data.piao2
-	_config:GetChild('pf3').selected=data.piao3
+	_config:GetChild('pf3').selected = data.piao3
-	_config:GetChild('pf4').selected=data.piao4
+	_config:GetChild('pf4').selected = data.piao4
 
 	if (data.piao_fen == 1) then
 		_config:GetController('piaofen').selectedIndex = 0
@@ -209,24 +198,23 @@ function M:LoadConfigData(data)
 
 
 
-	_config:GetController('fen').selectedIndex= data.fen_diejia
+	_config:GetController('fen').selectedIndex = data.fen_diejia
 
-	_config:GetController('qinzuihu').selectedIndex= data.qing_zui_hu
+	_config:GetController('qinzuihu').selectedIndex = data.qing_zui_hu
 	_config:GetChild('gangzhao').selected = data.gang_zhao_liu_xi
-	_config:GetChild('pengpenghu').selected= data.special_peng_peng_hu
+	_config:GetChild('pengpenghu').selected = data.special_peng_peng_hu
 
 	if _config:GetChild("xipai") then
-		_config:GetChild("xipai").selected=data.xi_pai
+		_config:GetChild("xipai").selected = data.xi_pai
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
+		self.xipaiValueText.text = data.xi_pai_score / 1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValue = data.xi_pai_score / 1000
 
-		self.anchouValueText.text=data.an_chou_score/1000
+		self.anchouValueText.text = data.an_chou_score / 1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValue = data.an_chou_score / 1000
 	end
-	
 end
 
 function M:OnChangeOption(ctype)
@@ -235,9 +223,10 @@ function M:OnChangeOption(ctype)
 	local play_list = self._config:GetController('play_list')
 	play_list.onChanged:Add(
 		function()
-            self._maxPlayer = play_list.selectedIndex +2
+			self._maxPlayer = play_list.selectedIndex + 2
 			self:ShowVariablePrice(ctype)
 		end
 	)
 end
+
 return M

fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameInfo.lua

@@ -3,8 +3,8 @@ local EXGameInfo = {}
 local M = EXGameInfo
 
 function EXGameInfo.new(blur_view)
-    setmetatable(M, {__index = IGameInfo})
+	setmetatable(M, { __index = IGameInfo })
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
 	self.class = 'EXGameInfo'
 	UIPackage.AddPackage('extend/zipai/yueyangwaihuzi/ui/Info_Poker_YueYangWHZ')
 	return self
@@ -15,47 +15,42 @@ function M:FillData()
 	self._roundChoice = 2 -- 回合选项数
 	self._config = UIPackage.CreateObjectFromURL('ui://Info_Poker_YueYangWHZ/Cgm_create_room')
 
-	if oldGameVersion ==1 then
+	if oldGameVersion == 1 then
-		self._config:GetController("xipai").selectedIndex=0
+		self._config:GetController("xipai").selectedIndex = 0
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self._config:GetController("xipai").selectedIndex=1
+		self._config:GetController("xipai").selectedIndex = 1
 
-		self.xipaiValueText=self._config:GetChild('xipaifen')
+		self.xipaiValueText = self._config:GetChild('xipaifen')
-		self.xipaiValueText.text=1
+		self.xipaiValueText.text = 1
-		self.xipaiValue=1
+		self.xipaiValue = 1
 
-		self.anchouValueText=self._config:GetChild('anchoufen')
+		self.anchouValueText = self._config:GetChild('anchoufen')
-		self.anchouValueText.text=1
+		self.anchouValueText.text = 1
-		self.anchouValue=1
+		self.anchouValue = 1
 
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-								ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-							self.xipaiValueText.text=value/1000
+					self.xipaiValueText.text = value / 1000
-							self.xipaiValue=value/1000
+					self.xipaiValue = value / 1000
-						
 				end, 3, nil)
 				gniv:Show()
-						
-						
 			end
 		)
 
@@ -63,34 +58,29 @@ function M:FillData()
 		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
+					elseif otype == -1 then
 						value = value - ad2d(num)
 					else
 						value = ad2d(num)
 					end
 
 					if value < 0 then
-						ViewUtil.ErrorTip(1,"输入数据异常！")
+						ViewUtil.ErrorTip(1, "输入数据异常！")
 					end
 
-					self.anchouValueText.text=value/1000
+					self.anchouValueText.text = value / 1000
-					self.anchouValue=value/1000
+					self.anchouValue = value / 1000
-				
 				end, 3, nil)
 				gniv:Show()
-				
-				
 			end
 		)
 	end
-	
 end
+
 local _help_url = 'ui://Info_Poker_YueYangWHZ/Com_help'
 function M:GetHelpUrl()
 	return _help_url
@@ -101,7 +91,7 @@ function M:GetIconUrl()
 	return _icon_url
 end
 
-local _icon_url1 = "ui://Info_Poker_YueYangWHZ/icon1"
+local _icon_url1 = "ui://NewGroup/group_waihuzi"
 function M:GetIconUrl1()
 	return _icon_url1
 end
@@ -114,18 +104,18 @@ end
 function M:SelectedConfigData()
 	local _config = self._config
 	local round = _config:GetController('round').selectedIndex == 0 and 1 or 2
-    local renshu = _config:GetController('play_list').selectedIndex +2
+	local renshu = _config:GetController('play_list').selectedIndex + 2
 
-	local kawai=_config:GetController('kawai').selectedIndex
+	local kawai = _config:GetController('kawai').selectedIndex
-	local piao=_config:GetController('piao').selectedIndex
+	local piao = _config:GetController('piao').selectedIndex
-	local first_rand_zhuang=_config:GetChild('suijizhuang').selected and true or false
+	local first_rand_zhuang = _config:GetChild('suijizhuang').selected and true or false
-	local zhuang_di_hu=_config:GetController('zdihu').selectedIndex
+	local zhuang_di_hu = _config:GetController('zdihu').selectedIndex
-	local hao_config=_config:GetController('hao').selectedIndex
+	local hao_config = _config:GetController('hao').selectedIndex
-	local hao_jiabei=_config:GetController('jiabei').selectedIndex
+	local hao_jiabei = _config:GetController('jiabei').selectedIndex
-	local ming_tang=_config:GetController('mingtang').selectedIndex
+	local ming_tang = _config:GetController('mingtang').selectedIndex
-	local qupai=0
+	local qupai = 0
-	if renshu==2 then
+	if renshu == 2 then
-		qupai=_config:GetController('qupai').selectedIndex
+		qupai = _config:GetController('qupai').selectedIndex
 	end
 
 	local _data = {}
@@ -140,24 +130,24 @@ function M:SelectedConfigData()
 	_data['first_rand_zhuang'] = first_rand_zhuang
 	_data['qupai'] = qupai
 
-	local xi_pai=false
+	local xi_pai = false
-	if oldGameVersion ==2 then
+	if oldGameVersion == 2 then
 		if _config:GetChild("xipai") then
 			xi_pai = _config:GetChild("xipai").selected
 		end
 	end
 	_data['xi_pai'] = xi_pai
 
-	local xi_pai_score=0
+	local xi_pai_score = 0
-	local an_chou_score=0
+	local an_chou_score = 0
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		xi_pai_score=self.xipaiValue
+		xi_pai_score = self.xipaiValue
-		an_chou_score=self.anchouValue
+		an_chou_score = self.anchouValue
 	end
 
-	_data['xi_pai_score'] = xi_pai_score*1000
+	_data['xi_pai_score'] = xi_pai_score * 1000
-    _data['an_chou_score'] = an_chou_score*1000
+	_data['an_chou_score'] = an_chou_score * 1000
 
 	return _data
 end
@@ -165,29 +155,28 @@ end
 function M:LoadConfigData(data)
 	local _config = self._config
 
-    _config:GetController('play_list').selectedIndex = data.maxPlayers -2
+	_config:GetController('play_list').selectedIndex = data.maxPlayers - 2
 	_config:GetController('round').selectedIndex = data.opt == 1 and 0 or 1
-   _config:GetController('kawai').selectedIndex=data.kawai
+	_config:GetController('kawai').selectedIndex = data.kawai
-   _config:GetController('piao').selectedIndex=data.piao
+	_config:GetController('piao').selectedIndex = data.piao
-	_config:GetChild('suijizhuang').selected =data.first_rand_zhuang
+	_config:GetChild('suijizhuang').selected = data.first_rand_zhuang
-	_config:GetController('zdihu').selectedIndex=data.zhuang_di_hu
+	_config:GetController('zdihu').selectedIndex = data.zhuang_di_hu
-	_config:GetController('hao').selectedIndex=data.hao_config
+	_config:GetController('hao').selectedIndex = data.hao_config
-	_config:GetController('jiabei').selectedIndex=data.hao_jiabei
+	_config:GetController('jiabei').selectedIndex = data.hao_jiabei
-	_config:GetController('mingtang').selectedIndex=data.ming_tang
+	_config:GetController('mingtang').selectedIndex = data.ming_tang
-	_config:GetController('qupai').selectedIndex=data.qupai
+	_config:GetController('qupai').selectedIndex = data.qupai
 
 	if _config:GetChild("xipai") then
-		_config:GetChild("xipai").selected=data.xi_pai
+		_config:GetChild("xipai").selected = data.xi_pai
 	end
 
-	if oldGameVersion==2 then
+	if oldGameVersion == 2 then
-		self.xipaiValueText.text=data.xi_pai_score/1000
+		self.xipaiValueText.text = data.xi_pai_score / 1000
-		self.xipaiValue=data.xi_pai_score/1000
+		self.xipaiValue = data.xi_pai_score / 1000
 
-		self.anchouValueText.text=data.an_chou_score/1000
+		self.anchouValueText.text = data.an_chou_score / 1000
-		self.anchouValue=data.an_chou_score/1000
+		self.anchouValue = data.an_chou_score / 1000
 	end
-	
 end
 
 function M:OnChangeOption(ctype)
@@ -196,9 +185,10 @@ function M:OnChangeOption(ctype)
 	local play_list = self._config:GetController('play_list')
 	play_list.onChanged:Add(
 		function()
-            self._maxPlayer = play_list.selectedIndex +2
+			self._maxPlayer = play_list.selectedIndex + 2
 			self:ShowVariablePrice(ctype)
 		end
 	)
 end
+
 return M

fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info

@@ -1,7 +1,7 @@
 {
   "objectStatus": {
-    "n28": {
+    "n54_lwcl": {
-      "collapsed": true
+      "hidden": true
     },
     "n125_g8kk": {
       "hidden": true
@@ -18,9 +18,6 @@
     "n130_naup": {
       "hidden": true
     },
-    "n54_lwcl": {
-      "hidden": true
-    },
     "n50_lwcl": {
       "hidden": true
     },

fk101/wb_new_ui/assets/Lobby/Main.xml

@@ -13,16 +13,6 @@
     <image id="n140_csp4" name="n140" src="csp47cn2" fileName="component/index/images/renwu.png" xy="104,159" aspect="true">
       <relation target="" sidePair="center-center%,middle-middle%"/>
     </image>
-    <image id="n56_lwcl" name="n56" src="xn94cls" fileName="images/index/head_bg@2x.png" xy="0,0" size="320,99" group="n28"/>
-    <component id="n29" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="7,9" group="n28" aspect="true"/>
-    <component id="n109_ker3" name="btn_setting" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="1097,23" size="94,94" group="n28" aspect="true">
-      <Button icon="ui://2d9xdj6zker3j9"/>
-    </component>
-    <text id="n26" name="tex_name" xy="90,16" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="老司机带带我"/>
-    <text id="n84_mv8k" name="tex_id" xy="90,45" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" autoSize="none" text="ID:123456"/>
-    <group id="n28" name="player_info_panel" xy="0,0" size="1191,117" advanced="true">
-      <relation target="" sidePair="left-left,top-top"/>
-    </group>
     <image id="n82_m0ei" name="n82" src="ker3j4" fileName="images/index/hall_bottom.png" xy="-80,656" size="1529,95" group="n7">
       <relation target="" sidePair="width-width%"/>
     </image>
@@ -109,6 +99,17 @@
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </component>
     <group id="n130_naup" name="n130" xy="-137,0" size="1609,752"/>
+    <image id="n56_lwcl" name="n56" src="xn94cls" fileName="images/index/head_bg@2x.png" xy="0,0" size="320,99" group="n28"/>
+    <component id="n29" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="7,9" group="n28" aspect="true"/>
+    <component id="n109_ker3" name="btn_setting" src="ker3j6" fileName="component/index/Btn_menu_top.xml" xy="1097,23" size="94,94" group="n28" aspect="true">
+      <relation target="" sidePair="right-right"/>
+      <Button icon="ui://2d9xdj6zker3j9"/>
+    </component>
+    <text id="n26" name="tex_name" xy="90,16" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="老司机带带我"/>
+    <text id="n84_mv8k" name="tex_id" xy="90,45" size="233,34" group="n28" font="ui://27vd145bqz637ij2" fontSize="22" color="#ffffff" autoSize="none" text="ID:123456"/>
+    <group id="n28" name="player_info_panel" xy="0,0" size="1191,117" advanced="true">
+      <relation target="" sidePair="left-left,top-top"/>
+    </group>
     <component id="n100_lumr" name="group" src="lumrgj" fileName="component/group/group.xml" xy="0,0" size="1334,750" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>

fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageOffsetX="-208" bgColor="#000000">
-  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="1"/>
+  <controller name="manager" pages="0,普通玩家,1,圈主,2,副圈主,3,合伙人" selected="0"/>
   <controller name="null" pages="0,,1," selected="0"/>
   <controller name="fag" pages="0,,1," selected="0"/>
   <controller name="floors" pages="0,,1,,2,,3,,4,,5," selected="0"/>
@@ -55,7 +55,7 @@
       <relation target="" sidePair="right-right,top-top"/>
       <Button icon="ui://m7iejg46rpazhvt"/>
     </component>
-    <component id="n190_nk4v" name="btn_bxx" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="591,13" size="71,71" controller="tip,0">
+    <component id="n190_nk4v" name="btn_bxx" src="mgnhhqh" fileName="component/Lst_info/Button3.xml" xy="851,14" size="71,71" controller="tip,0">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
       <gearXY controller="manager" pages="0,1,2,3" values="851,14|591,13|721,14|1109,14"/>
       <relation target="" sidePair="right-right,top-top"/>
@@ -86,7 +86,7 @@
     <text id="n77_i7lq" name="tex_id" xy="269,56" size="86,38" group="n78_i7lq" fontSize="30" color="#ffffff" autoSize="shrink" text="ID:1234567"/>
     <group id="n78_i7lq" name="title" xy="259,15" size="103,79" group="n176_mn85" visible="false" advanced="true"/>
     <image id="n228_csp4" name="n228" src="oviicm5" fileName="images/index/bg_07.png" pkg="2d9xdj6z" xy="383,25" group="n206_jvvo"/>
-    <text id="n216_ovii" name="n216" xy="363,12" size="94,41" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
+    <text id="n216_ovii" name="n216" xy="363,12" size="94,42" group="n206_jvvo" visible="false" font="FZDaBiaoSong-B06S" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <text id="n205_jvvo" name="tex_fag" xy="423,31" size="148,39" group="n206_jvvo" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="0">
@@ -99,7 +99,6 @@
     <group id="n176_mn85" name="top" xy="259,12" size="327,82" advanced="true"/>
     <list id="n45_l0s4" name="lst_room" xy="6,134" size="1334,512" layout="flow_vt" selectionMode="none" overflow="scroll" scroll="horizontal" scrollBarFlags="2" margin="-23,0,0,0" lineGap="-107" lineItemCount="2" defaultItem="ui://m7iejg46jvvohyf" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
-      <relation target="" sidePair="width-width"/>
       <item/>
       <item/>
       <item/>

fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="272,102" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <loader id="n0_p0pd" name="icon" xy="0,0" size="272,103" url="ui://m7iejg46p0pdhvq" fill="scaleFree" autoSize="true" clearOnPublish="true"/>
+    <loader id="n0_p0pd" name="icon_bg" xy="0,0" size="272,103" url="ui://m7iejg46s48n7i9g" clearOnPublish="true">
-    <text id="n1_y6xi" name="n11" xy="75,8" size="181,74" fontSize="32" color="#765151" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" text="汉寿跑胡子"/>
+      <gearIcon controller="button" pages="1" values="ui://m7iejg46s48n7i9g" default="ui://m7iejg46s48n7i9f"/>
-    <text id="n2_csp4" name="n22" xy="13,8" size="68,74" font="ui://27vd145bqz637ij2" fontSize="30" color="#765151" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" text="1"/>
+    </loader>
+    <text id="n2_csp4" name="n22" xy="13,8" size="68,74" font="ui://27vd145bqz637ij2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="2" autoSize="shrink" text="1"/>
+    <loader id="n3_s48n" name="icon" xy="80,21" pivot="0.5,0.5" size="178,46" align="center" vAlign="middle" playing="false" clearOnPublish="true"/>
   </displayList>
   <Button mode="Radio"/>
   <relation target="n0_p0pd" sidePair="width-width,height-height"/>

fk101/wb_new_ui/assets/NewGroup/package.xml

@@ -824,6 +824,22 @@
     <component id="pfvz7i99" name="item_partner_banplays.xml" path="/mgr/component/reward/" exported="true"/>
     <image id="too17i9a" name="mng_ban_plays.png" path="/mgr/imgs/member/" exported="true"/>
     <image id="gxny7i9b" name="button_02.png" path="/images/info/"/>
+    <image id="s48n7i9c" name="group_paodekuai1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9d" name="group_paohuzi0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9e" name="group_paohuzi1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9f" name="group_play0.png" path="/images/"/>
+    <image id="s48n7i9g" name="group_play1.png" path="/images/"/>
+    <image id="s48n7i9h" name="group_waihuzi0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9i" name="group_waihuzi1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9j" name="group_changsha0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9k" name="group_changsha1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9l" name="group_fulushou0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9m" name="group_fulushou1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9n" name="group_hongzhong0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9o" name="group_hongzhong1.png" path="/images/" exported="true"/>
+    <image id="s48n7i9p" name="group_paodekuai0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9q" name="group_quanbu0.png" path="/images/" exported="true"/>
+    <image id="s48n7i9r" name="group_quanbu1.png" path="/images/" exported="true"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>