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 4735dcc7..b85f4bd9 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
@@ -861,6 +861,27 @@ function M:FillFagData_jiangxi()
_data.isvip = 0
end
+ -- 通用设置
+ local com_editSetting = mod.data._config:GetChild("com_editSetting")
+ local cGps = com_editSetting:GetController("cGps")
+ local cTuoguan = com_editSetting:GetController("cTuoguan")
+ local cJiesan = com_editSetting:GetController("cJiesan")
+ local cGongneng = com_editSetting:GetController("cGongneng")
+ local cChat = com_editSetting:GetController("cChat")
+ local cMisslie = com_editSetting:GetController("cMisslie")
+ -- GPS设置
+ self.hpData.gps = cGps.selectedIndex + 1
+ -- 托管
+ self.hpData.TuoGuan = cTuoguan.selectedIndex + 1
+ -- 解散
+ self.hpData.JieShan = cJiesan.selectedIndex + 1
+ -- 功能
+ self.hpData.GongNeng = cGongneng.selectedIndex + 1
+ -- 开启聊天
+ self.hpData.canChat = cChat.selectedIndex
+ -- 开启表情互动
+ self.hpData.canMissile = cMisslie.selectedIndex
+
local hpType = mod.data.game_data.hpType
self.hpData.limitInRoom = ad2d(tonumber(panel_play_set:GetChild("tex_join_limit").text))
@@ -957,6 +978,8 @@ function M:FillFagData_jiangxi()
self.hpData.anchou_rewards_val = ad2d(10000)
end
+ local com_editSetting = self._view:GetChild("tex_name")
+
local tex_name = self._view:GetChild("tex_name")
local name = tex_name.text
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png
index 43915c2f..7cae6a49 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he11.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png
index 6549fc89..766ae4fd 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he12.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png
index 6c7c4399..8dccd39a 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he13.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png
index bd935d80..62a049c3 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he14.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png
index 57c260de..14ff7bc4 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he15.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png
index f339999c..0ccf8528 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he16.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png
index 7c44e190..d6f1ec1c 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he17.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png
index ba845a39..7a01c3ce 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he18.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png
index e33dda0c..3d865658 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he19.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png
index 9c27b6d0..ded0d570 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he2.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png
index 2c7b11a6..c2d0ef2f 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he21.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png
index 089b28ff..5cea7950 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he22.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png
index 5965df5d..ef1c9382 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he23.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png
index 189107b0..2c519230 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he3.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png
index 65262d59..11fb43e8 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he4.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png
index b788619e..c25786a8 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he5.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png
index dab9b4fe..27a359e3 100644
Binary files a/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png and b/wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/image/he8.png differ
diff --git a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
index ebc41001..6f2637ef 100644
--- a/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
+++ b/wb_new_ui/assets/Extend_MJ_FuZhou/package.xml
@@ -240,6 +240,9 @@
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
index f5741322..db0b20ac 100644
--- a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
@@ -26,7 +26,7 @@
-
+
@@ -42,8 +42,8 @@
-
-
+
+
@@ -66,7 +66,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -182,5 +182,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
index 4973c9a6..8fafc2ca 100644
--- a/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
@@ -24,7 +24,7 @@
-
+
@@ -40,8 +40,8 @@
-
-
+
+
@@ -64,7 +64,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -159,7 +159,7 @@
-
+
@@ -176,5 +176,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
index d81f6607..5d4dd5e2 100644
--- a/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
@@ -21,8 +21,8 @@
-
-
+
+
@@ -38,8 +38,8 @@
-
-
+
+
@@ -62,7 +62,7 @@
-
+
@@ -79,7 +79,7 @@
-
+
@@ -96,5 +96,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
index f86466a0..2ba8c34d 100644
--- a/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
@@ -26,7 +26,7 @@
-
+
@@ -42,8 +42,8 @@
-
-
+
+
@@ -66,7 +66,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -183,5 +183,6 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/CreatePlay/Component/Multiple_choose.xml b/wb_new_ui/assets/Lobby/component/CreatePlay/Component/Multiple_choose.xml
index 8b792d0f..66d8b832 100644
--- a/wb_new_ui/assets/Lobby/component/CreatePlay/Component/Multiple_choose.xml
+++ b/wb_new_ui/assets/Lobby/component/CreatePlay/Component/Multiple_choose.xml
@@ -2,9 +2,12 @@
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_3.png b/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_3.png
new file mode 100644
index 00000000..7d05397e
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_3.png differ
diff --git a/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_4.png b/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_4.png
new file mode 100644
index 00000000..462af33e
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/CreatePlay/Image/createRoom_4.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 9877a9ff..2ee4050b 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -582,6 +582,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/dongxiao/package.xml b/wb_new_ui/assets/dongxiao/package.xml
index 0543720a..77cb38ac 100644
--- a/wb_new_ui/assets/dongxiao/package.xml
+++ b/wb_new_ui/assets/dongxiao/package.xml
@@ -6,6 +6,7 @@
+
\ 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 0af85add..9de48d75 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 84de0d06..9925aed6 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_4.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png
index 48e3c339..fe048622 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 899ab17d..4dd36679 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 ee4fe821..bd8e11bd 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_atlas0_7.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png
index c4d8b1f9..ee4fe821 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.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 76c2e1c2..4fb5362f 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/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes
index 7fe631a3..406050c1 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Info_MJ_FuZhou_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes
index 73b73694..540a066d 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes
index 4fd31db2..ef0662e3 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Info_MJ_LiChuan_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes
index 4ffcfad9..669b61c6 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Info_MJ_NanCheng_fui.bytes differ