diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
index 5b0b33af..abbfacfd 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
@@ -309,7 +309,10 @@ local function __fillRoomItem(self, index, item, room)
MsgWindow.new(
self._root_view,
'确定解散该桌子吗?\r(解散该桌子没有任何结算信息,请谨慎操作)',
- MsgWindow.MsgMode.OkAndCancel
+ MsgWindow.MsgMode.OkAndCancel,
+ nil,
+ nil,
+ { titleUrl = "ui://NewGroup/title_jiesan", openClose = true, closeZone = true }
)
_curren_msg.onOk:Add(
function()
@@ -2208,8 +2211,8 @@ function M:__loadGroupData()
btn_bxx.onClick:Set(
function()
local ctrNum = 1
- if (self.curGroup.lev==3 and self.curGroup.partnerLev>0) or self.curGroup.lev==1 or self.curGroup.lev==2 then
- ctrNum=2
+ if (self.curGroup.lev == 3 and self.curGroup.partnerLev > 0) or self.curGroup.lev == 1 or self.curGroup.lev == 2 then
+ ctrNum = 2
end
local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view, ctrNum,
DataManager.SelfUser.account_id)
diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml
index 88986122..1ae1a076 100644
--- a/wb_new_ui/assets/Common/MessageBox.xml
+++ b/wb_new_ui/assets/Common/MessageBox.xml
@@ -3,7 +3,6 @@
-
@@ -13,6 +12,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/MessageBox1.xml b/wb_new_ui/assets/Common/MessageBox1.xml
index 567aae71..40eb7f03 100644
--- a/wb_new_ui/assets/Common/MessageBox1.xml
+++ b/wb_new_ui/assets/Common/MessageBox1.xml
@@ -3,13 +3,13 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/Win_BaseWindow.xml b/wb_new_ui/assets/Common/component/Win_BaseWindow.xml
index ac774246..791ea5c0 100644
--- a/wb_new_ui/assets/Common/component/Win_BaseWindow.xml
+++ b/wb_new_ui/assets/Common/component/Win_BaseWindow.xml
@@ -5,10 +5,6 @@
-
-
-
-
diff --git a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png
index 03f853bd..eddf27a8 100644
Binary files a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png and b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 697fa6b7..88c1e34d 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -1081,7 +1081,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
index f63f71f9..704bbbb0 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
@@ -2,19 +2,22 @@
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_1.png b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_1.png
new file mode 100644
index 00000000..3ea326d6
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_1.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_2.png b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_2.png
new file mode 100644
index 00000000..47d7c700
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_bg_2.png differ
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_title.png b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_title.png
new file mode 100644
index 00000000..d9209448
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/component/Lst_info/roominfo_title.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png b/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png
index 130c9a61..e5437341 100644
Binary files a/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png and b/wb_new_ui/assets/NewGroup/images/kaishiyouxi.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/title_jiesan.png b/wb_new_ui/assets/NewGroup/images/title_jiesan.png
new file mode 100644
index 00000000..c087a04d
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/title_jiesan.png differ
diff --git a/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png b/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png
index b2308e8d..a92a14fc 100644
Binary files a/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png and b/wb_new_ui/assets/NewGroup/images/wanfaxinxi.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index 22c4fdf9..6e557b13 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -74,16 +74,16 @@
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/imgs/member_input.png b/wb_new_ui/assets/NewGroup/mgr/imgs/member_input.png
new file mode 100644
index 00000000..ffb91aaf
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/mgr/imgs/member_input.png differ
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index fe864971..992b19f6 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1334,6 +1334,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_18.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_18.png
index f309ea82..9119c33f 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_18.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_18.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png
index 9119c33f..67bcab75 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas7.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas7.png
index ed8baa10..94eebf9d 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas7.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas7.png 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 129c7d17..0fe80cc6 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 99e6e237..acd9bbc1 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 a58b315a..ee160daa 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_poker/ui/Main_Poker_atlas0.png b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png
index a02df361..80f940a4 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes
index c93733f5..334a9ab8 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index 10c072e2..d167e30e 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index e411533c..5a155698 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png
index df5358bd..81b0801b 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png differ