进入房间规则

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)
 

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,

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
 

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
 

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
 

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)
-
+    local win = GameInfoWindow.New()
-    print(self._room)
+    win:Show(self._room)
 end
 
 return M

wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,90" extention="Button">
-  <controller name="online" pages="0,,1,,3," selected="2"/>
+  <controller name="online" pages="0,,1,,3," selected="0"/>
   <displayList>
-    <image id="n1_kzuz" name="n1" src="kzuzhod" fileName="invite/image/invite/Group 347.png" xy="0,0">
+    <image id="n1_kzuz" name="n1" src="q0vzhop" fileName="invite/image/invite/mj_club_waitingroom_yaoqing_btn.png" xy="0,0" size="210,90">
       <gearDisplay controller="online" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n2_kzuz" name="n2" src="kzuzhoe" fileName="invite/image/invite/Group 348.png" xy="0,0">
+    <image id="n2_kzuz" name="n2" src="q0vzhoo" fileName="invite/image/invite/mj_club_waitingroom_yaoqing_btn2.png" xy="0,0" size="210,90">
       <gearDisplay controller="online" pages="0,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/FGAssist/invite/component/invite/item_invite.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="723,162">
+<component size="732,162">
   <controller name="enable" pages="0,,1," selected="0"/>
-  <controller name="type" pages="0,,1,,2," selected="2"/>
+  <controller name="type" pages="0,,1,,2," selected="0"/>
   <displayList>
     <graph id="n13_kzuz" name="n13" xy="0,0" size="144,144" type="rect" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="12"/>
     <component id="n2_cioe" name="btn_head" src="kzuzhof" fileName="invite/component/invite/btn_head.xml" xy="6,6"/>
     <text id="n3_cioe" name="tex_name" xy="153,36" size="161,49" fontSize="36" color="#444444" vAlign="middle" autoSize="shrink" text="ddddddd"/>
     <text id="n4_cioe" name="tex_id" xy="98,49" size="161,34" visible="false" fontSize="30" color="#5c3c16" vAlign="middle" autoSize="shrink" text="ID:123456"/>
-    <component id="n8_cioe" name="btn_invite" src="cioehnc" fileName="invite/component/invite/btn_invite.xml" xy="513,27" touchable="false">
+    <component id="n8_cioe" name="btn_invite" src="cioehnc" fileName="invite/component/invite/btn_invite.xml" xy="519,25" size="210,112" touchable="false">
       <gearDisplay controller="enable" pages="0"/>
       <gearLook controller="type" pages="0,2" values="1,0,0,0|1,0,0,0" default="1,0,0,1"/>
     </component>

wb_new_ui/assets/FGAssist/invite/panel_assist.xml

@@ -5,7 +5,7 @@
     <image id="n0_cioe" name="n0" src="cioehn1" fileName="invite/image/tool/hd.png" xy="0,0" size="843,1140" color="#cad8df">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <list id="n10_vmtu" name="lst_player" xy="54,96" size="723,1008" layout="flow_hz" overflow="scroll" lineGap="18" colGap="18" defaultItem="ui://vplxondscioehn7" align="center" autoClearItems="true">
+    <list id="n10_vmtu" name="lst_player" xy="54,96" size="734,1008" layout="flow_hz" overflow="scroll" lineGap="18" colGap="18" defaultItem="ui://vplxondscioehn7" align="center" autoClearItems="true">
       <relation target="" sidePair="width-width"/>
       <item/>
       <item/>

wb_new_ui/assets/FGAssist/package.xml

@@ -51,6 +51,8 @@
     <image id="pbp6hol" name="Group 361.png" path="/invite/image/invited/"/>
     <image id="pbp6hom" name="Group 545.png" path="/invite/image/invited/"/>
     <image id="pbp6hon" name="Rectangle 257.png" path="/invite/image/invited/"/>
+    <image id="q0vzhoo" name="mj_club_waitingroom_yaoqing_btn2.png" path="/invite/image/invite/"/>
+    <image id="q0vzhop" name="mj_club_waitingroom_yaoqing_btn.png" path="/invite/image/invite/"/>
   </resources>
   <publish name="FGAssist" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -57,7 +57,9 @@
     <component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
       <gearDisplay controller="ting" pages="1"/>
     </component>
-    <text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#e0bf7b" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+33"/>
+    <text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#e0bf7b" align="center" vAlign="middle" autoSize="none" text="0">
+      <relation target="" sidePair="center-center"/>
+    </text>
     <group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
       <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
     </group>