公告

lua_probject/base_project/Game/DataManager.lua

@@ -20,4 +20,6 @@ DataManager= {
   BanInteractRoom = nil,
   -- app版本
   AppVersion = "",
+  -- 公告
+  GameNotice = {},
 } 

lua_probject/base_project/Game/View/LobbyView.lua

@@ -352,9 +352,10 @@ function M:__GetMessage(data)
         message.visible = true
         local mesl = {}
         for i = 1, #data.notice_list do
-            mesl[i] = data.notice_list[i].informContent
+            mesl[i] = data.notice_list[i]--.informContent
         end
         self._mesList = mesl
+        DataManager.GameNotice = mesl
     end
 
     self:__moveMsg(0)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -139,7 +139,7 @@ function M:FillGameData()
 
     -- 通用设置
     local com_editSetting = self.gl_view:GetModeData().data._config:GetChild("com_editSetting")
-    
+
     self.cGps = com_editSetting:GetController("cGps")
     self.cTuoguan = com_editSetting:GetController("cTuoguan")
     self.cJiesan = com_editSetting:GetController("cJiesan")
@@ -658,6 +658,17 @@ function M:FillFagData_jiangxi()
     local btn_hidden = panel_play_set:GetChild("btn_hidden")        --防作弊开关
     local btn_vip = panel_play_set:GetChild("btn_vip")              --vip房间开关
 
+
+    -- 通用设置
+    local com_editSetting = self.gl_view:GetModeData().data._config:GetChild("com_editSetting")
+
+    self.cGps = com_editSetting:GetController("cGps")
+    self.cTuoguan = com_editSetting:GetController("cTuoguan")
+    self.cJiesan = com_editSetting:GetController("cJiesan")
+    self.cGongneng = com_editSetting:GetController("cGongneng")
+    self.cChat = com_editSetting:GetController("cChat")
+    self.cMisslie = com_editSetting:GetController("cMisslie")
+
     --根据hpType显示
     local game_data = mod.data.game_data
     panel_play_set:GetController("game_type").selectedIndex = game_data and game_data.hpType or 0

lua_probject/main_project/main/majiang/HuCardImg.lua

@@ -15,15 +15,22 @@ HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
 HuCardImg[12] = { "tile_cs_qingyisejiahu" }
 HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
 HuCardImg[14] = { "tile_cs_ziyisejiahu" }
-HuCardImg[15] = { "缺失" }
+HuCardImg[15] = { "tile_cs_tianhu" }
 HuCardImg[16] = { "tile_cs_dihu" }
 HuCardImg[17] = { "tile_cs_pinghu" }
 HuCardImg[18] = { "tile_cs_qiangganghu" }
 HuCardImg[19] = { "tile_cs_gangshanghua" }
-HuCardImg[20] = { "缺失" }
+HuCardImg[20] = { "无" }
 HuCardImg[21] = { "tile_cs_siguiyi" }
 HuCardImg[22] = { "tile_cs_baguiyi" }
 HuCardImg[23] = { "tile_cs_seguiyi" }
-HuCardImg[25] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu"}
+HuCardImg[24] = { "tile_cs_seguiyi", "tile_cs_qingyisejiahu" }
-
+HuCardImg[25] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu" }
+HuCardImg[26] = { "tile_cs_baguiyi" , "tile_cs_qingyisejiahu" }
+HuCardImg[27] = { "tile_cs_baguiyi" , "tile_cs_qingyisezhenhu" }
+HuCardImg[28] = { "tile_cs_seguiyi" , "tile_cs_qingyisejiahu" }
+HuCardImg[29] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu" }
+HuCardImg[30] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu" }
+HuCardImg[31] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu" }
+HuCardImg[32] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu" }
 return HuCardImg

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -51,6 +51,8 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
     self.cHuCardEffect = self._view:GetController("cHuCardEffect")
     self.effect_ZiMo = self._view:GetChild("effect_ZiMo")
 
+    self.com_notice = self._view:GetChild("com_notice")
+
     self.btn_setting = self._view:GetChild("btn_setting")
     local _view = self._view
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
@@ -819,6 +821,32 @@ function M:Show()
     MainView.Show(self)
     local win = GameInfoWindow.New()
     win:Show(self._room)
+    self:DoNoticeAnimation()
+end
+
+function M:DoNoticeAnimation()
+    self.noticeIndex = self.noticeIndex or 1
+    if not DataManager.GameNotice or #DataManager.GameNotice == 0 then
+        return
+    end
+
+    local text_notice = self.com_notice:GetChild("text_notice")
+    text_notice.text = DataManager.GameNotice[self.noticeIndex]
+    local speed = 44
+    local time = text_notice.width / speed
+
+    text_notice.x = self.com_notice.width
+
+    local tween = text_notice:TweenMove(Vector2(-text_notice.width, text_notice.y), time):OnComplete(function()
+        self:DoNoticeAnimation()
+    end)
+
+    tween:SetEase(EaseType.Linear)
+
+    self.noticeIndex = self.noticeIndex + 1
+    if self.noticeIndex > #DataManager.GameNotice then
+        self.noticeIndex = 1
+    end
 end
 
 return M

wb_new_ui/assets/Lobby/Main_New.xml

@@ -72,12 +72,12 @@
     <group id="n183_isi5" name="menu_center" xy="301,225" size="1760,790" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n196_tme1" name="c_message" src="tme17cp7" fileName="component/Main/Component/notice/c_message.xml" xy="711,168">
