diff --git a/lua_probject/base_project/Game/DataManager.lua b/lua_probject/base_project/Game/DataManager.lua
index 94b51c8d..62bd58f1 100644
--- a/lua_probject/base_project/Game/DataManager.lua
+++ b/lua_probject/base_project/Game/DataManager.lua
@@ -20,4 +20,6 @@ DataManager= {
BanInteractRoom = nil,
-- app版本
AppVersion = "",
+ -- 公告
+ GameNotice = {},
}
diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua
index d79f0651..f6705880 100644
--- a/lua_probject/base_project/Game/View/LobbyView.lua
+++ b/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)
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 825f49a9..e5a0fbe6 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/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
diff --git a/lua_probject/main_project/main/majiang/HuCardImg.lua b/lua_probject/main_project/main/majiang/HuCardImg.lua
index 6728338e..3b47cd8e 100644
--- a/lua_probject/main_project/main/majiang/HuCardImg.lua
+++ b/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
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index 82db471a..986bcc68 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/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
diff --git a/wb_new_ui/assets/Lobby/Main_New.xml b/wb_new_ui/assets/Lobby/Main_New.xml
index eb95b2e8..91c33574 100644
--- a/wb_new_ui/assets/Lobby/Main_New.xml
+++ b/wb_new_ui/assets/Lobby/Main_New.xml
@@ -72,12 +72,12 @@
-
-
-
-
+
+
+
+
diff --git a/wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml b/wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml
index c91e1d3e..d9ba2451 100644
--- a/wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml
+++ b/wb_new_ui/assets/Lobby/component/Main/Component/notice/c_message.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml b/wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml
index cb5fc219..038c01a6 100644
--- a/wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml
+++ b/wb_new_ui/assets/Lobby/component/notice_old/Cgm_message.xml
@@ -1,8 +1,11 @@
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/notice_old/Rectangle 54.png b/wb_new_ui/assets/Lobby/component/notice_old/Rectangle 54.png
new file mode 100644
index 00000000..d76c25c3
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/notice_old/Rectangle 54.png differ
diff --git a/wb_new_ui/assets/Lobby/component/notice_old/result_tips_bg.png b/wb_new_ui/assets/Lobby/component/notice_old/result_tips_bg.png
new file mode 100644
index 00000000..b3840e6f
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/notice_old/result_tips_bg.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 2ee4050b..35b11467 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -615,6 +615,8 @@
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
index 1d08f922..9f03c518 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@@ -283,5 +283,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
index 858a6459..d1fb5315 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
@@ -284,5 +284,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
index be254192..2c144d06 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
@@ -293,5 +293,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/com_notice.xml b/wb_new_ui/assets/Main_Majiang/Main_new/com_notice.xml
new file mode 100644
index 00000000..65aadc7c
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/com_notice.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message.xml b/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message.xml
new file mode 100644
index 00000000..4f359c43
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message_text.xml b/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message_text.xml
new file mode 100644
index 00000000..5f0d78a0
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/component/notice_old/Cgm_message_text.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54(1).png b/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54(1).png
new file mode 100644
index 00000000..d76c25c3
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54(1).png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54.png b/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54.png
new file mode 100644
index 00000000..d76c25c3
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/component/notice_old/Rectangle 54.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/component/notice_old/result_tips_bg.png b/wb_new_ui/assets/Main_Majiang/component/notice_old/result_tips_bg.png
new file mode 100644
index 00000000..b3840e6f
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/component/notice_old/result_tips_bg.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index d84cae1e..30ded132 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1533,6 +1533,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index 9de48d75..c36cd935 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png
index 9925aed6..aba62de2 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png
index ae2cc02d..fbf52271 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png
index a497bb6e..52bd5afe 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png
index fe048622..bde747c4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png
index 4dd36679..68f2e760 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png
index bd8e11bd..899ab17d 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index 4fb5362f..23617b2a 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index 99196a06..2da56b45 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index 4a078610..e6d65608 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
index c2de2054..4d1a1f53 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
index 191d5e98..c0ded913 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
index 930d4424..b1dac1df 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png
index bc537328..6a4375be 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 3d664ae7..e286560f 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