diff --git a/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua
index e9457916..8453ce98 100644
--- a/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua
+++ b/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua
@@ -115,8 +115,11 @@ function M:FillRoomData(data)
local room = DataManager.CurrenRoom
local _player_card_info = self._player_card_info
local roominfo_panel = self._view:GetChild('roominfo_panel1')
- roominfo_panel:GetChild('tex_roomid').text = room.room_id
- roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
+ if roominfo_panel then
+ roominfo_panel:GetChild('tex_roomid').text = room.room_id
+ roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
+ end
+
for i = 1, #room.player_list do
local p = room.player_list[i]
local card_info = _player_card_info[self:GetPos(p.seat)]
diff --git a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua
index 361dd3f3..4319b34e 100644
--- a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua
+++ b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua
@@ -289,7 +289,7 @@ function M:FillItemData(room, data, item)
self._view:GetChild('text_fangxing').text = '翻醒:' .. data.fanxing_score
for i = 1, #data.fanxing_card do
local fangc = self._view:GetChild('list_fangxing'):AddItemFromPool()
- print("lingmeng 817",self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i]))
+ --print("lingmeng 817",self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i]))
fangc:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i])
end
end
diff --git a/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua
index 58080559..df9499f9 100644
--- a/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua
+++ b/lua_probject/extend_project/extend/zipai/hechi/main/ZPSettingView.lua
@@ -1,5 +1,6 @@
local SettingView = require('Game.View.SettingView')
local ZPTableBG = import('.ZPTableBG')
+local TableBG = require("Game.Data.TableBG")
local ZPSettingView = {
-- 修改牌字体
@@ -31,7 +32,7 @@ function ZPSettingView.new(blur_view, index, open_social,cardIndex)
self.mediumSize = 1
self.smallSize = 0.8
self._full = true
- self._anim_pop = 2
+ self._anim_pop = 0
self._open_social = open_social
self._cardType=cardIndex
self:init('ui://Main_RunBeard/New_SettingWindow')
@@ -50,7 +51,14 @@ function M:init(url)
local slider_music = view:GetChild('slider_music')
-- local btn_music = view:GetChild('btn_music')
-- local btn_sound = view:GetChild('btn_sound')
-
+ self._view:GetChild("btn_close22").onClick:Set(function( ... )
+ local bg_id = self._view:GetController("bg").selectedIndex + 1
+ if self._bg ~= bg_id then
+ self._bg = bg_id
+ TableBG.SaveTableBG(self._game_id, self._bg)
+ end
+ self:Destroy()
+ end)
-- btn_music.selected = (GameApplication.Instance.MusicValue < 5 and false or true)
slider_sound.value = GameApplication.Instance.SoundValue
slider_music.value = GameApplication.Instance.MusicValue
diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info
index b82249bf..2400e914 100644
--- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info
+++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info
@@ -1,35 +1,34 @@
{
"objectStatus": {
+ "n110_rnez": {
+ "hidden": true
+ },
"n166_ukp7": {
"hidden": true
},
- "n87_q50p": {
+ "n113_rnez": {
"hidden": true
},
- "n186_yffn": {
+ "n141_ckvb": {
+ "locked": true
+ },
+ "n111_rnez": {
"hidden": true
},
"n131_ckvb": {
"hidden": true
},
- "n13": {
- "collapsed": true
+ "n121_ckvb": {
+ "locked": true
},
"n115_rnez": {
"hidden": true
},
- "n189_qcrm": {
- "collapsed": true
- },
- "n113_rnez": {
- "hidden": true
+ "n122_ckvb": {
+ "locked": true
},
"n112_rnez": {
- "hidden": true,
- "collapsed": true
- },
- "n93_eclw": {
- "collapsed": true
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info
index 60c3689e..d31103f7 100644
--- a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info
+++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info
@@ -6,9 +6,6 @@
"n71_yffn": {
"hidden": true
},
- "n57_yffn": {
- "locked": true
- },
"n72_yffn": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info
index 599ad124..9e26dfee 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n45_j34t": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info
index 8834bd1c..5454a568 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info
@@ -1,9 +1,18 @@
{
"objectStatus": {
- "n75_o49p": {
+ "n59_enxu": {
"hidden": true
},
- "n74_o49p": {
+ "n85_j34t": {
+ "hidden": true
+ },
+ "n81_cbxl": {
+ "hidden": true
+ },
+ "n84_nkur": {
+ "hidden": true
+ },
+ "n39_oqwm": {
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6g.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6g.info
index 859d5822..4e3184d6 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6g.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6g.info
@@ -1,13 +1,10 @@
{
"objectStatus": {
- "n1_e54q": {
- "hidden": true
- },
- "n3_e54q": {
- "hidden": true
- },
"n4_rfcn": {
"hidden": true
+ },
+ "n1_e54q": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info
index 1076b0d3..0763d079 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info
@@ -1,15 +1,31 @@
{
"objectStatus": {
- "n73_o49p": {
+ "n83_j34t": {
+ "hidden": true
+ },
+ "n44_oqwm": {
+ "hidden": true
+ },
+ "n37_e7qn": {
"hidden": true
},
"n71_o49p": {
"hidden": true
},
+ "n95_o0c1": {
+ "hidden": true
+ },
"n96_t159": {
"locked": true
},
- "n95_o0c1": {
+ "n80_cbxl": {
+ "hidden": true
+ },
+ "n82_nkur": {
+ "hidden": true
+ },
+ "n58_fnpw": {
+ "locked": true,
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq7l.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq7l.info
new file mode 100644
index 00000000..7cc9f3dc
--- /dev/null
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq7l.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n8_e5js": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq7o.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq7o.info
new file mode 100644
index 00000000..e648f289
--- /dev/null
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq7o.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n1": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info
index 4235b9b2..54121d2e 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info
@@ -3,18 +3,25 @@
"n162_o49p": {
"hidden": true
},
+ "n36_k3io": {
+ "collapsed": true
+ },
"n34_k3io": {
"hidden": true
},
"n163_o49p": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n154_r1mo": {
+ "collapsed": true
+ },
+ "n206_ib2w": {
"hidden": true
},
"n179_kxwj": {
"hidden": true
},
- "n206_ib2w": {
- "hidden": true
- },
"n178_cbxl": {
"hidden": true
},
@@ -22,7 +29,8 @@
"hidden": true
},
"n183_yfzf": {
- "locked": true
+ "locked": true,
+ "collapsed": true
},
"n35_k3io": {
"hidden": true
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info
index b90f2280..10e5add1 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info
@@ -1,12 +1,61 @@
{
"objectStatus": {
+ "n54_mk2u": {
+ "collapsed": true
+ },
+ "n81_fgao": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n57_mk2u": {
+ "collapsed": true
+ },
+ "n65_mk2u": {
+ "hidden": true
+ },
+ "n88_voqg": {
+ "hidden": true
+ },
+ "n28_mk2u": {
+ "hidden": true
+ },
+ "n91_szpg": {
+ "collapsed": true
+ },
+ "n80_fgao": {
+ "hidden": true
+ },
+ "n41_mk2u": {
+ "collapsed": true
+ },
+ "n30_mk2u": {
+ "hidden": true
+ },
+ "n50_mk2u": {
+ "collapsed": true
+ },
+ "n27_mk2u": {
+ "hidden": true
+ },
+ "n79_fgao": {
+ "hidden": true
+ },
+ "n35_mk2u": {
+ "hidden": true
+ },
+ "n36_mk2u": {
+ "hidden": true
+ },
"n61_mk2u": {
"hidden": true
},
- "n46_mk2u": {
+ "n29_mk2u": {
"hidden": true
},
- "n65_mk2u": {
+ "n78_ra9v": {
+ "collapsed": true
+ },
+ "n46_mk2u": {
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info
index 9e26dfee..953f9b02 100644
--- a/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info
+++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info
@@ -1 +1,38 @@
-{}
\ No newline at end of file
+{
+ "objectStatus": {
+ "n98_voqg": {
+ "hidden": true
+ },
+ "n93_voqg": {
+ "hidden": true
+ },
+ "n91_voqg": {
+ "hidden": true
+ },
+ "n92_voqg": {
+ "hidden": true
+ },
+ "n0_mk2u": {
+ "hidden": true
+ },
+ "n90_voqg": {
+ "hidden": true
+ },
+ "n102_voqg": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n96_voqg": {
+ "hidden": true
+ },
+ "n97_voqg": {
+ "hidden": true
+ },
+ "n94_voqg": {
+ "hidden": true
+ },
+ "n101_voqg": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info
index 59415558..e26d37f4 100644
--- a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info
+++ b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info
@@ -1,6 +1,5 @@
{
"objectStatus": {
-<<<<<<< HEAD
"n16_pt1r": {
"hidden": true
},
@@ -47,18 +46,6 @@
"hidden": true
},
"n12_nrno": {
-=======
- "n67_w06x": {
- "hidden": true
- },
- "n48_j5c2": {
- "hidden": true
- },
- "n40_n1ry": {
- "hidden": true
- },
- "n47_lsou": {
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index e5b74c3e..6a04585f 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -2,61 +2,52 @@
"libview.firstColumnWidth": 384,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://8wph7p8nyffnnp",
- "ui://8wph7p8nyffnc",
- "ui://mzvoz9udm1i335",
- "ui://lkq9ne9speuq8b",
- "ui://lkq9ne9speuq6e",
- "ui://lkq9ne9speuq6r",
- "ui://lkq9ne9speuq6g",
- "ui://mzvoz9udm1i33m",
- "ui://mzvoz9udm1i33v",
- "ui://mzvoz9udm1i33r",
- "ui://mzvoz9udm1i33z",
- "ui://mzvoz9udm1i342"
+ "ui://v0j9abjygq7mgo",
+ "ui://v0j9abjygq7mgp",
+ "ui://lkq9ne9speuqc6",
+ "ui://lkq9ne9speuqao",
+ "ui://lkq9ne9sszpgtz",
+ "ui://lkq9ne9speuqap",
+ "ui://lkq9ne9speuqaa"
],
"test.device": "1080p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://lkq9ne9speuq6r",
+ "doc.activeDoc": "ui://v0j9abjygq7mgo",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "mzvoz9ud",
+ "27vd145b",
"/",
- "mzvoz9ud",
+ "27vd145b",
+ "/buttons/",
+ "hrxsdiix",
+ "/",
+ "hrxsdiix",
"/component/",
- "mzvoz9ud",
- "/component/EPCDWHZMui/",
- "mzvoz9ud",
+ "hrxsdiix",
"/component/clearing/",
"8wph7p8n",
-<<<<<<< HEAD
"/",
- "lkq9ne9s",
+ "v0j9abjy",
"/",
- "lkq9ne9s",
+ "v0j9abjy",
+ "/buttons/",
+ "v0j9abjy",
"/component/",
+ "v0j9abjy",
+ "/component/setting_new/",
"lkq9ne9s",
- "/component/Main/",
+ "/",
"lkq9ne9s",
- "/component/Main/component/",
- "lkq9ne9s",
- "/font/",
- "lkq9ne9s",
- "/font/images/",
+ "/buttons/",
"lkq9ne9s",
"/image/",
"lkq9ne9s",
"/image/MRBMui/",
"lkq9ne9s",
- "/image/main_2/"
-=======
- "/component/head/",
- "8wph7p8n",
- "/images/",
+ "/image/main_2/",
"lkq9ne9s",
- "/images/cards/"
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
+ "/images/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index a266c192..bb16e86c 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -1636,8 +1636,8 @@
-
-
+
+
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item.xml
index 92d92065..3573e300 100644
--- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item.xml
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item.xml
@@ -1,23 +1,23 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item_fangxing.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item_fangxing.xml
new file mode 100644
index 00000000..a1234950
--- /dev/null
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/card_item_fangxing.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml
index 09a5736d..490f49f0 100644
--- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -24,7 +24,6 @@
-<<<<<<< HEAD
@@ -37,20 +36,6 @@
-=======
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
@@ -59,24 +44,15 @@
-
+
-<<<<<<< HEAD
-
-
-
+
+
+
-
-=======
-
-
-
-
-
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
+
-<<<<<<< HEAD
-
+
-=======
-
-
-
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
+
+
+
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
+
-
+
@@ -138,12 +131,12 @@
-
+
-
+
@@ -222,11 +215,7 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing_1_item.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing_1_item.xml
index f08d40d7..06401783 100644
--- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing_1_item.xml
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing_1_item.xml
@@ -1,5 +1,5 @@
-
+
@@ -18,6 +18,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/otherCard_item.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/otherCard_item.xml
index 4a75c276..b267d68f 100644
--- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/otherCard_item.xml
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/otherCard_item.xml
@@ -1,9 +1,9 @@
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/package.xml b/wb_new_ui/assets/Extend_Poker_HeChi/package.xml
index 71a03534..80316e0c 100644
--- a/wb_new_ui/assets/Extend_Poker_HeChi/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_HeChi/package.xml
@@ -344,7 +344,6 @@
-<<<<<<< HEAD
@@ -362,9 +361,7 @@
-=======
-
->>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
+
\ No newline at end of file
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 38a7b32c..e17d7210 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,8 +2,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
index a680c7c2..46b33bc1 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml
@@ -14,7 +14,8 @@
-
+
+
@@ -27,7 +28,7 @@
-
+
@@ -60,7 +61,7 @@
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
index fb2e39d5..64c03f55 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml
@@ -14,7 +14,8 @@
-
+
+
@@ -27,7 +28,7 @@
-
+
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 1100f4b6..e2ece630 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,12 +1,12 @@
-
+
-
+
@@ -29,10 +29,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/buttons/Btn_close.xml b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_close.xml
index a06b9eef..065cf44e 100644
--- a/wb_new_ui/assets/Main_RunBeard/buttons/Btn_close.xml
+++ b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_close.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/buttons/Btn_szFG_M.xml b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_szFG_M.xml
new file mode 100644
index 00000000..5ac4b2ba
--- /dev/null
+++ b/wb_new_ui/assets/Main_RunBeard/buttons/Btn_szFG_M.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ 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 8fa16b9e..8dd1cd99 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,9 +1,9 @@
-
-
-
-
+
+
+
+
@@ -15,15 +15,15 @@
-
+
-
+
-
+
@@ -44,12 +44,12 @@
-
+
-
-
-
+
+
+
@@ -95,7 +95,7 @@
-
+
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 55781912..6cf841b6 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
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_reset.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_reset.xml
index 18ac9856..a6f4943c 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_reset.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_reset.xml
@@ -1,9 +1,9 @@
-
+
-
+
-
+
\ No newline at end of file
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 59612bf5..175caf53 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,9 +1,9 @@
-
+
-
+
-
+
\ No newline at end of file
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 debed148..971e62a3 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,103 +1,97 @@
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
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 c05a5501..9e7718ba 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
@@ -1,12 +1,12 @@
-
+
-
+
@@ -15,90 +15,83 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
index 856136a1..928e1c40 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@@ -3,9 +3,9 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index 7ba5a796..d29a5b1d 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -1,8 +1,23 @@
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1336.png b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1336.png
new file mode 100644
index 00000000..2e01abb8
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1336.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1351.png b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1351.png
new file mode 100644
index 00000000..21c2bc3f
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/Frame 1351.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/phz_pz_23 1.png b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/phz_pz_23 1.png
new file mode 100644
index 00000000..d89242ef
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/component/Main/component/new_ui/phz_pz_23 1.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1.xml
index d11e2806..22274bf8 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1.xml
@@ -1,9 +1,14 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1_grip.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1_grip.xml
index 0b3257eb..3041adf8 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1_grip.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/setting/component/Slider1_grip.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml b/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml
index 9a88bdb1..91829dbe 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml
@@ -1,7 +1,7 @@
-
+
-
+
-
+
-
+
@@ -30,11 +30,11 @@
-
+
-
+
@@ -46,7 +46,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml b/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml
index ea1abb8d..b92a31a4 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml
@@ -1,5 +1,5 @@
-
+
@@ -8,102 +8,125 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/setting/component/setting/Btn_cr_checkbox.xml b/wb_new_ui/assets/Main_RunBeard/component/setting/component/setting/Btn_cr_checkbox.xml
index 060fca45..3a54aa07 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/setting/component/setting/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/setting/component/setting/Btn_cr_checkbox.xml
@@ -1,25 +1,14 @@
-
+
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml b/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
index 71fcc385..e1aa956d 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
@@ -1,121 +1,130 @@
-
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/3.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/3.png
new file mode 100644
index 00000000..bdfa6e9c
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/3.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1339(1).png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1339(1).png
new file mode 100644
index 00000000..0f31131f
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1339(1).png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1350(1).png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1350(1).png
new file mode 100644
index 00000000..764f5061
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1350(1).png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1351(1).png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1351(1).png
new file mode 100644
index 00000000..d428c5c7
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1351(1).png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1353(2).png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1353(2).png
new file mode 100644
index 00000000..f6e3709b
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1353(2).png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1354.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1354.png
new file mode 100644
index 00000000..eb7232fc
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1354.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1356.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1356.png
new file mode 100644
index 00000000..3913daa1
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1356.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13561.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13561.png
new file mode 100644
index 00000000..d365dbc2
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13561.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1357.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1357.png
new file mode 100644
index 00000000..f065f1d9
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1357.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13571.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13571.png
new file mode 100644
index 00000000..0a4aec10
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13571.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1358.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1358.png
new file mode 100644
index 00000000..43d87f4a
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1358.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13581.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13581.png
new file mode 100644
index 00000000..73ee5cca
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13581.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13591.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13591.png
new file mode 100644
index 00000000..1fc4d4fb
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13591.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1360.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1360.png
new file mode 100644
index 00000000..40223dc6
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1360.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13601.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13601.png
new file mode 100644
index 00000000..c29492d2
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 13601.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1361.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1361.png
new file mode 100644
index 00000000..7fd3f95c
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Frame 1361.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group.png
new file mode 100644
index 00000000..b2172059
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group1.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group1.png
new file mode 100644
index 00000000..fbf71a25
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Mask group1.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 2934.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 2934.png
new file mode 100644
index 00000000..63eab62d
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 2934.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3000.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3000.png
new file mode 100644
index 00000000..7602f4ae
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3000.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3001.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3001.png
new file mode 100644
index 00000000..28d4b293
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3001.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3003.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3003.png
new file mode 100644
index 00000000..69f6eeef
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3003.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3004.png b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3004.png
new file mode 100644
index 00000000..ef8b9752
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/image/MRBMui/Rectangle 3004.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/package.xml b/wb_new_ui/assets/Main_RunBeard/package.xml
index 57877968..9b2eb961 100644
--- a/wb_new_ui/assets/Main_RunBeard/package.xml
+++ b/wb_new_ui/assets/Main_RunBeard/package.xml
@@ -997,7 +997,7 @@
-
+
@@ -1049,6 +1049,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 e4db42a7..651f5e5f 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 ecf39f0f..13da1e9a 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 9173efbe..6a7a237d 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 f647926e..33900742 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 bc1fc2ec..d06649a0 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_13.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png
index 7a6aa7b7..bc1fc2ec 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.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 2ab1e5e4..1a569896 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 52d3e9b2..b863c6d4 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_16.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png
index 948773e8..e3a8f528 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.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 e91dd9dc..ff1e8bbd 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 f1752b44..1edbb188 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 7af578c7..4761dc78 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_5.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
index 599afdc6..ec8e5b67 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.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 26da8daa..86bcd450 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_7.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png
index fd5a67ba..f8c342cc 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
index c6e53158..b69bdca5 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.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 ed3886a0..93eb8ff7 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 4b6d9281..e6a13ccd 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/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 7b165256..ded07e2f 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 08d5567e..a85f228c 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 db59807e..78efe728 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 deb9a0ad..37201d54 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 9b4bd595..ae486eeb 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_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png
index b18649ab..b143ac75 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png
index a640eb5b..b7426497 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.png
new file mode 100644
index 00000000..fa8eb9b9
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.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/base/main_zipai/ui/Main_RunBeard_atlas0_6.png.meta
similarity index 98%
rename from wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta
rename to wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.png.meta
index e7860a66..4fbd06f1 100644
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 6f284700c5bbdf04a89aa41462c47a49
+guid: ade8ce8d4809efa4cafcc482a80395aa
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
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 e20df93c..64373ca4 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/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
deleted file mode 100644
index ef7fd2d7..00000000
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-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.meta b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta
deleted file mode 100644
index c128e910..00000000
--- a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-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 b9d1762f..40568e9b 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/zipai/hechi/ui/Extend_Poker_HeChi_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/hechi/ui/Extend_Poker_HeChi_fui.bytes
index 881b63db..39675fe9 100644
Binary files a/wb_unity_pro/Assets/ART/extend/zipai/hechi/ui/Extend_Poker_HeChi_fui.bytes and b/wb_unity_pro/Assets/ART/extend/zipai/hechi/ui/Extend_Poker_HeChi_fui.bytes differ