1

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)

wb_new_ui/assets/Common/MessageBox.xml

@@ -3,7 +3,6 @@
   <displayList>
     <component id="n20_st2l" name="n18" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1260,862">
       <relation target="" sidePair="width-width,height-height"/>
-      <Button title="消息"/>
     </component>
     <text id="n7_m0vo" name="tex_message" xy="47,194" pivot="0.5,0.5" size="1166,414" font="ui://27vd145bik9v7img" fontSize="56" color="#4b7359" align="center" vAlign="middle" ubb="true" autoSize="none" text="您是否退出当前账号？"/>
     <component id="n4_m0vo" name="btn_ok" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="176,647" size="400,169" group="n8_m0vo">
@@ -13,6 +12,6 @@
       <Button title=" " icon="ui://27vd145bik9v7imi"/>
     </component>
     <group id="n8_m0vo" name="n8" xy="176,645" size="918,171"/>
-    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="1144,-14" size="125,125"/>
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="1144,-14" size="125,125"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/MessageBox1.xml

@@ -3,13 +3,13 @@
   <displayList>
     <component id="n19_ik9v" name="n18" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1260,862">
       <relation target="" sidePair="width-width,height-height"/>
-      <Button title="消息"/>
+      <Button title="&#xA;"/>
     </component>
     <text id="n20_ik9v" name="tex_message" xy="47,194" pivot="0.5,0.5" size="1166,414" font="ui://27vd145bik9v7img" fontSize="56" color="#4b7359" align="center" vAlign="middle" ubb="true" autoSize="none" text="您是否退出当前账号？"/>
     <component id="n21_ik9v" name="btn_ok" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="430,647" size="400,169" group="n23_ik9v">
       <Button title=" " icon="ui://27vd145bik9v7imj"/>
     </component>
     <group id="n23_ik9v" name="n23" xy="430,647" size="400,169"/>
-    <component id="n24_ik9v" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="1144,-14" size="125,125"/>
+    <component id="n24_ik9v" name="btn_close1" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="1144,-14" size="125,125"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/component/Win_BaseWindow.xml

@@ -5,10 +5,6 @@
     <image id="n5_ik9v" name="n5" src="ik9v7imc" fileName="images/bg_window.png" xy="-1,0" size="1500,930">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_ik9v" name="n7" src="ik9v7imd" fileName="images/bg_windowTitle.png" xy="371,-6">
-      <gearLook controller="bianhui" pages="0" values="1,0,0,0" default="1,0,1,0"/>
-      <relation target="" sidePair="center-center"/>
-    </image>
     <loader id="n4_hz87" name="icon" xy="371,-6" size="757,125" fill="scaleFree" clearOnPublish="true">
       <relation target="" sidePair="center-center"/>
     </loader>

wb_new_ui/assets/Common/package.xml

@@ -1081,7 +1081,7 @@
     <font id="qz637ij2" name="SIYUAN.TTF" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="nuxq7ijc" name="zjph_txt_zsyph_01.png" path="/font/images/"/>
     <image id="nuxq7ijd" name="zjph_txt_zsyph_02.png" path="/font/images/"/>
-    <image id="nuxq7ije" name="bxx_bg_01.png" path="/font/images/win/" exported="true"/>
+    <image id="nuxq7ije" name="bxx_bg_01.png" path="/font/images/win/" exported="true" scale="9grid" scale9grid="445,232,890,464"/>
     <image id="nuxq7ijf" name="wf_bg_01.png" path="/font/images/win/" exported="true"/>
     <image id="nuxq7ijg" name="ann_xiayibu.png" path="/component/create_room/image/"/>
     <image id="nuxq7ijh" name="ann_zhuobuyanse.png" path="/component/create_room/image/"/>

wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml

@@ -2,19 +2,22 @@
 <component size="1780,930">
   <controller name="mengzhu" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n16_isix" name="win_ws" xy="-495,-245" size="2790,1458" alpha="0" type="rect" lineSize="0" fillColor="#bf000000">
+    <graph id="n16_isix" name="win_ws" xy="-495,-245" size="2790,1458" type="rect" lineSize="0" fillColor="#bf000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     <image id="n20_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="0,0" size="1780,930">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n8_e5q7" name="tex_room_id" xy="978,125" pivot="0.5,0.5" anchor="true" size="300,49" group="n9_e5q7" font="Microsoft YaHei" fontSize="36" color="#495f55" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="房间号:123456"/>
-    <text id="n7_e5q7" name="tex_round" xy="684,123" pivot="0.5,0.5" anchor="true" size="170,49" group="n9_e5q7" font="Microsoft YaHei" fontSize="36" color="#495f55" align="center" autoSize="none" autoClearText="true" text="10/16"/>
-    <image id="n10_e5q7" name="n10" src="e5q7hua" fileName="images/info/room_info/rt (1).png" xy="550,104" group="n9_e5q7">
+    <image id="n30_dhos" name="n30" src="dhos7is3" fileName="component/Lst_info/roominfo_bg_2.png" xy="1,-2" size="1782,929" alpha="0"/>
+    <image id="n29_dhos" name="n29" src="dhos7is1" fileName="component/Lst_info/roominfo_bg_1.png" xy="20,103" size="1742,812"/>
+    <image id="n31_dhos" name="n31" src="dhos7is2" fileName="component/Lst_info/roominfo_title.png" xy="488,-6"/>
+    <text id="n8_e5q7" name="tex_room_id" xy="978,131" pivot="0.5,0.5" anchor="true" size="300,49" group="n9_e5q7" font="Microsoft YaHei" fontSize="36" color="#495f55" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="房间号:123456"/>
+    <text id="n7_e5q7" name="tex_round" xy="684,129" pivot="0.5,0.5" anchor="true" size="170,49" group="n9_e5q7" font="Microsoft YaHei" fontSize="36" color="#495f55" align="center" autoSize="none" autoClearText="true" text="10/16"/>
+    <image id="n10_e5q7" name="n10" src="e5q7hua" fileName="images/info/room_info/rt (1).png" xy="550,110" group="n9_e5q7">
       <relation target="n7_e5q7" sidePair="right-left"/>
     </image>
