From 86619f2e5e4cc9e2cf4eb502a6f3dc7034c85658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 1 Apr 2025 18:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E6=B3=95=E6=98=BE=E7=A4=BA=E7=8E=A9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/FamilyView.lua | 8 ++++---- .../extend/majiang/nancheng/EXGameInfo.lua | 12 ++++++++++++ .../ART/base/Family/ui/Family_fui.bytes | Bin 29211 -> 29226 bytes 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 32edac63..9917e36f 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -363,10 +363,10 @@ function M:UpdateFamilyRoom(fgCtr, id) end) else local newIndex = index - #roomList + 1 - -- local config = ExtendManager.GetExtendConfig(playList[index - #roomList + 1].gameId) - -- local mode = config:GetGameInfo() - -- local gamePlay = mode:LoadConfigToDetail("随便甜点") - -- obj:GetChild('Label_gameRule').title = gamePlay + local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId) + local mode = config:GetGameInfo() + local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config) + obj:GetChild('Label_gameRule').title = gamePlay obj:GetChild('game_type').text = playList[newIndex].name obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0 obj:GetChild('btn_joinGame').onClick:Set(function() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index 1b594349..8fac7754 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -185,4 +185,16 @@ function M:LoadConfigData(data) -- end end +function M:LoadConfigToDetail(data) + local configData = json.decode(data) + 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.zuoma and ",庄家坐马" or "", + configData.zimo and ",只能自摸" or ",自摸可点炮", + configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or "不能托管", + configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "", + configData.zhuanwan and "大转弯" or "小转弯") + return returnString +end + return M diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index d6585c6b337a3bb9d3a6fa7cf23ec8e637b558b7..14c9445f754c06739ca8fa6cb9061b00b4de0951 100644 GIT binary patch delta 102 zcmbRJgmKjq#tAl@lNi7t=FdjgdL@bb%nYpzZ45>K{{cmrK!hPTkT^1VgR&y;R+tb- jZt^{4`N^8f_LGkY2u-e17Uu^Fg24ZO5V(1wa+e