diff --git a/fk101/wb_new_ui/.objs/fonts.json b/fk101/wb_new_ui/.objs/fonts.json index c46129af..19cf8a0f 100644 --- a/fk101/wb_new_ui/.objs/fonts.json +++ b/fk101/wb_new_ui/.objs/fonts.json @@ -43,6 +43,17 @@ ui://4wmd3o8gvlhjde ui://z3z0ysurvlhj7t ui://96mvx2mlvlhjcsv ui://boq0ohepvlhjd0 +ui://3z9lj55vjokm7 +ui://3z9lj55vjokmw +ui://3z9lj55vjokmk +ui://3z9lj55vjokm19 +ui://3z9lj55vjokm3l +ui://3z9lj55vjokm4p +ui://3z9lj55vjokmiq +ui://3z9lj55vjokml9 +ui://3z9lj55vjokmm9 +ui://3z9lj55vjokmfx +ui://3z9lj55vjokm7m ui://v0j9abjygq7m7 ui://v0j9abjygq7mw ui://v0j9abjygq7mk diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info index e5ec0083..22178475 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info @@ -1,4 +1,3 @@ { - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info index 471d1ef6..9b314fcd 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info @@ -1,9 +1,3 @@ { - "objectStatus": { - "n147_j120": { - "hidden": true - } - }, - "adaptiveTest": true, "fitScreen": "FitHeightAndSetCenter" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info index f1d73861..e5ec0083 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info @@ -1,9 +1,4 @@ { - "objectStatus": { - "n82_omkm": { - "hidden": true - } - }, "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info index 7102269c..0a57789d 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info @@ -10,6 +10,5 @@ "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info index 7858707b..d4675fb6 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info @@ -2,6 +2,9 @@ "objectStatus": { "n94_b8zx": { "hidden": true + }, + "n99_k5m9": { + "collapsed": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/qlxihsm.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/qlxihsm.info index 03f3878e..9e26dfee 100644 --- a/fk101/wb_new_ui/.objs/metas/m7iejg46/qlxihsm.info +++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/qlxihsm.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n44_omkm": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 11c2a161..32ab7b1e 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 413, + "libview.firstColumnWidth": 283, "expanded_nodes": [ "27vd145b", "/", @@ -9,15 +9,40 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg46nwgkhx0", - "ui://m7iejg46nwgkhx1" + "ui://m7iejg46nwgkhx1", + "ui://x3mp2cn6r5wqh", + "ui://eyxz924gffp34r", + "ui://l0ds4ys6h1uu2p", + "ui://l0ds4ys6h1uu26", + "ui://m7iejg4610snh5j", + "ui://m7iejg46jiu8hef", + "ui://m7iejg46kwi0hls", + "ui://m7iejg46i5987i75", + "ui://m7iejg46hsbhhjn", + "ui://m7iejg46kqm0hbl", + "ui://m7iejg46n5sxha2", + "ui://m7iejg46mkdvhdu", + "ui://m7iejg46kwi0hk0", + "ui://27vd145bhp037iin", + "ui://27vd145beeqmch0", + "ui://m7iejg46hoxhh90", + "ui://27vd145bhp037iim", + "ui://l0ds4ys6q4jw64", + "ui://l0ds4ys6h1uu1v", + "ui://l0ds4ys6h1uu2o", + "ui://l0ds4ys6h1uu1t", + "ui://l0ds4ys6v0jw3e", + "ui://l0ds4ys6h1uu1w", + "ui://l0ds4ys6zgd92y", + "ui://l0ds4ys6h1uu1y" ], "packageGroup.mine": [ "2d9xdj6z" ], - "test.device": "720p Phone", + "test.device": "iPhone Xs", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46nwgkhx0", + "doc.activeDoc": "ui://m7iejg46hsbhhjn", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -25,39 +50,15 @@ "27vd145b", "/buttons/", "27vd145b", - "/font/", - "27vd145b", - "/font/images/", - "27vd145b", - "/font/images/btn_keyboard/", - "27vd145b", - "/font/images/win/", + "/conMui/", "m7iejg46", "/", "m7iejg46", - "/component/", - "m7iejg46", - "/component/nav/", - "m7iejg46", "/images/", "m7iejg46", - "/images/common/", - "m7iejg46", - "/images/main/", - "m7iejg46", - "/images/partner_rewards/", - "m7iejg46", "/mgr/", "m7iejg46", - "/mgr/imgs/", - "m7iejg46", - "/mgr/imgs/fagpack/", - "m7iejg46", - "/mgr/imgs/member/", - "m7iejg46", - "/mgr/imgs/partner/", - "m7iejg46", - "/tuoguan/" + "/mgr/Mui/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml index 45e734eb..9028706c 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml index 5691d661..e3036e52 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml @@ -1,11 +1,11 @@ - - + + - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml index c91813af..26a2e0ca 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml index 77bf8ae1..26e14159 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml index af4c3779..66abcd49 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml @@ -2,11 +2,11 @@ - + - + diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml index c82aab03..8223a13c 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1122.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1122.png new file mode 100644 index 00000000..6312a854 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1122.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1123.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1123.png new file mode 100644 index 00000000..7f7ffd0d Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1123.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 11231.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 11231.png new file mode 100644 index 00000000..b62492b3 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 11231.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 11232.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 11232.png new file mode 100644 index 00000000..8b8f8397 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 11232.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1124.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1124.png new file mode 100644 index 00000000..a7d2f8f7 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1124.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 11242.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 11242.png new file mode 100644 index 00000000..781ee6b5 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 11242.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1174.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1174.png new file mode 100644 index 00000000..ae3f567f Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1174.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1175.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1175.png new file mode 100644 index 00000000..a9984706 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1175.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1176.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1176.png new file mode 100644 index 00000000..23bc35c1 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1176.png differ diff --git a/fk101/wb_new_ui/assets/Common/conMui/Frame 1179.png b/fk101/wb_new_ui/assets/Common/conMui/Frame 1179.png new file mode 100644 index 00000000..d9983862 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/conMui/Frame 1179.png differ diff --git a/fk101/wb_new_ui/assets/Common/package.xml b/fk101/wb_new_ui/assets/Common/package.xml index 1b3838c2..51471dbc 100644 --- a/fk101/wb_new_ui/assets/Common/package.xml +++ b/fk101/wb_new_ui/assets/Common/package.xml @@ -1119,6 +1119,16 @@ + + + + + + + + + + diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml b/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml index a1574658..97763dcc 100644 --- a/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml +++ b/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml @@ -15,7 +15,7 @@ - + diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml b/fk101/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml index d07e1e0b..94dd509c 100644 --- a/fk101/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml +++ b/fk101/wb_new_ui/assets/NewGroup/component/Btn/ComboBox1.xml @@ -1,25 +1,25 @@ - + - + - + - + - + - + diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml index 900d4d73..b9393692 100644 --- a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml +++ b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml @@ -1,12 +1,12 @@ - + - - + + - + diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml index 524686ef..37362fe3 100644 --- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml +++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml @@ -1,30 +1,30 @@ - + - + - + - + - - + + - + - + - + - + diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11231.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11231.png new file mode 100644 index 00000000..b62492b3 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11231.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11232.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11232.png new file mode 100644 index 00000000..8b8f8397 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11232.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11242.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11242.png new file mode 100644 index 00000000..781ee6b5 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 11242.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 1179.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 1179.png new file mode 100644 index 00000000..d9983862 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Frame 1179.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 468.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 468.png new file mode 100644 index 00000000..a189585c Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 468.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 469.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 469.png new file mode 100644 index 00000000..f7f539e0 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 469.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 511.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 511.png new file mode 100644 index 00000000..acfb06ca Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Group 511.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Polygon 3.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Polygon 3.png new file mode 100644 index 00000000..fcf7c405 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Polygon 3.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2872.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2872.png new file mode 100644 index 00000000..290f597f Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2872.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2877.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2877.png new file mode 100644 index 00000000..73bdd371 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 2877.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 333.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 333.png new file mode 100644 index 00000000..e2f9699c Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 333.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 352.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 352.png new file mode 100644 index 00000000..5a29ae34 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 352.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 3521.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 3521.png new file mode 100644 index 00000000..64ba138a Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 3521.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 5540.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 5540.png new file mode 100644 index 00000000..a1e77a9f Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Rectangle 5540.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Union.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Union.png new file mode 100644 index 00000000..ae18beb9 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/Union.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 620.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 620.png new file mode 100644 index 00000000..e053416f Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 620.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 621.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 621.png new file mode 100644 index 00000000..0f29e8bd Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 621.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 622.png b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 622.png new file mode 100644 index 00000000..cdc546b1 Binary files /dev/null and b/fk101/wb_new_ui/assets/NewGroup/mgr/Mui/image 622.png differ diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml index e0201ec9..e4f2e8c9 100644 --- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml +++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml @@ -1,16 +1,16 @@ - + - + - + - - + + @@ -23,29 +23,29 @@ - + - + - + - + - + - + - - + + - + @@ -58,10 +58,10 @@ - + - + @@ -74,60 +74,58 @@ - + - - - - + + + + - + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + - +