diff --git a/lua_probject/base_project/Game/IGameInfo.lua b/lua_probject/base_project/Game/IGameInfo.lua index b1c2d1bf..c30c46f1 100644 --- a/lua_probject/base_project/Game/IGameInfo.lua +++ b/lua_probject/base_project/Game/IGameInfo.lua @@ -72,7 +72,10 @@ function M:LoadConfigToDetail(data) local returnString = '' - local configData = json.decode(data) + local configData = data + if type(data) == 'string' then + configData = json.decode(data) + end pt(configData) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index 67e59272..bf3af543 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -174,7 +174,12 @@ function M:LoadConfigData(data) end function M:LoadConfigToDetail(data) - local configData = json.decode(data) + + local configData = data + if type(data) == 'string' then + configData = json.decode(data) + end + local returnString = string.format("人数%s人", configData.maxPlayers) if configData.jiangma then returnString = string.format("%s,%s马", returnString, diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index efa8d57d..da94d57e 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -170,7 +170,13 @@ function M:LoadConfigData(data) end function M:LoadConfigToDetail(data) - local configData = json.decode(data) + + local configData = data + if type(data) == 'string' then + configData = json.decode(data) + end + + local returnString = string.format("人数%s人", configData.maxPlayers) if configData.jiangma then returnString = string.format("%s,%s马", returnString, @@ -202,6 +208,9 @@ function M:LoadConfigToDetail(data) if configData.sanjingjiangma then returnString = string.format("%s%s", returnString, configData.sanjingjiangma == 0 and ",三精算奖马" or "") end + + returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data) + return returnString end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua index 35396d86..52bd65ea 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua @@ -152,11 +152,20 @@ function M:LoadConfigData(data) end function M:LoadConfigToDetail(data) - local configData = json.decode(data) + + local configData = data + if type(data) == 'string' then + configData = json.decode(data) + end + + local returnString = string.format("人数%s人,%s,%s,%s", configData.maxPlayers, configData.zimo == 0 and "只能自摸" or "自摸可点炮", configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管", configData.jingbibo == 1 and "有精必博" or "有精可胡") + + returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data) + return returnString end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index 37975958..4d87eb71 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -179,7 +179,13 @@ function M:LoadConfigData(data) end function M:LoadConfigToDetail(data) - local configData = json.decode(data) + + local configData = data + if type(data) == 'string' then + configData = json.decode(data) + end + + local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers, configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖", configData.shaozhuang and ",有烧庄" or "", @@ -188,6 +194,9 @@ function M:LoadConfigToDetail(data) configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or ",不能托管", configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "", configData.zhuanwan and "大转弯" or "小转弯") + + returnString = returnString .. IGameInfo.LoadConfigToDetail(self, data) + return returnString end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index f3f33a9b..660642ad 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -4,6 +4,7 @@ local TableBG = require("Game.Data.TableBG") local MJSettingView = import(".MJSettingViewNew") local MJMainRightPanelView = import(".MJMainRightPanelView") local MJCheckG = import('.MJCheckG') +local GameInfoWindow = import(".GameInfoWindow") local bg_config = { { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, @@ -690,8 +691,8 @@ end function M:Show() MainView.Show(self) - - print(self._room) + local win = GameInfoWindow.New() + win:Show(self._room) end return M diff --git a/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml b/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml index 06d30ced..4e25162d 100644 --- a/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml +++ b/wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml @@ -1,13 +1,15 @@ - + - + + - + + -