-    <text id="n14_e5q7" name="tex_room_name" xy="628,8" size="409,58" group="n9_e5q7" font="Microsoft YaHei" fontSize="43" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="玩法的名字"/>
-    <group id="n9_e5q7" name="n9" xy="550,8" size="578,141" advanced="true">
+    <text id="n14_e5q7" name="tex_room_name" xy="628,14" size="409,74" group="n9_e5q7" font="Microsoft YaHei" fontSize="43" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" autoClearText="true" text="未知房间"/>
+    <group id="n9_e5q7" name="n9" xy="550,14" size="578,141" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n15_jjon" name="n15" src="eeqmcgm" fileName="font/images/win/zz.png" pkg="27vd145b" xy="45,104" size="1688,606" visible="false">

wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml

@@ -74,16 +74,16 @@
     <group id="n35_rpaz" name="n35" xy="1479,56" size="221,35" group="n46_tqi8" visible="false" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <image id="n146_st2l" name="n146" src="cv577inh" fileName="images/bg_input2_h113.png" pkg="27vd145b" xy="1037,14" group="n148_st2l"/>
-    <text id="n147_st2l" name="tex_id" xy="1064,44" size="290,59" group="n148_st2l" font="ui://27vd145bik9v7imk" fontSize="44" color="#ffffff" vAlign="middle" autoSize="none" autoClearText="true" text="" input="true" prompt="请输入玩家id" maxLength="8"/>
-    <group id="n148_st2l" name="n148" xy="1037,14" size="344,113" group="n150_st2l" advanced="true"/>
-    <component id="n149_st2l" name="btn_search" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1383,8" size="261,138" group="n150_st2l">
+    <image id="n152_dhos" name="n152" src="dhos7irz" fileName="mgr/imgs/member_input.png" xy="1035,15" group="n148_st2l"/>
+    <text id="n147_st2l" name="tex_id" xy="1063,44" size="290,59" group="n148_st2l" font="ui://27vd145bik9v7imk" fontSize="44" color="#ffffff" vAlign="middle" autoSize="none" autoClearText="true" text="" input="true" prompt="请输入玩家id" maxLength="8"/>
+    <group id="n148_st2l" name="n148" xy="1035,15" size="344,113" group="n150_st2l" advanced="true"/>
+    <component id="n149_st2l" name="btn_search" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1382,8" size="261,138" group="n150_st2l">
       <Button icon="ui://m7iejg46cv577ipn"/>
     </component>
-    <group id="n150_st2l" name="group_search" xy="1037,8" size="607,138" group="n46_tqi8" advanced="true">
+    <group id="n150_st2l" name="group_search" xy="1035,8" size="608,138" group="n46_tqi8" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n46_tqi8" name="n46" xy="1037,8" size="662,138" group="n49_jd7v"/>
+    <group id="n46_tqi8" name="n46" xy="1035,8" size="664,138" group="n49_jd7v"/>
     <group id="n49_jd7v" name="n49" xy="20,8" size="1751,973" advanced="true">
       <gearDisplay controller="page" pages="0,1"/>
     </group>

wb_new_ui/assets/NewGroup/package.xml

@@ -1334,6 +1334,11 @@
     <image id="lqkg7irw" name="frame001.png" path="/mgr/imgs/" scale="9grid" scale9grid="33,28,66,56"/>
     <image id="lqkg7imv" name="frame003.png" path="/" scale="9grid" scale9grid="36,35,72,70"/>
     <component id="lqkg7iry" name="setting_confirm.xml" path="/"/>
+    <image id="dhos7irz" name="member_input.png" path="/mgr/imgs/"/>
+    <image id="dhos7is0" name="title_jiesan.png" path="/images/" exported="true"/>
+    <image id="dhos7is1" name="roominfo_bg_1.png" path="/component/Lst_info/" scale="9grid" scale9grid="36,29,72,58"/>
+    <image id="dhos7is2" name="roominfo_title.png" path="/component/Lst_info/"/>
+    <image id="dhos7is3" name="roominfo_bg_2.png" path="/component/Lst_info/" scale="9grid" scale9grid="33,29,66,58"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>