diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index f4c95feb..a7e00e81 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n185_yffn": { - "collapsed": true - }, "n155_diqo": { "collapsed": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index ce508a79..7bcb80ec 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,38 +2,25 @@ "libview.firstColumnWidth": 280, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg4610snh5j", - "ui://m7iejg46imp57ih3", - "ui://m7iejg46ozazhxs", - "ui://m7iejg46gls1hif", - "ui://m7iejg46imp57ihy", - "ui://m7iejg46imp57igy", - "ui://m7iejg46xed47ion", - "ui://m7iejg46hsbhhjn", - "ui://m7iejg46t1hqhxw", - "ui://2d9xdj6zsvin7e2f", - "ui://m7iejg46imp57ih1", - "ui://m7iejg46ilon7ibl", - "ui://m7iejg46imp57iht" + "ui://v0j9abjygq7med", + "ui://v0j9abjygq7mcu" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46t1hqhxw", + "doc.activeDoc": "ui://v0j9abjygq7mcu", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", "/images/", - "m7iejg46", + "v0j9abjy", "/", - "m7iejg46", - "/component/", - "m7iejg46", - "/component/nav/", - "m7iejg46", - "/images/" + "lx6k641g", + "/", + "lx6k641g", + "/image/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/Gcm_Window.xml b/wb_new_ui/assets/Common/Gcm_Window.xml index 9306857d..eaac76cc 100644 --- a/wb_new_ui/assets/Common/Gcm_Window.xml +++ b/wb_new_ui/assets/Common/Gcm_Window.xml @@ -2,12 +2,12 @@ - + - - + + diff --git a/wb_new_ui/assets/Common/Gcm_Window_Full.xml b/wb_new_ui/assets/Common/Gcm_Window_Full.xml index 33be89af..171fc851 100644 --- a/wb_new_ui/assets/Common/Gcm_Window_Full.xml +++ b/wb_new_ui/assets/Common/Gcm_Window_Full.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/Common/PopPanel.xml b/wb_new_ui/assets/Common/PopPanel.xml index f34fc293..e6519eb3 100644 --- a/wb_new_ui/assets/Common/PopPanel.xml +++ b/wb_new_ui/assets/Common/PopPanel.xml @@ -1,5 +1,5 @@ - + diff --git a/wb_new_ui/assets/Common/UIPanel.xml b/wb_new_ui/assets/Common/UIPanel.xml index 1e5a85df..d271de46 100644 --- a/wb_new_ui/assets/Common/UIPanel.xml +++ b/wb_new_ui/assets/Common/UIPanel.xml @@ -1,8 +1,9 @@ - - + + + diff --git a/wb_new_ui/assets/Main_Poker/image/bg_poker_other.png b/wb_new_ui/assets/Common/images/bg_poker_other.png similarity index 100% rename from wb_new_ui/assets/Main_Poker/image/bg_poker_other.png rename to wb_new_ui/assets/Common/images/bg_poker_other.png diff --git a/wb_new_ui/assets/Common/images/bg_poker_self.png b/wb_new_ui/assets/Common/images/bg_poker_self.png new file mode 100644 index 00000000..00921269 Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_poker_self.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 3d3708ee..4fdffe51 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1082,6 +1082,7 @@ + @@ -1338,6 +1339,8 @@ + + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml index e18a86e8..c3550070 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml @@ -2,8 +2,8 @@ - - + + 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 ab4cb6eb..0da3be59 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 @@ - + @@ -56,14 +56,12 @@ -