diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua
index 97afc0a2..13c4fa5e 100644
--- a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua
@@ -21,11 +21,13 @@ end
function M:InitView(url)
local room = self._room
UIPackage.AddPackage("extend/majiang/hechi/ui/Extend_MJ_HeChi")
- MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num)
+ --MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num)
+ MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_2_s2")
local _cardbox = self._view:GetChild("cardbox")
--self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false
self._ctr_cardbox = _cardbox:GetController("c1")
- self._tex_round = self._view:GetChild("tex_round")
+ self._tex_round1 = self._view:GetChild("tex_round1")
+ self._tex_round2 = self._view:GetChild("tex_round2")
self._tex_LeftCard = self._view:GetChild("remaining_card")
self._anchor = self._view:GetChild("mask_tips")
self._eventmap = {}
@@ -288,7 +290,8 @@ function M:UpdateCardBox(seat)
end
function M:UpdateRound(round)
- self._tex_round.text = "第 "..round.."/"..self._room.room_config.round.." 局"
+ self._tex_round1.text = round
+ self._tex_round2.text = self._room.room_config.round
end
function M:UpdateStep(step)
diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json
index f31709eb..dc8d4448 100644
--- a/wb_new_ui/.objs/fonts.json
+++ b/wb_new_ui/.objs/fonts.json
@@ -53,6 +53,7 @@ ui://h30s8vmela4e6
ui://eyxz924gffp34g
ui://4wmd3o8gvlhjde
ui://z3z0ysurvlhj7t
+ui://7ij0e6i2sv5g3
ui://96mvx2mlvlhjcsv
ui://boq0ohepvlhjd0
ui://v0j9abjygq7m7
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info b/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info
index e5ec0083..6b0aed9a 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info
@@ -1,4 +1,8 @@
{
- "adaptiveTest": true,
+ "objectStatus": {
+ "n63_10xl7": {
+ "hidden": true
+ }
+ },
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info
index 574ccbdb..3c83daed 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info
@@ -3,8 +3,17 @@
"n0_naup": {
"hidden": true
},
+ "n4_naup": {
+ "hidden": true
+ },
"n2_naup": {
"hidden": true
+ },
+ "n5_naup": {
+ "hidden": true
+ },
+ "n6_naup": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4e9.info b/wb_new_ui/.objs/metas/h30s8vme/la4e9.info
new file mode 100644
index 00000000..cfc08412
--- /dev/null
+++ b/wb_new_ui/.objs/metas/h30s8vme/la4e9.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n2_vqon": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
index 7f0d22d0..81bedff4 100644
--- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
+++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info
@@ -1,19 +1,7 @@
{
"objectStatus": {
- "n146_unv6": {
- "collapsed": true
- },
- "n131_xevg": {
- "collapsed": true
- },
"n121_xevg": {
"hidden": true
- },
- "n112_i9b1": {
- "collapsed": true
- },
- "n139_7upk": {
- "collapsed": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info
index c0e420a8..c3398239 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info
@@ -4,6 +4,5 @@
"hidden": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info
index 1c9b4d09..34092f09 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info
@@ -1,16 +1,22 @@
{
"objectStatus": {
- "n141_u26u": {
+ "n145_10tp2": {
"hidden": true
},
- "n145_10tp2": {
+ "n123_j06m": {
"hidden": true
},
"n156_10tp2": {
"hidden": true
},
+ "n122_cioe": {
+ "hidden": true
+ },
"n175_upe1": {
"hidden": true
+ },
+ "n141_u26u": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
index 9e26dfee..94ef5c85 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info
@@ -1 +1,37 @@
-{}
\ No newline at end of file
+{
+ "objectStatus": {
+ "n118_l7wn": {
+ "hidden": true
+ },
+ "n112_l7wn": {
+ "hidden": true
+ },
+ "n117_l7wn": {
+ "hidden": true
+ },
+ "n114_l7wn": {
+ "hidden": true
+ },
+ "n113_l7wn": {
+ "hidden": true
+ },
+ "n116_l7wn": {
+ "hidden": true
+ },
+ "n115_l7wn": {
+ "hidden": true
+ },
+ "n111_l7wn": {
+ "hidden": true
+ },
+ "n96_l7wn": {
+ "locked": true
+ },
+ "n63_omkm": {
+ "locked": true
+ },
+ "n119_l7wn": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info
index ff3594d8..9ca21216 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info
@@ -4,7 +4,8 @@
"hidden": true
},
"n10_zplu": {
- "hidden": true
+ "hidden": true,
+ "collapsed": true
},
"n6_e8zl": {
"hidden": true
diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info
index 40801f9b..313e4c55 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info
@@ -1,18 +1,21 @@
{
"objectStatus": {
- "n146_r4s4": {
- "collapsed": true
+ "n198_r0qx": {
+ "hidden": true
},
"n131_kwi0": {
+ "hidden": true,
"collapsed": true
},
- "n198_r0qx": {
+ "n199_t7dq": {
+ "hidden": true
+ },
+ "n162_g21o": {
"hidden": true
},
"n147_r4s4": {
"collapsed": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info
index 9e26dfee..01a6c101 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info
@@ -1 +1,16 @@
-{}
\ No newline at end of file
+{
+ "objectStatus": {
+ "n108_mpll": {
+ "hidden": true
+ },
+ "n99_kwi0": {
+ "hidden": true
+ },
+ "n107_mpll": {
+ "hidden": true
+ },
+ "n106_mpll": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info
index 9fec2107..aea58fad 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info
@@ -1,8 +1,5 @@
{
"objectStatus": {
- "n60_nld2": {
- "hidden": true
- },
"n24_ewd0": {
"collapsed": true
}
diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info
index 0aa4358b..91ab105d 100644
--- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info
+++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info
@@ -12,15 +12,9 @@
"n114_itp8": {
"hidden": true
},
- "n82_l2u4": {
- "collapsed": true
- },
"n107_go7q": {
"hidden": true
},
- "n71_l2u4": {
- "locked": true
- },
"n123_dzuu": {
"collapsed": true
}
diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info
index d233973f..1587d416 100644
--- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info
+++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info
@@ -6,9 +6,6 @@
"n6": {
"hidden": true
},
- "n33_e7qn": {
- "collapsed": true
- },
"n50_hez8": {
"locked": true
},
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index ee8f6773..cb9de7af 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -7,36 +7,104 @@
"ui://v0j9abjygq7ms2",
"ui://v0j9abjygq7m7m",
"ui://v0j9abjygq7mgx",
+ "ui://v0j9abjygq7mei",
"ui://v0j9abjygq7m8f",
+ "ui://v0j9abjygq7m8l",
+ "ui://v0j9abjyrdg6t9",
+ "ui://27vd145byffnj6",
"ui://27vd145bhez87j20",
"ui://v0j9abjygq7med",
"ui://m7iejg4610snh5j",
"ui://m7iejg46e5q7hu2",
"ui://2d9xdj6zl0lzb",
+ "ui://27vd145bg24i7ijv",
"ui://m7iejg46kwi0hkb",
+ "ui://m7iejg4610xl7i1w",
+ "ui://m7iejg46mpllhv2",
+ "ui://m7iejg46kwi0hkl",
+ "ui://m7iejg46mpllhv5",
+ "ui://m7iejg46kwi0hkg",
+ "ui://m7iejg46mkdvhdu",
+ "ui://m7iejg46r4s4hry",
+ "ui://m7iejg46jj657i2h",
+ "ui://m7iejg46mpllhv7",
+ "ui://m7iejg46k46xhuk",
+ "ui://m7iejg46kwi0hjx",
"ui://2d9xdj6z75efcz",
+ "ui://m7iejg46l7wn7i82",
+ "ui://27vd145bcjli6",
+ "ui://2d9xdj6z97mlcin",
"ui://h30s8vmela4eb",
+ "ui://h30s8vmela4e9",
+ "ui://h30s8vmela4e8",
+ "ui://h30s8vmela4e7",
+ "ui://h30s8vmela4e5",
"ui://z3z0ysurygxgd",
"ui://96mvx2ml10kys6",
+ "ui://7ij0e6i2sv5gk",
+ "ui://7ij0e6i2sv5gh",
+ "ui://d1qrzqprc4r116",
+ "ui://27vd145bh1uu3i",
"ui://96mvx2mlocbrsh",
"ui://96mvx2ml10kys0",
"ui://z3z0ysurr28252",
"ui://442j0uepygxgd",
"ui://2d9xdj6zomkm7cna",
"ui://2d9xdj6zxbqujn",
+ "ui://2d9xdj6zab5pcji",
+ "ui://m7iejg46ruljhmp",
"ui://27vd145bst2l7ijp",
"ui://2d9xdj6znaupko",
+ "ui://2d9xdj6znaupkn",
+ "ui://2d9xdj6znaupk8",
"ui://27vd145bhez87j27",
- "ui://v0j9abjygq7m8u"
+ "ui://v0j9abjygq7m8u",
+ "ui://v0j9abjygq7m8r"
],
- "test.device": "iPhone XR",
+ "test.device": "1080p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://96mvx2ml10kys6",
+ "doc.activeDoc": "ui://m7iejg46mpllhv5",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "96mvx2ml",
- "/"
+ "h30s8vme",
+ "/",
+ "h30s8vme",
+ "/component/",
+ "h30s8vme",
+ "/component/create_room/",
+ "h30s8vme",
+ "/component/create_room/image/",
+ "h30s8vme",
+ "/mgr/",
+ "h30s8vme",
+ "/mgr/imgs/",
+ "h30s8vme",
+ "/mgr/imgs/game/",
+ "d1qrzqpr",
+ "/",
+ "2d9xdj6z",
+ "/",
+ "2d9xdj6z",
+ "/component/",
+ "2d9xdj6z",
+ "/component/games/",
+ "2d9xdj6z",
+ "/component/user_info/",
+ "2d9xdj6z",
+ "/images/",
+ "2d9xdj6z",
+ "/images/LobbyMui/",
+ "2d9xdj6z",
+ "/mgr/",
+ "2d9xdj6z",
+ "/mgr/imgs/",
+ "m7iejg46",
+ "/",
+ "m7iejg46",
+ "/NGMui/",
+ "m7iejg46",
+ "/mgr/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Check.xml b/wb_new_ui/assets/Common/buttons/Btn_Check.xml
index 37541702..b6aab01a 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_Check.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_Check.xml
@@ -6,5 +6,5 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/font/images/setting/off.png b/wb_new_ui/assets/Common/font/images/setting/off.png
index c1b776ef..66addc14 100644
Binary files a/wb_new_ui/assets/Common/font/images/setting/off.png and b/wb_new_ui/assets/Common/font/images/setting/off.png differ
diff --git a/wb_new_ui/assets/Common/font/images/setting/off_1.png b/wb_new_ui/assets/Common/font/images/setting/off_1.png
new file mode 100644
index 00000000..c1b776ef
Binary files /dev/null and b/wb_new_ui/assets/Common/font/images/setting/off_1.png differ
diff --git a/wb_new_ui/assets/Common/font/images/setting/on.png b/wb_new_ui/assets/Common/font/images/setting/on.png
index 8462ab49..2f9c8306 100644
Binary files a/wb_new_ui/assets/Common/font/images/setting/on.png and b/wb_new_ui/assets/Common/font/images/setting/on.png differ
diff --git a/wb_new_ui/assets/Common/font/images/setting/on_1.png b/wb_new_ui/assets/Common/font/images/setting/on_1.png
new file mode 100644
index 00000000..8462ab49
Binary files /dev/null and b/wb_new_ui/assets/Common/font/images/setting/on_1.png differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 5b6420a6..d58c2602 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -599,8 +599,8 @@
-
-
+
+
@@ -1014,8 +1014,8 @@
-
-
+
+
@@ -1634,6 +1634,8 @@
+
+
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 af553653..70d9b3f3 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
@@ -1,152 +1,171 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_Common_Info.xml b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_Common_Info.xml
index 53db3f94..492ba7ef 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/Btn_Common_Info.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/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_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 2208005a..2869c830 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,14 +1,17 @@
-
-
+
+
-
+
-
+
+
+
+
-
+
\ 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 cf86ced8..34e662da 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,15 +1,15 @@
-
-
+
+
-
+
-
-
+
+
-
+
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 a0468cfd..7f179e05 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
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Frame 1273.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Frame 1273.png
new file mode 100644
index 00000000..f13dfeea
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Frame 1273.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2887.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2887.png
new file mode 100644
index 00000000..229524bd
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2887.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2934.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2934.png
new file mode 100644
index 00000000..63eab62d
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2934.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2935.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2935.png
new file mode 100644
index 00000000..f5bb3620
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2935.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2941.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2941.png
new file mode 100644
index 00000000..02fc5d7c
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 2941.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 5546.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 5546.png
new file mode 100644
index 00000000..6a0ae29c
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Rectangle 5546.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Vector 58.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Vector 58.png
new file mode 100644
index 00000000..acda0cf9
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/Vector 58.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/image 623.png b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/image 623.png
new file mode 100644
index 00000000..cc054a5e
Binary files /dev/null and b/wb_new_ui/assets/Info_MJ_HeChi/component/create_room/image/image 623.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HeChi/package.xml b/wb_new_ui/assets/Info_MJ_HeChi/package.xml
index 8d5eb2ba..98e70337 100644
--- a/wb_new_ui/assets/Info_MJ_HeChi/package.xml
+++ b/wb_new_ui/assets/Info_MJ_HeChi/package.xml
@@ -18,6 +18,14 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml
index 1caa7a6b..8d9f6889 100644
--- a/wb_new_ui/assets/Lobby/SettingWindow1.xml
+++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml
@@ -1,34 +1,37 @@
-
+
-
+
+
+
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml b/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
index ed099609..58b67a62 100644
--- a/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
+++ b/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
@@ -1,32 +1,51 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/games/component/Component2.xml b/wb_new_ui/assets/Lobby/component/games/component/Component2.xml
index 5bcf41d9..485a5492 100644
--- a/wb_new_ui/assets/Lobby/component/games/component/Component2.xml
+++ b/wb_new_ui/assets/Lobby/component/games/component/Component2.xml
@@ -1,16 +1,16 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/setting/Button5.xml b/wb_new_ui/assets/Lobby/component/setting/Button5.xml
index 5eb0753f..5f8d6bfd 100644
--- a/wb_new_ui/assets/Lobby/component/setting/Button5.xml
+++ b/wb_new_ui/assets/Lobby/component/setting/Button5.xml
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
index 57eddb7f..8feee290 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
@@ -1,49 +1,52 @@
-
-
-
+
+
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml b/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
index 9a14335f..c57d0ba6 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
@@ -1,24 +1,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml b/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
index fa436dab..4f59bb11 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
@@ -1,21 +1,21 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml b/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
index e8b86749..301ddfea 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
@@ -1,22 +1,22 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml b/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
index 10caf874..3b5be9c3 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
@@ -1,40 +1,42 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1222251.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1222251.png
new file mode 100644
index 00000000..2e1bc51d
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1222251.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1251.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1251.png
new file mode 100644
index 00000000..f2d35449
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1251.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1252.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1252.png
new file mode 100644
index 00000000..a63baee3
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1252.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1253.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1253.png
new file mode 100644
index 00000000..a09010bb
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1253.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1254.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1254.png
new file mode 100644
index 00000000..d8dec81a
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1254.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1255.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1255.png
new file mode 100644
index 00000000..ff28be0c
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1255.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1257.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1257.png
new file mode 100644
index 00000000..5864bb19
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1257.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1271.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1271.png
new file mode 100644
index 00000000..55dbec18
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1271.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 127116.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 127116.png
new file mode 100644
index 00000000..a25abc09
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 127116.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1273.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1273.png
new file mode 100644
index 00000000..fe98b77b
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1273.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1275.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1275.png
new file mode 100644
index 00000000..c78b70b9
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1275.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 12761.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 12761.png
new file mode 100644
index 00000000..92cc522f
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 12761.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1309.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1309.png
new file mode 100644
index 00000000..1d73481d
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1309.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1311.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1311.png
new file mode 100644
index 00000000..cbbcc3e4
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1311.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1313.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1313.png
new file mode 100644
index 00000000..1df00f58
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Frame 1313.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290118.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290118.png
new file mode 100644
index 00000000..c8c0c034
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290118.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908(1).png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908(1).png
new file mode 100644
index 00000000..43790ba1
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908(1).png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908.png
new file mode 100644
index 00000000..e9b9028c
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2908.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909(1).png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909(1).png
new file mode 100644
index 00000000..32867855
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909(1).png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909.png
new file mode 100644
index 00000000..59a9b0fa
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2909.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290911.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290911.png
new file mode 100644
index 00000000..3c98b18e
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 290911.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2910.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2910.png
new file mode 100644
index 00000000..2932f551
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2910.png differ
diff --git a/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2915.png b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2915.png
new file mode 100644
index 00000000..ffbbd8de
Binary files /dev/null and b/wb_new_ui/assets/Lobby/images/LobbyMui/Rectangle 2915.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 93a69260..6f227851 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -453,6 +453,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1)(1).xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1)(1).xml
index 9a0a85c8..ff35a4ef 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1)(1).xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1)(1).xml
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
index 73bad95f..7f8cfe86 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml b/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
index aea080bd..5e7c5895 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
@@ -10,25 +10,25 @@
-
+
-
+
-
+
-
+
-
+
@@ -77,7 +77,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1133(1).png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1133(1).png
new file mode 100644
index 00000000..41962fb9
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1133(1).png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1248971.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1248971.png
new file mode 100644
index 00000000..55dbec18
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1248971.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1258.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1258.png
new file mode 100644
index 00000000..cf4ffe71
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1258.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 127154.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 127154.png
new file mode 100644
index 00000000..f5d1fe06
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 127154.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1273(1).png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1273(1).png
new file mode 100644
index 00000000..f13dfeea
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1273(1).png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1278.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1278.png
new file mode 100644
index 00000000..781cff07
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1278.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Frame 1379.png b/wb_new_ui/assets/NewGroup/NGMui/Frame 1379.png
new file mode 100644
index 00000000..7bfe5476
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Frame 1379.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 2914(1).png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 2914(1).png
new file mode 100644
index 00000000..78199278
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 2914(1).png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 370(1).png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 370(1).png
new file mode 100644
index 00000000..67806734
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 370(1).png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 37480.png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 37480.png
new file mode 100644
index 00000000..3c98b18e
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 37480.png differ
diff --git a/wb_new_ui/assets/NewGroup/NGMui/Rectangle 5546.png b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 5546.png
new file mode 100644
index 00000000..6a0ae29c
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/NGMui/Rectangle 5546.png differ
diff --git a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
index 72f62066..32b187fd 100644
--- a/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
+++ b/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
@@ -1,36 +1,36 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
index c1f389ce..4a4c18f7 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
@@ -11,7 +11,7 @@
-
+
@@ -55,9 +55,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput3.xml b/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
index 21ee389b..15a7783d 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput3.xml
@@ -1,66 +1,66 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml b/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml
index 366aa32c..013f62d6 100644
--- a/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml
@@ -1,30 +1,30 @@
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/images/main/Button7.xml b/wb_new_ui/assets/NewGroup/images/main/Button7.xml
index b0739c93..11db46ba 100644
--- a/wb_new_ui/assets/NewGroup/images/main/Button7.xml
+++ b/wb_new_ui/assets/NewGroup/images/main/Button7.xml
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml
index c28e4efc..cfdc8a3d 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml
@@ -1,40 +1,41 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label.xml b/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label.xml
index 695b8486..a311f026 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label.xml
@@ -1,18 +1,18 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/game/btn_mng_edit.xml b/wb_new_ui/assets/NewGroup/mgr/component/game/btn_mng_edit.xml
index da5854a0..a7bc1bd2 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/game/btn_mng_edit.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/game/btn_mng_edit.xml
@@ -1,7 +1,9 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/game/panel_fag.xml b/wb_new_ui/assets/NewGroup/mgr/component/game/panel_fag.xml
index 3d1dec00..daec0209 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/game/panel_fag.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/game/panel_fag.xml
@@ -1,134 +1,133 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/play_set/btn_playset_add.xml b/wb_new_ui/assets/NewGroup/mgr/component/play_set/btn_playset_add.xml
index 3e31059c..066341dc 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/play_set/btn_playset_add.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/play_set/btn_playset_add.xml
@@ -1,7 +1,9 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml b/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml
index 518bff62..bab80cb1 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml
@@ -1,208 +1,195 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/play_set/panel_play_set.xml b/wb_new_ui/assets/NewGroup/mgr/component/play_set/panel_play_set.xml
index eeb82987..8c34f4a0 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/play_set/panel_play_set.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/play_set/panel_play_set.xml
@@ -1,152 +1,151 @@
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/promote/btn_promote_remove.xml b/wb_new_ui/assets/NewGroup/mgr/component/promote/btn_promote_remove.xml
index 0c51be5c..57aa62ef 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/promote/btn_promote_remove.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/promote/btn_promote_remove.xml
@@ -1,7 +1,9 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index c4b0dd4c..6bbaea16 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1365,7 +1365,7 @@
-
+
@@ -1524,6 +1524,17 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/tuoguan/ComboBox1.xml b/wb_new_ui/assets/NewGroup/tuoguan/ComboBox1.xml
index f31211c3..31cb4b9d 100644
--- a/wb_new_ui/assets/NewGroup/tuoguan/ComboBox1.xml
+++ b/wb_new_ui/assets/NewGroup/tuoguan/ComboBox1.xml
@@ -1,15 +1,16 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index 5284dd65..52da2353 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index 2e8a3545..141650b8 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png
index 5fa444c3..e1a4de75 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png
index dc8fbfaf..e361156f 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png
index 55b963fa..01b2b40c 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png
index 8ac5736f..29db171f 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png
index 8b0074c1..e506422e 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
index d25bf70d..e2eb4f19 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
index 907f30cd..2567509e 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
index 27393606..abbe3bae 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png
index ea5d5b8f..330cf79e 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png
index ef51f7f6..db16fb9a 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ
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 8adfa046..286c8f04 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/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index 2c9b54a6..15e755e1 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 80bb6037..31f75585 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 78a72616..ca586179 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
new file mode 100644
index 00000000..7ae59989
Binary files /dev/null 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_3.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png.meta
new file mode 100644
index 00000000..908bf600
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 37068f87923ae9344a73801e5993cbfa
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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
new file mode 100644
index 00000000..b234a674
Binary files /dev/null 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_4.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png.meta
new file mode 100644
index 00000000..8a472373
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 185d765dbb2aa854293b838736913bf0
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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
new file mode 100644
index 00000000..3d596fdb
Binary files /dev/null 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_5.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png.meta
new file mode 100644
index 00000000..8b6623d7
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 53c23977edec3ba41a201a93d26e77c8
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png
new file mode 100644
index 00000000..d8dec81a
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png.meta
new file mode 100644
index 00000000..aad757e0
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_djtx7ioe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: e03b5d32124d12849aa62bf46872aa84
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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 18bb9c13..8f7560ec 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_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index dd39b86b..ba4f52f3 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
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 d2c3a443..ab340f47 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 91f88860..634f25bb 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 00460b89..cb95e782 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
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png
index 59b36043..04c04fbe 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png
index 15379d07..d5980970 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_7.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_7.png
index 4d4f86c3..f3b6729a 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png
index a8ee0829..df6a305e 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 4228ae16..d8f85538 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_atlas0.png
index eceea89f..16f10819 100644
Binary files a/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/hechi/ui/Info_MJ_HeChi_atlas0.png 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 fa906e61..04c52f6c 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/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index fb450e10..abd8db31 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index c59c6eab..82e4a51e 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png
index ad4bbfb8..befff2c5 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta
new file mode 100644
index 00000000..e7860a66
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 6f284700c5bbdf04a89aa41462c47a49
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png
index 21dde2c5..032992b9 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta
new file mode 100644
index 00000000..ef7fd2d7
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 4f6381c17b7f28344b17be87bb9bbb4a
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png
index 62012fdd..77616591 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta
new file mode 100644
index 00000000..c128e910
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 59a3cc2b02a1cf94a82d2c1cc1fa29c1
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index c3cd1123..8702d03a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz94.mp3.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz94.mp3.meta
new file mode 100644
index 00000000..2383920b
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz94.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 75909127bc816f54bb8a4907fad9d93e
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz97.mp3.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz97.mp3.meta
new file mode 100644
index 00000000..738fa25d
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz97.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 560bd742fd35c3a42a614a4316a8f366
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz9s.mp3.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz9s.mp3.meta
new file mode 100644
index 00000000..5cef546d
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_prgz9s.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 876b9a1af0287a34080e1004871a12a8
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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 70a6cdd4..88920317 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 21d34f9e..6c732247 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