diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua
index a2b4f92c..4d63e869 100644
--- a/lua_probject/base_project/Game/View/ResultView.lua
+++ b/lua_probject/base_project/Game/View/ResultView.lua
@@ -119,16 +119,16 @@ function M:init(url, isBigFull)
local big_result = self._view:GetChild('big_result')
if big_result ~= nil then
- if isBigFull then
-
- else
- self._full = true
- big_result:AddRelation(self._view, RelationType.Size)
- big_result.width = self._view.width
- big_result.height = self._view.height
- end
-
-
+ if isBigFull then
+
+ else
+ self._full = true
+ big_result:AddRelation(self._view, RelationType.Size)
+ big_result.width = self._view.width
+ big_result.height = self._view.height
+ end
+
+
local btn_share_copy = big_result:GetChild('btn_share_copy')
if btn_share_copy then
btn_share_copy.onClick:Set(
@@ -321,7 +321,24 @@ function M:InitBigResult(room, fontsize)
item:GetChild('txt_userid').text = player_info.userId
end
- -- ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject)
+ --ImageLoad.Load(player_info.head_url, item:GetChild('head').icon)
+
+ -- 获取头像组件
+ local head_component = item:GetChild('head')
+ if head_component then
+ local icon_loader = head_component._iconObject
+
+ -- 检查头像 URL 是否有效
+ local head_url = player_info.head_url or player_info.portrait
+ if not head_url or head_url == "" then
+ -- 使用默认头像(基于 uid 生成固定路径)
+ local uid = player_info.userId or player_info.uid or 0
+ head_url = "ui://Common/Head" .. tostring(uid % 10)
+ end
+
+ -- 异步加载头像到 icon 装载器
+ ImageLoad.Load(head_url, icon_loader)
+ end
if player_info.entrust ~= nil and player_info.entrust == true then
item:GetController('entrust').selectedIndex = 1
diff --git a/wb_new_ui/.objs/metas/27vd145b/93q2c0.info b/wb_new_ui/.objs/metas/27vd145b/93q2c0.info
new file mode 100644
index 00000000..a1659963
--- /dev/null
+++ b/wb_new_ui/.objs/metas/27vd145b/93q2c0.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n3_93q2": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmg83.info b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info
new file mode 100644
index 00000000..9313c2c7
--- /dev/null
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info
@@ -0,0 +1,13 @@
+{
+ "objectStatus": {
+ "n6_rfcn": {
+ "hidden": true
+ },
+ "n3_e54q": {
+ "hidden": true
+ },
+ "n4_jdf3": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmga1.info b/wb_new_ui/.objs/metas/3n2top74/kpmga1.info
new file mode 100644
index 00000000..953f551c
--- /dev/null
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmga1.info
@@ -0,0 +1,10 @@
+{
+ "objectStatus": {
+ "n1_i3h6": {
+ "hidden": true
+ },
+ "n0_i3h6": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info b/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info
new file mode 100644
index 00000000..a8d6d570
--- /dev/null
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n47_kx91": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmglv.info b/wb_new_ui/.objs/metas/3n2top74/kpmglv.info
new file mode 100644
index 00000000..9d4a0747
--- /dev/null
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmglv.info
@@ -0,0 +1,25 @@
+{
+ "objectStatus": {
+ "n9": {
+ "hidden": true
+ },
+ "n21_n6fs": {
+ "hidden": true
+ },
+ "n7": {
+ "hidden": true
+ },
+ "n5": {
+ "hidden": true
+ },
+ "n20_qpk6": {
+ "hidden": true
+ },
+ "n12_yyhx": {
+ "hidden": true
+ },
+ "n6": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info b/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info
new file mode 100644
index 00000000..81ae3fda
--- /dev/null
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info
@@ -0,0 +1,13 @@
+{
+ "objectStatus": {
+ "n7_f2pr": {
+ "hidden": true
+ },
+ "n3_h1uu": {
+ "hidden": true
+ },
+ "n4_h1uu": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info
index 377e1385..5c73b4c2 100644
--- a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info
@@ -9,6 +9,9 @@
"n50_hkbm": {
"hidden": true
},
+ "n85_p2ub": {
+ "hidden": true
+ },
"n47_pue4": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info
index 45c41266..330183f0 100644
--- a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info
+++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info
@@ -1,13 +1,27 @@
{
"objectStatus": {
- "n121_ckvb": {
+ "n141_ckvb": {
"locked": true
},
"n166_ukp7": {
"hidden": true
},
+ "n87_q50p": {
+ "hidden": true
+ },
"n131_ckvb": {
- "locked": true,
+ "hidden": true
+ },
+ "n121_ckvb": {
+ "locked": true
+ },
+ "n120_r1z9": {
+ "hidden": true
+ },
+ "n122_ckvb": {
+ "locked": true
+ },
+ "n112_rnez": {
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info
index 13fd69a7..9d5fa472 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info
@@ -1,11 +1,14 @@
{
"objectStatus": {
- "n79_l2u4": {
- "hidden": true
+ "n118_nynz": {
+ "locked": true
},
"n103_dnw9": {
"hidden": true
},
+ "n79_l2u4": {
+ "hidden": true
+ },
"n96_dnw9": {
"hidden": true
},
@@ -21,9 +24,6 @@
"n89_8sat": {
"hidden": true
},
- "n100_dnw9": {
- "hidden": true
- },
"n114_itp8": {
"hidden": true
},
@@ -41,6 +41,9 @@
},
"n116_u50h": {
"hidden": true
+ },
+ "n100_dnw9": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info
index 73dab957..30fbdf92 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info
@@ -1,11 +1,5 @@
{
"objectStatus": {
- "n35_piv9": {
- "hidden": true
- },
- "n45_ona1": {
- "hidden": true
- },
"n51_tki6": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info
index e57075c4..1e0d5ea8 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info
@@ -6,10 +6,13 @@
"n28_tjnv": {
"hidden": true
},
+ "n29_tjnv": {
+ "hidden": true
+ },
"n15_tjnv": {
"hidden": true
},
- "n29_tjnv": {
+ "n5_tjnv": {
"hidden": true
}
},
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info
index 9e26dfee..ee2ed671 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info
@@ -1 +1,29 @@
-{}
\ No newline at end of file
+{
+ "objectStatus": {
+ "n27_ld1z": {
+ "hidden": true
+ },
+ "n23_xk2u": {
+ "hidden": true
+ },
+ "n22_xk2u": {
+ "hidden": true
+ },
+ "n25_xk2u": {
+ "hidden": true
+ },
+ "n10_tjnv": {
+ "hidden": true
+ },
+ "n24_xk2u": {
+ "hidden": true
+ },
+ "n0_tjnv": {
+ "hidden": true
+ },
+ "n28_frte": {
+ "hidden": true,
+ "collapsed": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info
index d055db31..ef2725e6 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info
@@ -1,13 +1,16 @@
{
"objectStatus": {
- "n40_ona1": {
- "hidden": true
+ "n110_itp8": {
+ "locked": true
},
"n36_piv9": {
"hidden": true
},
"n22_xtwh": {
"hidden": true
+ },
+ "n40_ona1": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info
index 43591265..e7b5c6ab 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info
@@ -1,10 +1,16 @@
{
"objectStatus": {
- "n4_hz87": {
+ "n8_ld1z": {
+ "hidden": true
+ },
+ "n5_ik9v": {
"hidden": true
},
"n6_ik9v": {
"hidden": true
+ },
+ "n4_hz87": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
index b194a727..726e3700 100644
--- a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
+++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
@@ -1,19 +1,23 @@
{
"objectStatus": {
- "n50_hkbm": {
- "hidden": true
- },
- "n17": {
+ "n47_pue4": {
"hidden": true
},
"n104_ni5n": {
"hidden": true
},
- "n109_ni5n": {
+ "n17": {
"hidden": true
},
- "n47_pue4": {
+ "n30_lwcl": {
+ "hidden": true
+ },
+ "n50_hkbm": {
+ "hidden": true
+ },
+ "n26": {
"hidden": true
}
- }
+ },
+ "adaptiveTest": true
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info
new file mode 100644
index 00000000..b848688b
--- /dev/null
+++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n76_o49p": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info
new file mode 100644
index 00000000..6b34bbff
--- /dev/null
+++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n74_o49p": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info
new file mode 100644
index 00000000..30d8b9f4
--- /dev/null
+++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info
@@ -0,0 +1,28 @@
+{
+ "objectStatus": {
+ "n34_k3io": {
+ "hidden": true
+ },
+ "n181_r1z9": {
+ "hidden": true
+ },
+ "n163_o49p": {
+ "hidden": true
+ },
+ "n179_kxwj": {
+ "hidden": true
+ },
+ "n149_qpk6": {
+ "hidden": true
+ },
+ "n170_o49p": {
+ "hidden": true
+ },
+ "n194_syh3": {
+ "hidden": true
+ },
+ "n35_k3io": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info
new file mode 100644
index 00000000..81ae3fda
--- /dev/null
+++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info
@@ -0,0 +1,13 @@
+{
+ "objectStatus": {
+ "n7_f2pr": {
+ "hidden": true
+ },
+ "n3_h1uu": {
+ "hidden": true
+ },
+ "n4_h1uu": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info
new file mode 100644
index 00000000..b060ba87
--- /dev/null
+++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n0_mk2u": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info b/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info
new file mode 100644
index 00000000..f597808c
--- /dev/null
+++ b/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info
@@ -0,0 +1,25 @@
+{
+ "objectStatus": {
+ "n21_mk2u": {
+ "hidden": true
+ },
+ "n28_o49p": {
+ "hidden": true
+ },
+ "n29_o49p": {
+ "hidden": true
+ },
+ "n1": {
+ "hidden": true
+ },
+ "n25_oynr": {
+ "hidden": true
+ },
+ "n22_mk2u": {
+ "hidden": true
+ },
+ "n7": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info b/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info
new file mode 100644
index 00000000..57952e29
--- /dev/null
+++ b/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info
@@ -0,0 +1,10 @@
+{
+ "objectStatus": {
+ "n28_e54q": {
+ "hidden": true
+ },
+ "n76_o49p": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info b/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info
index 76f29fd4..ff1c3273 100644
--- a/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info
+++ b/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info
@@ -12,6 +12,9 @@
"n38_e7qn": {
"hidden": true
},
+ "n74_o49p": {
+ "hidden": true
+ },
"n54_nu0l": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info b/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info
index fbacc469..8cce1417 100644
--- a/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info
+++ b/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info
@@ -1,39 +1,42 @@
{
"objectStatus": {
- "n162_o49p": {
+ "n174_fgao": {
"hidden": true
},
"n175_fgao": {
"hidden": true
},
- "n35_k3io": {
- "hidden": true
- },
- "n46_u4l2": {
- "hidden": true
- },
- "n34_k3io": {
+ "n31_h1uu": {
"hidden": true
},
"n163_o49p": {
"hidden": true
},
- "n179_kxwj": {
+ "n181_m093": {
"hidden": true
},
- "n178_cbxl": {
- "hidden": true
- },
- "n170_o49p": {
+ "n162_o49p": {
"hidden": true
},
"n37_kba2": {
"hidden": true
},
- "n31_h1uu": {
+ "n178_cbxl": {
"hidden": true
},
- "n174_fgao": {
+ "n179_kxwj": {
+ "hidden": true
+ },
+ "n34_k3io": {
+ "hidden": true
+ },
+ "n35_k3io": {
+ "hidden": true
+ },
+ "n170_o49p": {
+ "hidden": true
+ },
+ "n46_u4l2": {
"hidden": true
}
},
diff --git a/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info b/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info
new file mode 100644
index 00000000..e648f289
--- /dev/null
+++ b/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n1": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info b/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info
index 8e3c2f95..3902d31e 100644
--- a/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info
+++ b/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info
@@ -1,23 +1,60 @@
{
"objectStatus": {
+ "n54_mk2u": {
+ "hidden": true
+ },
+ "n90_frte": {
+ "hidden": true
+ },
+ "n94_frte": {
+ "hidden": true
+ },
+ "n34_mk2u": {
+ "hidden": true
+ },
+ "n96_frte": {
+ "hidden": true
+ },
+ "n28_mk2u": {
+ "hidden": true
+ },
+ "n30_mk2u": {
+ "hidden": true
+ },
+ "n93_frte": {
+ "hidden": true
+ },
"n85_fgao": {
"hidden": true
},
- "n86_fgao": {
+ "n89_frte": {
"hidden": true
},
"n50_mk2u": {
- "hidden": true,
- "collapsed": true
+ "hidden": true
+ },
+ "n27_mk2u": {
+ "hidden": true
+ },
+ "n95_frte": {
+ "hidden": true
+ },
+ "n79_fgao": {
+ "hidden": true
+ },
+ "n35_mk2u": {
+ "hidden": true
+ },
+ "n36_mk2u": {
+ "hidden": true
+ },
+ "n29_mk2u": {
+ "hidden": true
},
"n80_fgao": {
"hidden": true
},
- "n54_mk2u": {
- "hidden": true,
- "collapsed": true
- },
- "n87_fgao": {
+ "n33_mk2u": {
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 97112240..665be334 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -3,17 +3,21 @@
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://3z9lj55vjokm7l",
- "ui://3z9lj55vjokmky"
+ "ui://3n2top74kpmgp4",
+ "ui://3z9lj55vjokmky",
+ "ui://yzaioi79fgao1dn"
],
"test.device": "iPhone 5",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://3z9lj55vjokmky",
+ "doc.activeDoc": "ui://3n2top74kpmgp4",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
"/",
"27vd145b",
+ "/buttons/",
+ "27vd145b",
"/component/",
"27vd145b",
"/component/create_room/",
@@ -23,36 +27,24 @@
"/component/head/",
"27vd145b",
"/component/rule/",
- "3z9lj55v",
+ "3n2top74",
"/",
- "3z9lj55v",
- "/component/",
- "3z9lj55v",
- "/component/setting_new/",
- "3z9lj55v",
+ "3n2top74",
"/images/",
- "3z9lj55v",
- "/images/MMXTMui/",
- "m7iejg46",
+ "3n2top74",
+ "/images/EPRXTMui/",
+ "3n2top74",
+ "/setting/",
+ "3n2top74",
+ "/setting/images/",
+ "3n2top74",
+ "/setting/images/setting/",
+ "yzaioi79",
"/",
- "m7iejg46",
- "/component/",
- "m7iejg46",
- "/component/Btn/",
- "m7iejg46",
+ "yzaioi79",
"/images/",
- "m7iejg46",
- "/images/NGXiangTangMui/",
- "m7iejg46",
- "/mgr/",
- "m7iejg46",
- "/mgr/component/",
- "m7iejg46",
- "/mgr/component/member/",
- "m7iejg46",
- "/mgr/component/member/partner/",
- "x3mp2cn6",
- "/"
+ "yzaioi79",
+ "/images/MRXTMui/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Chat/Gcm_chat.xml b/wb_new_ui/assets/Chat/Gcm_chat.xml
index a2514953..68b01537 100644
--- a/wb_new_ui/assets/Chat/Gcm_chat.xml
+++ b/wb_new_ui/assets/Chat/Gcm_chat.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml b/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
index f210fb7f..4bbbe62c 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Yellow_New.xml b/wb_new_ui/assets/Common/buttons/Btn_Yellow_New.xml
index 0cab418d..0507fbdc 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_Yellow_New.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_Yellow_New.xml
@@ -2,12 +2,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml
index 7b311f84..4006e6d8 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml
@@ -1,10 +1,10 @@
-
-
+
+
-
-
+
+
@@ -35,34 +35,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -103,14 +103,14 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
index 24191fa1..fb6e7885 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -34,19 +34,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -54,35 +54,29 @@
-
+
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -118,29 +112,29 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -149,11 +143,12 @@
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Gcm_chat.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Gcm_chat.xml
index d0a45a4d..4c4761e5 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Gcm_chat.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/Gcm_chat.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml
index 10afec68..05ae6d3a 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RightPanel.xml
@@ -1,27 +1,27 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/HeadNameBG.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/HeadNameBG.xml
index 5e82115c..5c357b14 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/HeadNameBG.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/HeadNameBG.xml
@@ -2,9 +2,11 @@
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_nopiao.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_nopiao.xml
index f511f389..f8b2fe38 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_nopiao.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_nopiao.xml
@@ -2,15 +2,15 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_piao.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_piao.xml
index be11490c..e467f180 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_piao.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/piao/btn_piao.xml
@@ -2,18 +2,9 @@
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 1125.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 1125.png
new file mode 100644
index 00000000..e2e55777
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 1125.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 503.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 503.png
new file mode 100644
index 00000000..50a29a15
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 503.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 709.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 709.png
new file mode 100644
index 00000000..d4cb3db3
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 709.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 711.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 711.png
new file mode 100644
index 00000000..b1864f1e
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 711.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 712.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 712.png
new file mode 100644
index 00000000..422953de
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 712.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 713.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 713.png
new file mode 100644
index 00000000..c454dae6
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 713.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 715.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 715.png
new file mode 100644
index 00000000..e612fefa
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 715.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728(1).png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728(1).png
new file mode 100644
index 00000000..6d12aeed
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728(1).png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728.png
new file mode 100644
index 00000000..3e5fb9f1
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 728.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 736.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 736.png
new file mode 100644
index 00000000..ad140c63
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 736.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 737.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 737.png
new file mode 100644
index 00000000..12e258aa
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 737.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 738.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 738.png
new file mode 100644
index 00000000..04003901
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 738.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 739.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 739.png
new file mode 100644
index 00000000..933c6ac7
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 739.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 740.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 740.png
new file mode 100644
index 00000000..86ad3bd0
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 740.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 741.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 741.png
new file mode 100644
index 00000000..da374b1d
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Frame 741.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 842.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 842.png
new file mode 100644
index 00000000..8d4d5719
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 842.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 844.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 844.png
new file mode 100644
index 00000000..297e8466
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Rectangle 844.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Subtract.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Subtract.png
new file mode 100644
index 00000000..cd565eb8
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/Subtract.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/btn_head_test.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/btn_head_test.png
new file mode 100644
index 00000000..3cf1abdb
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/EPRXTMui/btn_head_test.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/images/btn_head_test.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/btn_head_test.png
new file mode 100644
index 00000000..0939fcba
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/images/btn_head_test.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
index 0483a7c7..820b1dd2 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
@@ -1042,6 +1042,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
index 59466bc2..6d792dc9 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/wb_new_ui/assets/Lobby/component/group/group(1).xml b/wb_new_ui/assets/Lobby/component/group/group(1).xml
new file mode 100644
index 00000000..25793e22
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/group/group(1).xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 6814a71f..1dfa3914 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -380,6 +380,7 @@
+
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 4ca4b7c1..072432b4 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
@@ -1,8 +1,8 @@
-
+
-
+
@@ -47,11 +47,11 @@
-
+
-
+
@@ -78,6 +78,9 @@
+
+
+
@@ -100,9 +103,6 @@
-
-
-
diff --git a/wb_new_ui/assets/Main_Majiang/buttons/Btn(1).xml b/wb_new_ui/assets/Main_Majiang/buttons/Btn(1).xml
new file mode 100644
index 00000000..e0855e29
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/buttons/Btn(1).xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/buttons/Btn_WZ_an(1).xml b/wb_new_ui/assets/Main_Majiang/buttons/Btn_WZ_an(1).xml
new file mode 100644
index 00000000..d48a14b7
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/buttons/Btn_WZ_an(1).xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/Win_BaseWindow.xml b/wb_new_ui/assets/Main_Majiang/component/Win_BaseWindow.xml
index 85ffa7f1..3540775c 100644
--- a/wb_new_ui/assets/Main_Majiang/component/Win_BaseWindow.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/Win_BaseWindow.xml
@@ -3,21 +3,24 @@
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
index 2295f038..0cafca78 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
@@ -1,138 +1,141 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
index 07493deb..30fb29a8 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
@@ -1,5 +1,5 @@
-
+
@@ -15,51 +15,54 @@
-
+
-
+
-
+
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -75,11 +78,11 @@
-
-
+
+
-
+
@@ -102,8 +105,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
index 3bf6505e..8b5b1833 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
@@ -1,38 +1,47 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
@@ -40,20 +49,21 @@
-
-
+
+
-
+
-
+
-
-
+
+
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/descript_item.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/descript_item.xml
index 7f32d2b3..5254f8fe 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/descript_item.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/descript_item.xml
@@ -1,7 +1,7 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
index 3f5042b7..612fe3b5 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
@@ -1,66 +1,63 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
-
-
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml b/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
index f14cb81e..29f6af37 100644
--- a/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
@@ -1,31 +1,34 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -37,52 +40,52 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/setting_new/component/Slider2.xml b/wb_new_ui/assets/Main_Majiang/component/setting_new/component/Slider2.xml
index 5cf7385d..23454bf5 100644
--- a/wb_new_ui/assets/Main_Majiang/component/setting_new/component/Slider2.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/setting_new/component/Slider2.xml
@@ -1,14 +1,13 @@
-
+
-
+
-
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 1374.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 1374.png
new file mode 100644
index 00000000..6627ee81
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 1374.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 459.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 459.png
new file mode 100644
index 00000000..7fb5a552
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 459.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 522.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 522.png
new file mode 100644
index 00000000..7fe98480
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 522.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5222.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5222.png
new file mode 100644
index 00000000..c0dc5cfc
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5222.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5231.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5231.png
new file mode 100644
index 00000000..92b01a95
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 5231.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 525.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 525.png
new file mode 100644
index 00000000..5525e5c1
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 525.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 675.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 675.png
new file mode 100644
index 00000000..ff5d0395
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 675.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 676.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 676.png
new file mode 100644
index 00000000..fc06efe2
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 676.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 745.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 745.png
new file mode 100644
index 00000000..54eda288
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 745.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 747.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 747.png
new file mode 100644
index 00000000..ec248d4c
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 747.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 751.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 751.png
new file mode 100644
index 00000000..ef4aa094
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 751.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 752.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 752.png
new file mode 100644
index 00000000..9c839564
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 752.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 753.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 753.png
new file mode 100644
index 00000000..5fd94a31
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 753.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 787.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 787.png
new file mode 100644
index 00000000..9655fc85
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Frame 787.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Union5.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Union5.png
new file mode 100644
index 00000000..f8c4a0a2
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/Union5.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar.png
new file mode 100644
index 00000000..a0920219
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar0 1.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar0 1.png
new file mode 100644
index 00000000..e47ff719
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bar0 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bg 4.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bg 4.png
new file mode 100644
index 00000000..4849c0b8
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/bg 4.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test3.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test3.png
new file mode 100644
index 00000000..cef1ede7
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test3.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test4.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test4.png
new file mode 100644
index 00000000..97648138
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/btn_head_test4.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_10.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_10.png
new file mode 100644
index 00000000..e67c16cc
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_10.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_16.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_16.png
new file mode 100644
index 00000000..30e5e24f
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/duihuan_16.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/musicIcon 1.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/musicIcon 1.png
new file mode 100644
index 00000000..726bd0f2
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/musicIcon 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_10.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_10.png
new file mode 100644
index 00000000..8f771c4d
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_10.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_17 1.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_17 1.png
new file mode 100644
index 00000000..4a06b70c
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_17 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_9.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_9.png
new file mode 100644
index 00000000..b22ec708
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/pjjs_9.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shaiZi.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shaiZi.png
new file mode 100644
index 00000000..d64b1901
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shaiZi.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shezhi_di.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shezhi_di.png
new file mode 100644
index 00000000..7fc3e18f
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/shezhi_di.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/tile_zipai 1.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/tile_zipai 1.png
new file mode 100644
index 00000000..3f88bd54
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/tile_zipai 1.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuang.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuang.png
new file mode 100644
index 00000000..c22f12e9
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuang.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuaniao.png b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuaniao.png
new file mode 100644
index 00000000..943c0290
Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/MMXTMui/zhuaniao.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index e3a42e47..089a86bc 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1230,6 +1230,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/buttons/Btn(1).xml b/wb_new_ui/assets/Main_RunBeard/buttons/Btn(1).xml
new file mode 100644
index 00000000..e0855e29
--- /dev/null
+++ b/wb_new_ui/assets/Main_RunBeard/buttons/Btn(1).xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index eceb7d05..3f86842a 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,41 +1,40 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
@@ -48,32 +47,33 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
@@ -84,17 +84,17 @@
-
+
-
+
-
+
@@ -111,20 +111,25 @@
-
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2_chat.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2_chat.xml
index 2053b065..80801ee6 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2_chat.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2_chat.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/HeadNameBG.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/HeadNameBG.xml
index f14b1c5b..ca15699f 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/HeadNameBG.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/HeadNameBG.xml
@@ -1,7 +1,6 @@
-
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
index 87a78bc2..1b33b5d4 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml
@@ -1,6 +1,6 @@
-
+
@@ -8,16 +8,15 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
@@ -76,19 +75,18 @@
-
-
-
+
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
index 0b0c7b6d..fded0a9b 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml
@@ -7,16 +7,15 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
@@ -24,13 +23,13 @@
-
+
-
+
@@ -45,7 +44,7 @@
-
+
@@ -60,10 +59,9 @@
-
-
-
-
+
+
+
@@ -77,10 +75,9 @@
-
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/RoomInfoPanel1.xml b/wb_new_ui/assets/Main_RunBeard/component/RoomInfoPanel1.xml
index 928850bb..55a402d3 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/RoomInfoPanel1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/RoomInfoPanel1.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 503.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 503.png
new file mode 100644
index 00000000..50a29a15
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 503.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 728.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 728.png
new file mode 100644
index 00000000..3e5fb9f1
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Frame 728.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group.png
new file mode 100644
index 00000000..6cd15549
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group1.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group1.png
new file mode 100644
index 00000000..341ea54c
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Mask group1.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 842.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 842.png
new file mode 100644
index 00000000..ea4d712e
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 842.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 844.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 844.png
new file mode 100644
index 00000000..297e8466
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Rectangle 844.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Subtract.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Subtract.png
new file mode 100644
index 00000000..cd565eb8
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Subtract.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Union.png b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Union.png
new file mode 100644
index 00000000..6a32c514
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/MRXTMui/Union.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/package.xml b/wb_new_ui/assets/Main_RunBeard/package.xml
index 618305b3..ddc8696b 100644
--- a/wb_new_ui/assets/Main_RunBeard/package.xml
+++ b/wb_new_ui/assets/Main_RunBeard/package.xml
@@ -1075,6 +1075,15 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
index 838da5f8..3791f668 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml
@@ -1,12 +1,12 @@
-
+
-
-
+
+
-
+
@@ -33,7 +33,7 @@
-
+
@@ -49,9 +49,9 @@
-
+
-
+
@@ -59,13 +59,13 @@
-
+
-
+
@@ -76,24 +76,25 @@
-
+
-
-
-
-
+
+
+
+
+
-
+
+
-
+
+
-
-
-
+
@@ -101,7 +102,7 @@
-
+
@@ -124,7 +125,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/RightPanel.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/RightPanel.xml
index 73ac0900..b211fdde 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/RightPanel.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/RightPanel.xml
@@ -1,30 +1,32 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/HeadNameBG.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/HeadNameBG.xml
index 4e1087e2..d57a65e4 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/HeadNameBG.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/HeadNameBG.xml
@@ -1,7 +1,6 @@
-
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml
index 17789a27..c27bdc2e 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml
@@ -7,16 +7,15 @@
-
+
-
+
-
@@ -63,10 +62,9 @@
-
-
-
-
+
+
+
@@ -97,10 +95,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml
index b746ec36..d25b4919 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml
@@ -6,15 +6,14 @@
-
+
-
+
-
@@ -68,10 +67,9 @@
-
-
-
-
+
+
+
@@ -95,10 +93,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1.xml
index d9fa0a34..b9beaf52 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1.xml
@@ -1,11 +1,11 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1_grip.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1_grip.xml
index 325e870d..11fa4eb9 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1_grip.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1_grip.xml
@@ -1,9 +1,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/New_SettingWindow.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/New_SettingWindow.xml
index 1fc7e67a..76b9b872 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/New_SettingWindow.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/New_SettingWindow.xml
@@ -1,15 +1,15 @@
-
+
-
+
-
+
@@ -34,32 +34,32 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
@@ -68,7 +68,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -84,26 +84,26 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/component/setting/Btn_cr_checkbox.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/component/setting/Btn_cr_checkbox.xml
index 0bd8f970..bf409a6d 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/component/setting/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/component/setting/Btn_cr_checkbox.xml
@@ -1,21 +1,15 @@
-
+
-
-
-
-
+
-
-
-
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/images/newsetting/Component5.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/images/newsetting/Component5.xml
index ed071010..6dec5dbc 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/images/newsetting/Component5.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/images/newsetting/Component5.xml
@@ -1,5 +1,5 @@
-
+
@@ -8,80 +8,78 @@
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 222.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 222.png
new file mode 100644
index 00000000..2a23dc48
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 222.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 307.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 307.png
new file mode 100644
index 00000000..790a86d3
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Ellipse 307.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 503.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 503.png
new file mode 100644
index 00000000..50a29a15
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 503.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 522.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 522.png
new file mode 100644
index 00000000..7fe98480
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 522.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 675.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 675.png
new file mode 100644
index 00000000..ff5d0395
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 675.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 676.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 676.png
new file mode 100644
index 00000000..fc06efe2
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 676.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 728.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 728.png
new file mode 100644
index 00000000..3e5fb9f1
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Frame 728.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group.png
new file mode 100644
index 00000000..6cd15549
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group1.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group1.png
new file mode 100644
index 00000000..341ea54c
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Mask group1.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 842.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 842.png
new file mode 100644
index 00000000..ea4d712e
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 842.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 844.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 844.png
new file mode 100644
index 00000000..297e8466
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Rectangle 844.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Subtract.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Subtract.png
new file mode 100644
index 00000000..cd565eb8
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Subtract.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Union.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Union.png
new file mode 100644
index 00000000..6a32c514
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/Union.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bar.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bar.png
new file mode 100644
index 00000000..a0920219
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bar.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bg 4.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bg 4.png
new file mode 100644
index 00000000..4849c0b8
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/bg 4.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/musicIcon 1.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/musicIcon 1.png
new file mode 100644
index 00000000..726bd0f2
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/musicIcon 1.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shaiZi.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shaiZi.png
new file mode 100644
index 00000000..d64b1901
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shaiZi.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shezhi_di.png b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shezhi_di.png
new file mode 100644
index 00000000..7fc3e18f
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeardMaJiang/images/MRXTMui/shezhi_di.png differ
diff --git a/wb_new_ui/assets/Main_RunBeardMaJiang/package.xml b/wb_new_ui/assets/Main_RunBeardMaJiang/package.xml
index 07f66146..4bbd21d5 100644
--- a/wb_new_ui/assets/Main_RunBeardMaJiang/package.xml
+++ b/wb_new_ui/assets/Main_RunBeardMaJiang/package.xml
@@ -888,6 +888,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index b0f9549a..340a82ee 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -233,7 +233,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
index d71601db..ac985b5a 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
index dd2c32f9..db49fb02 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
index 2b9a0df7..b8a1d944 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
index 0b1865f7..b7132584 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png
index ad63ba64..db349f5d 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png
new file mode 100644
index 00000000..5fd94a31
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png.meta
similarity index 94%
rename from wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta
rename to wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png.meta
index c4435ae1..2ccd2328 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyq.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9f3c0599132d0c540ad3901b9889e65b
+guid: 0df5a14399007d84597be6dc20c3af43
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png
new file mode 100644
index 00000000..9c839564
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png.meta
similarity index 94%
rename from wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta
rename to wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png.meta
index 5aed21fb..d8a7aca3 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_frteyr.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 980ad6f91c70e6c4d9b43f0b1b6d2839
+guid: 5e4818a44337c454bb9b2f082554b49a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png
deleted file mode 100644
index 9b697b01..00000000
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png
deleted file mode 100644
index 9b697b01..00000000
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png and /dev/null 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 8d1853ab..1daa4e0b 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/main_zipai/ui/Main_RunBeard_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
index 511ba3e3..e2f81e6d 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
index 2d954446..1e3ac292 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
index 1a0fd25d..e86f1ecc 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png
index 2b50dfc5..b775a91c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index a1fa3759..ba6df9d9 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png
index 671efbd7..634bf7ca 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png
index ed3a2d4d..917d2346 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png
index bafaa873..6deedb8f 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes
index 62402c02..04286390 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes 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 c7e670b3..2bff5830 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/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index 8bde7674..7a431714 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 2a9134d5..7e2423c0 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_atlas0_2.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png
index fda6dabb..348feed6 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png differ
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 bfbb7d98..87b5b8c9 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