diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
new file mode 100644
index 00000000..0acf86ba
--- /dev/null
+++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
@@ -0,0 +1,10 @@
+{
+ "objectStatus": {
+ "n85_rbpg": {
+ "hidden": true
+ },
+ "n84_rbpg": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
index d468bc8b..3d14a8aa 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
@@ -1,8 +1,5 @@
{
"objectStatus": {
- "n48_cphv": {
- "collapsed": true
- },
"n45_j34t": {
"collapsed": true
}
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info
index e0798fae..9e26dfee 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw4.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n89_ybf5": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index a79fba65..572c5597 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -7,6 +7,17 @@
"ui://m7iejg46yvb27ik0",
"ui://m7iejg46gojuhh5",
"ui://m7iejg46imp57ihp",
+<<<<<<< HEAD
+=======
+ "ui://m7iejg46jgh8hwv",
+ "ui://v6yvqp7wf55qwa",
+ "ui://v6yvqp7wf55qw4",
+ "ui://v6yvqp7wf55qw7",
+ "ui://1utjt0r2ufu92i",
+ "ui://m7iejg4610snh5j",
+ "ui://1utjt0r2ufu930",
+ "ui://v6yvqp7wf55qvx",
+>>>>>>> 02feaf2d431509775863b04b82094c2fb1ee8dc8
"ui://m7iejg46f6brhww",
"ui://m7iejg46gdye7ik8",
"ui://m7iejg46jgh8hwv",
@@ -27,6 +38,7 @@
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
+<<<<<<< HEAD
"doc.activeDoc": "ui://v6yvqp7waen81b0",
"libview.twoColumn": false,
"libview.expandedNodes": [
@@ -66,6 +78,33 @@
"/mgr/component/member/partner/",
"m7iejg46",
"/mgr/component/member/partner/images/"
+=======
+ "doc.activeDoc": "ui://m7iejg4610snh5j",
+ "libview.twoColumn": false,
+ "libview.expandedNodes": [
+ "1utjt0r2",
+ "/",
+ "1utjt0r2",
+ "/component/",
+ "1utjt0r2",
+ "/component/clearing/",
+ "d1qrzqpr",
+ "/",
+ "qubt49z8",
+ "/",
+ "eyxz924g",
+ "/",
+ "parowutd",
+ "/",
+ "4wmd3o8g",
+ "/",
+ "z3z0ysur",
+ "/",
+ "96mvx2ml",
+ "/",
+ "m7iejg46",
+ "/"
+>>>>>>> 02feaf2d431509775863b04b82094c2fb1ee8dc8
],
"snapToGrid": true,
"backgroundColor": 6710886,
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index de3c4a2d..b7e1fcae 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -56,12 +56,12 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png
index cb7e8a1b..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png b/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png
index 8089f0d5..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png and b/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png
index cb7e8a1b..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png b/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png
index 8089f0d5..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png and b/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png
index cb7e8a1b..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png
index 8089f0d5..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png and b/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png
index 36c07f16..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png
index 81244a44..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png and b/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png
index cb7e8a1b..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png
index 8089f0d5..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png and b/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png
index cb7e8a1b..4a3714b1 100644
Binary files a/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png differ
diff --git a/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png b/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png
index 8089f0d5..f7c2dee5 100644
Binary files a/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png and b/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png differ