修复放置提示被一键下派遮挡
parent
7b0d30649e
commit
bd2ae0c35b
|
|
@ -4,197 +4,197 @@ local M = EXGameInfo
|
||||||
|
|
||||||
|
|
||||||
function EXGameInfo.new(blur_view)
|
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"
|
self.class = "EXGameInfo"
|
||||||
UIPackage.AddPackage("extend/majiang/nancheng/ui/Info_MJ_NanCheng")
|
UIPackage.AddPackage("extend/majiang/nancheng/ui/Info_MJ_NanCheng")
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:FillData()
|
function M:FillData()
|
||||||
self._maxPlayer = 4 -- 默认玩家人数
|
self._maxPlayer = 4 -- 默认玩家人数
|
||||||
self._roundChoice = 3 -- 回合选项数
|
self._roundChoice = 3 -- 回合选项数
|
||||||
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_NanCheng/Label_Detail_83")
|
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_NanCheng/Label_Detail_83")
|
||||||
|
|
||||||
local jiangmaSlider = self._config:GetChild("n92")
|
local jiangmaSlider = self._config:GetChild("n92")
|
||||||
jiangmaSlider.onChanged:Set(function()
|
jiangmaSlider.onChanged:Set(function()
|
||||||
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
|
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
|
||||||
end)
|
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')
|
-- local btn_cr = self._config:GetChild('sdsrbtn')
|
||||||
-- btn_cr.onClick:Set(
|
-- btn_cr.onClick:Set(
|
||||||
-- function()
|
-- function()
|
||||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||||
-- local value = limit
|
-- local value = limit
|
||||||
-- if otype == 1 then
|
-- if otype == 1 then
|
||||||
-- value = value + ad2d(num)
|
-- value = value + ad2d(num)
|
||||||
-- elseif otype == -1 then
|
-- elseif otype == -1 then
|
||||||
-- value = value - ad2d(num)
|
-- value = value - ad2d(num)
|
||||||
-- else
|
-- else
|
||||||
-- value = ad2d(num)
|
-- value = ad2d(num)
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
-- if value < 0 then
|
-- if value < 0 then
|
||||||
-- ViewUtil.ErrorTip(1, "输入数据异常！")
|
-- ViewUtil.ErrorTip(1, "输入数据异常！")
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
-- self.xipaiValueText.text = value / 1000
|
-- self.xipaiValueText.text = value / 1000
|
||||||
-- self.xipaiValue = value / 1000
|
-- self.xipaiValue = value / 1000
|
||||||
-- end, 3, nil)
|
-- end, 3, nil)
|
||||||
-- gniv:Show()
|
-- gniv:Show()
|
||||||
-- end
|
-- end
|
||||||
-- )
|
-- )
|
||||||
|
|
||||||
|
|
||||||
-- local btn_cr2 = self._config:GetChild('anchoubtn')
|
-- local btn_cr2 = self._config:GetChild('anchoubtn')
|
||||||
-- btn_cr2.onClick:Set(
|
-- btn_cr2.onClick:Set(
|
||||||
-- function()
|
-- function()
|
||||||
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
-- local gniv = GroupNumberInputView_Game.new(nil, function(num)
|
||||||
-- local value = limit
|
-- local value = limit
|
||||||
-- if otype == 1 then
|
-- if otype == 1 then
|
||||||
-- value = value + ad2d(num)
|
-- value = value + ad2d(num)
|
||||||
-- elseif otype == -1 then
|
-- elseif otype == -1 then
|
||||||
-- value = value - ad2d(num)
|
-- value = value - ad2d(num)
|
||||||
-- else
|
-- else
|
||||||
-- value = ad2d(num)
|
-- value = ad2d(num)
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
-- if value < 0 then
|
-- if value < 0 then
|
||||||
-- ViewUtil.ErrorTip(1, "输入数据异常！")
|
-- ViewUtil.ErrorTip(1, "输入数据异常！")
|
||||||
-- end
|
-- end
|
||||||
|
|
||||||
-- self.anchouValueText.text = value / 1000
|
-- self.anchouValueText.text = value / 1000
|
||||||
-- self.anchouValue = value / 1000
|
-- self.anchouValue = value / 1000
|
||||||
-- end, 3, nil)
|
-- end, 3, nil)
|
||||||
-- gniv:Show()
|
-- gniv:Show()
|
||||||
-- end
|
-- end
|
||||||
-- )
|
-- )
|
||||||
-- end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
local _help_url = "ui://Info_MJ_NanCheng/Com_help"
|
local _help_url = "ui://Info_MJ_NanCheng/Com_help"
|
||||||
function M:GetHelpUrl()
|
function M:GetHelpUrl()
|
||||||
return _help_url
|
return _help_url
|
||||||
end
|
end
|
||||||
|
|
||||||
local _icon_url = "ui://Info_MJ_NanCheng/icon"
|
local _icon_url = "ui://Info_MJ_NanCheng/icon"
|
||||||
function M:GetIconUrl()
|
function M:GetIconUrl()
|
||||||
return _icon_url
|
return _icon_url
|
||||||
end
|
end
|
||||||
|
|
||||||
local _icon_url1 = "ui://Info_MJ_NanCheng/icon1"
|
local _icon_url1 = "ui://Info_MJ_NanCheng/icon1"
|
||||||
function M:GetIconUrl1()
|
function M:GetIconUrl1()
|
||||||
return _icon_url1
|
return _icon_url1
|
||||||
end
|
end
|
||||||
|
|
||||||
local _play_list = {}
|
local _play_list = {}
|
||||||
function M:GetPlayList()
|
function M:GetPlayList()
|
||||||
return _play_list
|
return _play_list
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:SelectedConfigData()
|
function M:SelectedConfigData()
|
||||||
local _config = self._config
|
local _config = self._config
|
||||||
local round = _config:GetController("round").selectedIndex + 1
|
local round = _config:GetController("round").selectedIndex + 1
|
||||||
local people = _config:GetController("peopleNum").selectedIndex + 2
|
local people = _config:GetController("peopleNum").selectedIndex + 2
|
||||||
|
|
||||||
local zimo = _config:GetController("ZiMo").selectedIndex
|
local zimo = _config:GetController("ZiMo").selectedIndex
|
||||||
local shaozhuang = _config:GetController("ShaoZhuang").selectedIndex
|
local shaozhuang = _config:GetController("ShaoZhuang").selectedIndex
|
||||||
local fengding = _config:GetController("FengDing").selectedIndex
|
local fengding = _config:GetController("FengDing").selectedIndex
|
||||||
local zuoma = _config:GetController("ZuoMa").selectedIndex
|
local zuoma = _config:GetController("ZuoMa").selectedIndex
|
||||||
local zhuanwan = _config:GetController("ZhuanWan").selectedIndex
|
local zhuanwan = _config:GetController("ZhuanWan").selectedIndex
|
||||||
local jiahu = _config:GetController("JiaHu").selectedIndex
|
local jiahu = _config:GetController("JiaHu").selectedIndex
|
||||||
|
|
||||||
local jiangma = Mathf.Round(_config:GetChild("n92").value)
|
local jiangma = Mathf.Round(_config:GetChild("n92").value)
|
||||||
|
|
||||||
local xi_pai = false
|
local xi_pai = false
|
||||||
local xi_paifen = 0
|
local xi_paifen = 0
|
||||||
if _config:GetChild("xipai") then
|
if _config:GetChild("xipai") then
|
||||||
xi_pai = _config:GetChild("xipai").selected
|
xi_pai = _config:GetChild("xipai").selected
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------
|
------
|
||||||
local _data = {}
|
local _data = {}
|
||||||
_data["opt"] = round
|
_data["opt"] = round
|
||||||
_data["maxPlayers"] = people
|
_data["maxPlayers"] = people
|
||||||
|
|
||||||
_data["zimo"] = zimo
|
_data["zimo"] = zimo
|
||||||
_data["shaozhuang"] = shaozhuang
|
_data["shaozhuang"] = shaozhuang
|
||||||
_data["fengding"] = fengding
|
_data["fengding"] = fengding
|
||||||
_data["zuoma"] = zuoma
|
_data["zuoma"] = zuoma
|
||||||
_data["zhuanwan"] = zhuanwan
|
_data["zhuanwan"] = zhuanwan
|
||||||
_data["jiahu"] = jiahu
|
_data["jiahu"] = jiahu
|
||||||
|
|
||||||
_data["jiangma"] = jiangma
|
_data["jiangma"] = jiangma
|
||||||
_data['xi_pai'] = xi_pai
|
_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
|
-- 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
|
return _data
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:LoadConfigData(data)
|
function M:LoadConfigData(data)
|
||||||
--printlog("加载房间配置=========>>>")
|
--printlog("加载房间配置=========>>>")
|
||||||
--pt(data)
|
--pt(data)
|
||||||
local _config = self._config
|
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:GetController("fengding").selectedIndex = data.fengding
|
_config:GetController("fengding").selectedIndex = data.fengding
|
||||||
|
|
||||||
_config:GetController("wanfa").selectedIndex = data.wanfa
|
_config:GetController("wanfa").selectedIndex = data.wanfa
|
||||||
_config:GetChild("btn_qidui").selected = data.qiduijiafan
|
_config:GetChild("btn_qidui").selected = data.qiduijiafan
|
||||||
_config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan
|
_config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan
|
||||||
_config:GetChild("btn_loudilong").selected = data.loudilongjiafan
|
_config:GetChild("btn_loudilong").selected = data.loudilongjiafan
|
||||||
_config:GetChild("btn_bunengchi").selected = data.bunengchi
|
_config:GetChild("btn_bunengchi").selected = data.bunengchi
|
||||||
|
|
||||||
_config:GetChild("btn_doudizhu").selected = data.doudizhu
|
_config:GetChild("btn_doudizhu").selected = data.doudizhu
|
||||||
_config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei
|
_config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei
|
||||||
|
|
||||||
if _config:GetChild("xipai") then
|
if _config:GetChild("xipai") then
|
||||||
_config:GetChild("xipai").selected = data.xi_pai
|
_config:GetChild("xipai").selected = data.xi_pai
|
||||||
end
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
function M:LoadConfigToDetail(data)
|
function M:LoadConfigToDetail(data)
|
||||||
local configData = json.decode(data)
|
local configData = json.decode(data)
|
||||||
local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers,
|
local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers,
|
||||||
configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖", configData.shaozhuang and ",有烧庄" or "",
|
configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖", configData.shaozhuang and ",有烧庄" or "",
|
||||||
configData.zuoma and ",庄家坐马" or "",
|
configData.zuoma and ",庄家坐马" or "",
|
||||||
configData.zimo and ",只能自摸" or ",自摸可点炮",
|
configData.zimo and ",只能自摸" or ",自摸可点炮",
|
||||||
configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
|
configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or ",不能托管",
|
||||||
configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
|
configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
|
||||||
configData.zhuanwan and "大转弯" or "小转弯")
|
configData.zhuanwan and "大转弯" or "小转弯")
|
||||||
return returnString
|
return returnString
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue