diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index 0766af4c..9546de52 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -4,195 +4,195 @@ local M = EXGameInfo function EXGameInfo.new(blur_view) - setmetatable(M, { __index = IGameInfo }) - local self = setmetatable({}, { __index = M }) - self.class = "EXGameInfo" - UIPackage.AddPackage("extend/majiang/jinxi/ui/Info_MJ_JinXi") - return self + setmetatable(M, { __index = IGameInfo }) + local self = setmetatable({}, { __index = M }) + self.class = "EXGameInfo" + UIPackage.AddPackage("extend/majiang/jinxi/ui/Info_MJ_JinXi") + return self end function M:FillData() - self._maxPlayer = 4 -- 默认玩家人数 - self._roundChoice = 3 -- 回合选项数 - self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_JinXi/Label_Detail_83") + self._maxPlayer = 4 -- 默认玩家人数 + self._roundChoice = 3 -- 回合选项数 + self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_JinXi/Label_Detail_83") - 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 jiangmaSlider = self._config:GetChild("n92") + jiangmaSlider.onChanged:Set(function() + self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2) + end) - -- if oldGameVersion == 2 then - -- self._config:GetController("xipai").selectedIndex = 0 + -- if oldGameVersion == 2 then + -- self._config:GetController("xipai").selectedIndex = 0 - -- self.xipaiValueText = self._config:GetChild('xipaifen') - -- self.xipaiValueText.text = 1 - -- self.xipaiValue = 1 + -- self.xipaiValueText = self._config:GetChild('xipaifen') + -- self.xipaiValueText.text = 1 + -- self.xipaiValue = 1 - -- self.anchouValueText = self._config:GetChild('anchoufen') - -- self.anchouValueText.text = 1 - -- self.anchouValue = 1 + -- self.anchouValueText = self._config:GetChild('anchoufen') + -- self.anchouValueText.text = 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 - -- value = value - ad2d(num) - -- else - -- value = ad2d(num) - -- 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 - -- if value < 0 then - -- ViewUtil.ErrorTip(1, "输入数据异常！") - -- end + -- if value < 0 then + -- ViewUtil.ErrorTip(1, "输入数据异常！") + -- end - -- self.xipaiValueText.text = value / 1000 - -- self.xipaiValue = value / 1000 - -- end, 3, nil) - -- gniv:Show() - -- end - -- ) + -- 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 + -- 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 + -- if value < 0 then + -- ViewUtil.ErrorTip(1, "输入数据异常！") + -- end - -- self.anchouValueText.text = value / 1000 - -- self.anchouValue = value / 1000 - -- end, 3, nil) - -- gniv:Show() - -- end - -- ) - -- end + -- self.anchouValueText.text = value / 1000 + -- self.anchouValue = value / 1000 + -- end, 3, nil) + -- gniv:Show() + -- end + -- ) + -- end end local _help_url = "ui://Info_MJ_JinXi/Com_help" function M:GetHelpUrl() - return _help_url + return _help_url end local _icon_url = "ui://Info_MJ_JinXi/icon" function M:GetIconUrl() - return _icon_url + return _icon_url end local _icon_url1 = "ui://Info_MJ_JinXi/icon1" function M:GetIconUrl1() - return _icon_url1 + return _icon_url1 end local _play_list = {} function M:GetPlayList() - return _play_list + return _play_list end function M:SelectedConfigData() - local _config = self._config - local round = _config:GetController("round").selectedIndex + 1 - local people = _config:GetController("peopleNum").selectedIndex + 2 + local _config = self._config + local round = _config:GetController("round").selectedIndex + 1 + local people = _config:GetController("peopleNum").selectedIndex + 2 - local zimo = _config:GetController("ZiMo").selectedIndex - local gangjiangma = _config:GetController("GangJiangMa").selectedIndex - local fengding = _config:GetController("FengDing").selectedIndex - local sanjingjiangma = _config:GetController("SanJingJiangMa").selectedIndex - local zikechengshun = _config:GetController("ZiKeChengShun").selectedIndex + local zimo = _config:GetController("ZiMo").selectedIndex + local gangjiangma = _config:GetController("GangJiangMa").selectedIndex + local fengding = _config:GetController("FengDing").selectedIndex + local sanjingjiangma = _config:GetController("SanJingChengMa").selectedIndex + local zikechengshun = _config:GetController("ZiKeChengShun").selectedIndex - local jiangma = Mathf.Round(_config:GetChild("n92").value) + local jiangma = Mathf.Round(_config:GetChild("n92").value) - local xi_pai = false - local xi_paifen = 0 - if _config:GetChild("xipai") then - xi_pai = _config:GetChild("xipai").selected - end + local xi_pai = false + local xi_paifen = 0 + if _config:GetChild("xipai") then + xi_pai = _config:GetChild("xipai").selected + end - ------ - local _data = {} - _data["opt"] = round - _data["maxPlayers"] = people + ------ + local _data = {} + _data["opt"] = round + _data["maxPlayers"] = people - _data["zimo"] = zimo - _data["gangjiangma"] = gangjiangma - _data["fengding"] = fengding - _data["sanjingjiangma"] = sanjingjiangma - _data["zikechengshun"] = zikechengshun + _data["zimo"] = zimo + _data["gangjiangma"] = gangjiangma + _data["fengding"] = fengding + _data["sanjingjiangma"] = sanjingjiangma + _data["zikechengshun"] = zikechengshun - _data["jiangma"] = jiangma - _data['xi_pai'] = xi_pai + _data["jiangma"] = jiangma + _data['xi_pai'] = xi_pai - local xi_pai_score = 0 - local an_chou_score = 0 - -- if oldGameVersion == 2 then - -- xi_pai_score = self.xipaiValue - -- an_chou_score = self.anchouValue - -- end + local xi_pai_score = 0 + local an_chou_score = 0 + -- if oldGameVersion == 2 then + -- xi_pai_score = self.xipaiValue + -- an_chou_score = self.anchouValue + -- end - _data['xi_pai_score'] = xi_pai_score * 1000 - _data['an_chou_score'] = an_chou_score * 1000 + _data['xi_pai_score'] = xi_pai_score * 1000 + _data['an_chou_score'] = an_chou_score * 1000 - return _data + return _data end function M:LoadConfigData(data) - --printlog("加载房间配置=========>>>") - --pt(data) - local _config = self._config - _config:GetController("round").selectedIndex = data.opt - 1 - _config:GetController("play_list").selectedIndex = data.maxPlayers - 2 + --printlog("加载房间配置=========>>>") + --pt(data) + local _config = self._config + _config:GetController("round").selectedIndex = data.opt - 1 + _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:GetChild("btn_qidui").selected = data.qiduijiafan - _config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan - _config:GetChild("btn_loudilong").selected = data.loudilongjiafan - _config:GetChild("btn_bunengchi").selected = data.bunengchi + _config:GetController("wanfa").selectedIndex = data.wanfa + _config:GetChild("btn_qidui").selected = data.qiduijiafan + _config:GetChild("btn_shoudailong").selected = data.shoudailongjiafan + _config:GetChild("btn_loudilong").selected = data.loudilongjiafan + _config:GetChild("btn_bunengchi").selected = data.bunengchi - _config:GetChild("btn_doudizhu").selected = data.doudizhu - _config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei + _config:GetChild("btn_doudizhu").selected = data.doudizhu + _config:GetChild("btn_doudizhufanbei").selected = data.doudizhufanbei - if _config:GetChild("xipai") then - _config:GetChild("xipai").selected = data.xi_pai - end + if _config:GetChild("xipai") then + _config:GetChild("xipai").selected = data.xi_pai + end - if oldGameVersion == 2 then - self.xipaiValueText.text = data.xi_pai_score / 1000 - self.xipaiValue = data.xi_pai_score / 1000 + if oldGameVersion == 2 then + self.xipaiValueText.text = data.xi_pai_score / 1000 + self.xipaiValue = data.xi_pai_score / 1000 - self.anchouValueText.text = data.an_chou_score / 1000 - self.anchouValue = data.an_chou_score / 1000 - end + self.anchouValueText.text = data.an_chou_score / 1000 + self.anchouValue = data.an_chou_score / 1000 + end end function M:LoadConfigToDetail(data) - local configData = json.decode(data) - local returnString = string.format("人数%s人,%s马,%s,%s,%s%s,%s", configData.maxPlayers, - configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖", - configData.zimo and "只能自摸" or "自摸可点炮", - configData.tuoguan and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管", - configData.sanjingjiangma and "三精算奖马" or "三精不算奖马", configData.fengding and ",封顶10炮" or "", - configData.zikechengshun and "字可成顺" or "字不可成顺") - return returnString + local configData = json.decode(data) + local returnString = string.format("人数%s人,%s马,%s,%s,%s%s,%s", configData.maxPlayers, + configData.jiangma and string.format("奖%d", configData.jiangma) or "不奖", + configData.zimo and "只能自摸" or "自摸可点炮", + configData.tuoguan and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管", + configData.sanjingjiangma and "三精算奖马" or "三精不算奖马", configData.fengding and ",封顶10炮" or "", + configData.zikechengshun and "字可成顺" or "字不可成顺") + return returnString end return M diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index f0bd471f..8c6e5e53 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -26,7 +26,7 @@ function M:InitView(url) self._full = true UIPackage.AddPackage("extend/majiang/lichuan/ui/Extend_MJ_LiChuan") if self._room.room_config.people_num == 2 then - MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) + MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num .. "_jiangxi") else MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") end diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes index ba9b3cd1..59825391 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes differ