+    <component id="n131_ozgf" name="com_message" src="ozgfcks" fileName="component/notice_old/Cgm_message.xml" xy="334,129" visible="false">
-      <relation target="" sidePair="center-center,top-top%"/>
-    </component>
-    <component id="n131_ozgf" name="com_message" src="ozgfcks" fileName="component/notice_old/Cgm_message.xml" xy="334,206" visible="false">
       <relation target="" sidePair="center-center"/>
     </component>
+    <component id="n196_tme1" name="c_message" src="tme17cp7" fileName="component/Main/Component/notice/c_message.xml" xy="711,142">
+      <relation target="" sidePair="center-center,top-top%"/>
+    </component>
     <component id="n129_naup" name="n129" src="naupl7" fileName="component/share/btn_mask_share.xml" xy="62,1709" size="2532,1170" group="n130_naup">
       <gearDisplay controller="share" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml

@@ -2,7 +2,7 @@
 <component size="1093,57">
   <displayList>
     <image id="n0_tme1" name="bg" src="jrro7cyg" fileName="component/Main/Image/paomadeng.png" xy="0,0"/>
-    <text id="n1_tme1" name="text" xy="175,9" size="759,42" fontSize="30" color="#ffffff" vAlign="middle" leading="2" autoSize="none" text="tishihtishithi"/>
+    <text id="n1_tme1" name="text" xy="175,4" size="759,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#ffffff" vAlign="middle" leading="2" autoSize="none" text="tishihtishithi"/>
     <graph id="n2_tme1" name="message" xy="175,9" size="759,42" visible="false" touchable="false" type="rect"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1864,84">
   <displayList>
-    <image id="n0" name="n0" src="ozgfckt" fileName="component/notice/gghd.png" xy="0,0" size="1864,84" aspect="true"/>
+    <image id="n0" name="n0" src="kikc7d67" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1864,84" aspect="true">
-    <component id="n4" name="message" src="ozgfcku" fileName="component/notice/Cgm_message_text.xml" xy="50,3" size="1760,66"/>
+      <relation target="" sidePair="width-width,height-height"/>
-    <image id="n6_m0ei" name="n6" src="ozgfckv" fileName="component/notice/gg.png" xy="9,7" size="70,54" aspect="true"/>
+    </image>
+    <component id="n4" name="message" src="ozgfcku" fileName="component/notice_old/Cgm_message_text.xml" xy="50,3" size="1760,66">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/package.xml

@@ -615,6 +615,8 @@
     <image id="f8c37d0h" name="createRoom_4.png" path="/component/CreatePlay/Image/"/>
     <image id="f8c37d0i" name="createRoom_3.png" path="/component/CreatePlay/Image/"/>
     <component id="f8c37d65" name="com_editSetting.xml" path="/component/CreatePlay/Component/" exported="true"/>
+    <image id="kikc7d66" name="Rectangle 54.png" path="/component/notice_old/"/>
+    <image id="kikc7d67" name="result_tips_bg.png" path="/component/notice_old/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -283,5 +283,6 @@
     <movieclip id="n203_whhc" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="cHuCardEffect" pages="1"/>
     </movieclip>
+    <component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -284,5 +284,6 @@
     <movieclip id="n293_ogwn" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="cHuCardEffect" pages="1"/>
     </movieclip>
+    <component id="n294_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -293,5 +293,6 @@
     <group id="n370_ogwn" name="n370" xy="-143,-1398" size="2592,863" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
+    <component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/com_notice.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1398,63" mask="n2_kikc">
+  <displayList>
+    <graph id="n2_kikc" name="n2" xy="0,0" size="1398,63" type="rect"/>
+    <image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1398,63" aspect="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_kikc" name="text_notice" xy="0,7" size="3723,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#ffffff" vAlign="bottom" text="公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告公告公公告公告公告公告公告公告公告公告公告公告公告公告"/>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1864,84">
+  <displayList>
+    <image id="n0" name="n0" src="kikc1g1" fileName="component/notice_old/Rectangle 54.png" xy="0,0" size="1864,84" aspect="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n4" name="message" src="kikc1g2" fileName="component/notice_old/Cgm_message_text.xml" xy="50,3" size="1760,66">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message_text.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="796,43" overflow="hidden" clipSoftness="10,0" extention="Label">
+  <displayList>
+    <text id="n0" name="tex_message" xy="896,0" size="10,42" font="ui://27vd145bqz637ij2" fontSize="30" color="#ffffff" vAlign="middle" text=""/>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1533,6 +1533,12 @@
     <component id="j6yy1fv" name="Player_card_info_W.xml" path="/Main_new/Main_new_2/"/>
     <image id="j6yy1fw" name="4918b5270e436c54b44d48f0bb79114 3.png" path="/Main_new/Image/"/>
     <image id="j6yy1fz" name="微信图片_20250813225357_169.jpg" path="/Main_new/Image/"/>
+    <component id="kikc1g0" name="Cgm_message.xml" path="/component/notice_old/"/>
+    <image id="kikc1g1" name="Rectangle 54.png" path="/component/notice_old/"/>
+    <component id="kikc1g2" name="Cgm_message_text.xml" path="/component/notice_old/"/>
+    <image id="kikc1g3" name="Rectangle 54(1).png" path="/component/notice_old/"/>
+    <component id="kikc1g4" name="com_notice.xml" path="/Main_new/"/>
+    <image id="kikc1g5" name="result_tips_bg.png" path="/component/notice_old/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>