diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
index 7bac0aa2..ab891e2e 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
@@ -69,8 +69,8 @@ function M:FillGameData()
local games = DataManager.SelfUser.games
local lst_game = self._view:GetChild("lst_game")
-- local n65 = lst_game:GetChild("n65")
- printlog("jefe all games")
- pt(games)
+ -- printlog("jefe all games")
+ -- pt(games)
-- n65.visible = false
for i = 1, #games do
local game = games[i]
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua
index 6b9b671a..e92c07f2 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua
@@ -80,7 +80,7 @@ function LuaPrint(lua_table, limit, indent, step)
return content
end
-function --printlog(...)
+function printlog(...)
if true then
print(...)
end
diff --git a/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info b/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info
new file mode 100644
index 00000000..cfc08412
--- /dev/null
+++ b/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n2_vqon": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info b/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info
new file mode 100644
index 00000000..cfc08412
--- /dev/null
+++ b/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n2_vqon": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info
index f816c2a2..1629cbbb 100644
--- a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info
+++ b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info
@@ -1,11 +1,6 @@
{
"objectStatus": {
- "n166_ozsy": {
- "hidden": true,
- "collapsed": true
- },
- "n149_udgc": {
- "hidden": true,
+ "n146_udgc": {
"collapsed": true
},
"n153_udgc": {
@@ -13,6 +8,20 @@
},
"n152_udgc": {
"hidden": true
+ },
+ "n149_udgc": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n143_udgc": {
+ "collapsed": true
+ },
+ "n140_udgc": {
+ "collapsed": true
+ },
+ "n166_ozsy": {
+ "hidden": true,
+ "collapsed": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
index 66e673db..ffaafa74 100644
--- a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
+++ b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info
@@ -6,25 +6,13 @@
"n106_t038": {
"hidden": true
},
- "n163_ozsy": {
+ "n74_nip5": {
"hidden": true
},
- "n122_c4r1": {
+ "n103_t038": {
"collapsed": true
},
- "n154_j47e": {
- "collapsed": true
- },
- "n146_piwz": {
- "collapsed": true
- },
- "n136_c4r1": {
- "collapsed": true
- },
- "n15_mw5l": {
- "collapsed": true
- },
- "n74_nip5": {
+ "n163_ozsy": {
"hidden": true
},
"n160_ozsy": {
diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
index 81bedff4..e631122c 100644
--- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
+++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
@@ -1,7 +1,25 @@
{
"objectStatus": {
+ "n153_la4e": {
+ "collapsed": true
+ },
+ "n130_xevg": {
+ "collapsed": true
+ },
+ "n106_t038": {
+ "collapsed": true
+ },
+ "n123_xevg": {
+ "collapsed": true
+ },
+ "n150_la4e": {
+ "collapsed": true
+ },
"n121_xevg": {
"hidden": true
+ },
+ "n116_xevg": {
+ "collapsed": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/parowutd/99we8.info b/wb_new_ui/.objs/metas/parowutd/99we8.info
new file mode 100644
index 00000000..87425beb
--- /dev/null
+++ b/wb_new_ui/.objs/metas/parowutd/99we8.info
@@ -0,0 +1,25 @@
+{
+ "objectStatus": {
+ "n445_dsxf": {
+ "collapsed": true
+ },
+ "n405_gtcb": {
+ "hidden": true
+ },
+ "n409_gtcb": {
+ "collapsed": true
+ },
+ "n451_8fpn": {
+ "collapsed": true
+ },
+ "n5_mw5l": {
+ "collapsed": true
+ },
+ "n305_bn5c": {
+ "collapsed": true
+ },
+ "n428_gtcb": {
+ "collapsed": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/parowutd/99we9.info b/wb_new_ui/.objs/metas/parowutd/99we9.info
new file mode 100644
index 00000000..cfc08412
--- /dev/null
+++ b/wb_new_ui/.objs/metas/parowutd/99we9.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n2_vqon": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info
index 52fe77fb..5827a5c5 100644
--- a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info
+++ b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info
@@ -1,19 +1,12 @@
{
"objectStatus": {
- "n46_6cpq": {
- "collapsed": true
- },
- "n82_e8zl": {
+ "n56_6cpq": {
"hidden": true
},
- "n9_mw5l": {
- "collapsed": true
- },
- "n112_i9b1": {
- "collapsed": true
- },
- "n162_mpnc": {
- "collapsed": true
+ "n82_e8zl": {
+ "collapsed": true,
+ "locked": true,
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 051cfd38..27816b4d 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -2,11 +2,15 @@
"libview.firstColumnWidth": 384,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://m7iejg46kwi0hkb",
- "ui://2d9xdj6z75efcz",
"ui://h30s8vmela4eb",
"ui://7ij0e6i2sv5gk",
- "ui://7ij0e6i2sv5gh"
+ "ui://m7iejg46kwi0hkb",
+ "ui://2d9xdj6z75efcz",
+ "ui://2d9xdj6z97mlcin",
+ "ui://qubt49z8mpncc1i",
+ "ui://d1qrzqprc4r116",
+ "ui://parowutd99we8",
+ "ui://parowutd99we7"
],
"test.device": "1080p Phone",
"canvasColor": 10066329,
@@ -14,30 +18,8 @@
"doc.activeDoc": "ui://7ij0e6i2sv5gk",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "h30s8vme",
- "/",
- "h30s8vme",
- "/component/",
- "h30s8vme",
- "/component/create_room/",
- "h30s8vme",
- "/component/create_room/image/",
- "h30s8vme",
- "/mgr/",
- "h30s8vme",
- "/mgr/imgs/",
- "h30s8vme",
- "/mgr/imgs/game/",
- "d1qrzqpr",
- "/",
- "7ij0e6i2",
- "/",
- "7ij0e6i2",
- "/component/",
- "7ij0e6i2",
- "/component/create_room/",
- "7ij0e6i2",
- "/component/create_room/image/"
+ "96mvx2ml",
+ "/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_Common_Info.xml b/wb_new_ui/assets/Common/component/create_room/Btn_Common_Info.xml
index aa117457..43f6f4ee 100644
--- a/wb_new_ui/assets/Common/component/create_room/Btn_Common_Info.xml
+++ b/wb_new_ui/assets/Common/component/create_room/Btn_Common_Info.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
index 9faf0ba9..9f7182a3 100644
--- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
@@ -1,17 +1,17 @@
-
-
+
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
index 2869e273..f051996f 100644
--- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
+++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
@@ -1,11 +1,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Common/component/create_room/di01.xml b/wb_new_ui/assets/Common/component/create_room/di01.xml
index 7f1a226d..263197fd 100644
--- a/wb_new_ui/assets/Common/component/create_room/di01.xml
+++ b/wb_new_ui/assets/Common/component/create_room/di01.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml b/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml
index 70d9b3f3..fa72f841 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/Cgm_create_room.xml
@@ -3,20 +3,20 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -51,25 +51,25 @@
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -78,30 +78,30 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -113,42 +113,42 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -158,7 +158,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox.xml
index 2869c830..96f550cd 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox.xml
@@ -1,6 +1,6 @@
-
+
@@ -11,7 +11,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox2.xml
index 34e662da..92799b04 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox2.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_cr_checkbox2.xml
@@ -1,11 +1,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/di01.xml b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/di01.xml
index 7f179e05..85bacae3 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/di01.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/di01.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml b/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
index 5c91cd02..e80d93b1 100644
--- a/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
+++ b/wb_new_ui/assets/Info_MJ_HongZhong/Cgm_create_room_yueyang.xml
@@ -1,231 +1,245 @@
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/Frame 1273.png b/wb_new_ui/assets/Info_MJ_HongZhong/Frame 1273.png
new file mode 100644
index 00000000..f13dfeea
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/Frame 1273.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 2887.png b/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 2887.png
new file mode 100644
index 00000000..229524bd
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 2887.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 5546.png b/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 5546.png
new file mode 100644
index 00000000..6a0ae29c
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/Rectangle 5546.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon.png
index 65f63bb2..cbbcc3e4 100644
Binary files a/wb_new_ui/assets/Info_MJ_HongZhong/icon.png and b/wb_new_ui/assets/Info_MJ_HongZhong/icon.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon_3.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon_3.png
new file mode 100644
index 00000000..65f63bb2
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/icon_3.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/image 623.png b/wb_new_ui/assets/Info_MJ_HongZhong/image 623.png
new file mode 100644
index 00000000..cc054a5e
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HongZhong/image 623.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/package.xml b/wb_new_ui/assets/Info_MJ_HongZhong/package.xml
index 1219d549..660988ae 100644
--- a/wb_new_ui/assets/Info_MJ_HongZhong/package.xml
+++ b/wb_new_ui/assets/Info_MJ_HongZhong/package.xml
@@ -4,10 +4,15 @@
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Cgm_create_room.xml b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Cgm_create_room.xml
index 46d55f89..9175a543 100644
--- a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Cgm_create_room.xml
@@ -1,171 +1,195 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Frame 1273.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Frame 1273.png
new file mode 100644
index 00000000..f13dfeea
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Frame 1273.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 2887.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 2887.png
new file mode 100644
index 00000000..229524bd
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 2887.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 5546.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 5546.png
new file mode 100644
index 00000000..6a0ae29c
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/Rectangle 5546.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/image 623.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/image 623.png
new file mode 100644
index 00000000..cc054a5e
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/image 623.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml
index 8964d177..3042fcfe 100644
--- a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml
+++ b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/package.xml
@@ -8,6 +8,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
index 449fa80c..7f1ddfec 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/Cgm_create_room.xml
@@ -1,158 +1,166 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Frame 1273.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Frame 1273.png
new file mode 100644
index 00000000..f13dfeea
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Frame 1273.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2887.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2887.png
new file mode 100644
index 00000000..229524bd
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2887.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2934.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2934.png
new file mode 100644
index 00000000..63eab62d
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2934.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2935.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2935.png
new file mode 100644
index 00000000..f5bb3620
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2935.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2941.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2941.png
new file mode 100644
index 00000000..02fc5d7c
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 2941.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 5546.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 5546.png
new file mode 100644
index 00000000..6a0ae29c
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Rectangle 5546.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/Vector 58.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/Vector 58.png
new file mode 100644
index 00000000..acda0cf9
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/Vector 58.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_Common_Info.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_Common_Info.xml
index 3df1fa81..223b35c5 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_Common_Info.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_Common_Info.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox.xml
index cfa6bac7..97a879e3 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox.xml
@@ -1,14 +1,17 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox2.xml
index a28e4518..ed585424 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox2.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/Btn_cr_checkbox2.xml
@@ -1,14 +1,17 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/di01.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/di01.xml
index 5ce1ffe8..263197fd 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/di01.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/component/create_room/di01.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/icon.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/icon.png
index f7c2dee5..cbbcc3e4 100644
Binary files a/wb_new_ui/assets/Info_Poker_FanPaoFa/icon.png and b/wb_new_ui/assets/Info_Poker_FanPaoFa/icon.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/icon_3.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/icon_3.png
new file mode 100644
index 00000000..f7c2dee5
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/icon_3.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/image 623.png b/wb_new_ui/assets/Info_Poker_FanPaoFa/image 623.png
new file mode 100644
index 00000000..cc054a5e
Binary files /dev/null and b/wb_new_ui/assets/Info_Poker_FanPaoFa/image 623.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FanPaoFa/package.xml b/wb_new_ui/assets/Info_Poker_FanPaoFa/package.xml
index c4734deb..71832041 100644
--- a/wb_new_ui/assets/Info_Poker_FanPaoFa/package.xml
+++ b/wb_new_ui/assets/Info_Poker_FanPaoFa/package.xml
@@ -13,9 +13,18 @@
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/Creat_RunFast_yueyang.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/Creat_RunFast_yueyang.xml
index 2054f9dc..eac55cac 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew/Creat_RunFast_yueyang.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew/Creat_RunFast_yueyang.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -14,7 +14,7 @@
-
+
@@ -25,25 +25,25 @@
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -52,14 +52,14 @@
-
+
-
+
-
+
@@ -69,65 +69,65 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -135,90 +135,90 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
@@ -227,31 +227,35 @@
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_Common_Info.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_Common_Info.xml
index 0e3ac190..fb750c0b 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_Common_Info.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_Common_Info.xml
@@ -2,10 +2,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox.xml
index bb05bcf6..3f77a311 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox.xml
@@ -11,7 +11,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox2.xml
index 1f33a2da..74579d78 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox2.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/Btn_cr_checkbox2.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/di01.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/di01.xml
index c73a7899..e8c563fc 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/di01.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew/component/create_room/di01.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew_old/package.xml b/wb_new_ui/assets/Info_Poker_RunFastNew_old/package.xml
index 66693983..32bd2ee2 100644
--- a/wb_new_ui/assets/Info_Poker_RunFastNew_old/package.xml
+++ b/wb_new_ui/assets/Info_Poker_RunFastNew_old/package.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 286c8f04..2acd90ae 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes
index 04c52f6c..9c26a88d 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_atlas0.png
index 49752435..85fd72e8 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_fui.bytes
index 90771b83..1637248f 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/hongzhong/ui/Info_MJ_HongZhong_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_atlas0.png
index 6835d6c7..185e44ec 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_fui.bytes
index e2b25bfd..a36f0cfc 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/zhuanzhuan/ui/Info_MJ_ZhuanZhuan_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png
index b617a55e..2d3954fa 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes
index ea56a6fb..a083d548 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Info_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_atlas0.png b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_atlas0.png
index a89ebfaa..7a3dea2a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_atlas0.png and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_fui.bytes
index 6856fbb6..764a97a8 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Info_Poker_FanPaoFa_fui.bytes differ