diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
index 66b7090b..901c7d52 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua
@@ -31,7 +31,7 @@ MngPageConfig.PageList = {
{id = 6, title = "--del--", view = GroupMngMemberListView, refresh = false, clear_image = false,anchorOffset = 300},
{id = 7, title = "积分记录", view = GroupMngFagListView, refresh = true, clear_image = false,anchorOffset = 300},
{id = 8, title = "开桌明细", view = GroupMngRoomStatView, refresh = true, clear_image = true,anchorOffset = 300},
- {id = 9, title = "战绩排行", view = GroupMngRankView, refresh = true, clear_image = false,anchorOffset = 300},
+ {id = 9, title = "排行榜", view = GroupMngRankView, refresh = true, clear_image = false,anchorOffset = 300},
{id = 10, title = "战队队长", view = GroupMngPartnerListView, refresh = true, clear_image = false,anchorOffset = 300},
{id = 11, title = "--del--", view = GroupMngMemberListView, refresh = true, clear_image = true,anchorOffset = 300},
{id = 13, title = "保险箱统计", view = GroupMngFagPackStatView, refresh = true, clear_image = false,anchorOffset = 300},
@@ -43,8 +43,10 @@ MngPageConfig.PageList = {
{id = 20, title = "成员列表", view = GroupMngMemberListView1, refresh = true, clear_image = true,anchorOffset = 300},
{id = 21, title = "成员记录", view = GroupMngPartnerListView1, refresh = true, clear_image = true,anchorOffset = 300},
{id = 22, title = "数据统计", view = GroupMngMemberInfoView, refresh = true, clear_image = true,anchorOffset = 300},
- {id = 23, title = "玩家数据", view = GroupMngXingYunStatView, refresh = true, clear_image = true,anchorOffset = 300},
+ {id = 23, title = "玩家统计", view = GroupMngXingYunStatView, refresh = true, clear_image = true,anchorOffset = 300},
{id = 24, title = "局数统计", view = GroupMngZuanShiStatView, refresh = true, clear_image = true,anchorOffset = 300},
+ {id = 25, title = "座位分明细", view = GroupMngFagListView, refresh = true, clear_image = false,anchorOffset = 300},
+ {id = 26, title = "每日统计", view = GroupMngPlayStatView, refresh = true, clear_image = true,anchorOffset = 300},
}
-- Config定义不同职位的人，通过不同按钮进入显示的内容
@@ -64,16 +66,16 @@ MngPageConfig.Config = {
{
-- 盟主
--{19, 16, 7, 3, 8, 9, 13, 17},
- {19,16, 7, 3, 8, 13, 17,9,22},
+ {23,26,19, 9, 25},
-- 管理员
--{19, 16, 7, 3, 8, 9, 13, 17},
- {19, 16, 7, 3, 8, 13, 17,9,22},
+ {23,26,19, 9, 25},
-- 合伙人
- {19, 7, 17},
+ {23,26,19, 9, 25},
--{19,16,7, 8,17,22},
-- 普通玩家
--{9, 17},
- {17},
+ {23,17,9},
},
-- 成员按钮
{
diff --git a/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info b/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info
new file mode 100644
index 00000000..9296e7d5
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/ex3l7igb.info
@@ -0,0 +1,23 @@
+{
+ "objectStatus": {
+ "n13_kwi0": {
+ "hidden": true
+ },
+ "n8_gls1": {
+ "hidden": true
+ },
+ "n14_kwi0": {
+ "hidden": true
+ },
+ "n12_kwi0": {
+ "hidden": true
+ },
+ "n7_gls1": {
+ "hidden": true
+ },
+ "n22_ex3l": {
+ "hidden": true,
+ "collapsed": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info
index 082b0634..249a6095 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info
@@ -1,9 +1,41 @@
{
"objectStatus": {
- "n64_hp03": {
- "locked": true
+ "n54_j120": {
+ "hidden": true
+ },
+ "n69_ex3l": {
+ "collapsed": true
+ },
+ "n42_f6br": {
+ "hidden": true
+ },
+ "n59_omkm": {
+ "hidden": true
+ },
+ "n62_omkm": {
+ "hidden": true
+ },
+ "n52_j120": {
+ "hidden": true
+ },
+ "n41_f6br": {
+ "hidden": true
+ },
+ "n56_j120": {
+ "hidden": true
+ },
+ "n63_omkm": {
+ "hidden": true
+ },
+ "n35_oj7k": {
+ "hidden": true
+ },
+ "n36_oj7k": {
+ "collapsed": true
+ },
+ "n67_wbjh": {
+ "hidden": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info
new file mode 100644
index 00000000..226fdba8
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/g6sw7i79.info
@@ -0,0 +1,17 @@
+{
+ "objectStatus": {
+ "n155_sbng": {
+ "collapsed": true
+ },
+ "n83_kwi0": {
+ "collapsed": true
+ },
+ "n187_g6sw": {
+ "hidden": true
+ },
+ "n184_b5ny": {
+ "hidden": true
+ }
+ },
+ "adaptiveTest": true
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/hoxhh90.info b/wb_new_ui/.objs/metas/m7iejg46/hoxhh90.info
index a38017f9..c891ba30 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/hoxhh90.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/hoxhh90.info
@@ -1,6 +1,6 @@
{
"objectStatus": {
- "n65_isix": {
+ "n61_dzx8": {
"hidden": true
}
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
index bf3b2c37..f67cc7d3 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
@@ -1,11 +1,17 @@
{
"objectStatus": {
- "n181_b8zx": {
+ "n177_o82t": {
"hidden": true
},
- "n104_kwi0": {
+ "n189_dji9": {
"hidden": true,
"collapsed": true
+ },
+ "n187_dji9": {
+ "hidden": true
+ },
+ "n184_b5ny": {
+ "hidden": true
}
},
"adaptiveTest": true,
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
index 22178475..8ed36320 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info
@@ -1,3 +1,40 @@
{
+ "objectStatus": {
+ "n108_p747": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n94_kwi0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n129_omkm": {
+ "hidden": true
+ },
+ "n91_kwi0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n140_ex3l": {
+ "collapsed": true
+ },
+ "n60_kwi0": {
+ "collapsed": true
+ },
+ "n73_kwi0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n64_kwi0": {
+ "hidden": true
+ },
+ "n65_kwi0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n84_kwi0": {
+ "hidden": true
+ }
+ },
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info
index 9b314fcd..056e85a8 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hls.info
@@ -1,3 +1,51 @@
{
- "fitScreen": "FitHeightAndSetCenter"
+ "objectStatus": {
+ "n102_dzx8": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n124_kwi0": {
+ "hidden": true
+ },
+ "n132_n6cm": {
+ "hidden": true
+ },
+ "n187_ex3l": {
+ "collapsed": true
+ },
+ "n119_kwi0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n165_rt3g": {
+ "hidden": true
+ },
+ "n166_jawz": {
+ "hidden": true
+ },
+ "n174_ex3l": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n141_sbng": {
+ "hidden": true
+ },
+ "n182_ex3l": {
+ "collapsed": true
+ },
+ "n163_rt3g": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n112_kqm0": {
+ "hidden": true,
+ "collapsed": true
+ },
+ "n29_hoxh": {
+ "hidden": true,
+ "collapsed": true
+ }
+ },
+ "fitScreen": "FitHeightAndSetCenter",
+ "adaptiveTest": true
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info
index 7858707b..ad6a5c88 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/l679hwn.info
@@ -1,6 +1,18 @@
{
"objectStatus": {
- "n94_b8zx": {
+ "n95_k5m9": {
+ "hidden": true
+ },
+ "n105_h93i": {
+ "hidden": true
+ },
+ "n98_k5m9": {
+ "hidden": true
+ },
+ "n107_ex3l": {
+ "collapsed": true
+ },
+ "n97_k5m9": {
"hidden": true
}
},
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 6d9605e7..42881306 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -3,16 +3,23 @@
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://m7iejg46l679hws",
- "ui://m7iejg46kwi0hmc",
- "ui://m7iejg46kwi0hme",
- "ui://m7iejg46kwi0hmd"
+ "ui://m7iejg46hsbhhjn",
+ "ui://m7iejg46g6sw7i79",
+ "ui://m7iejg46jgh8hwv",
+ "ui://m7iejg46kwi0hk0"
],
- "test.device": "720p Phone",
+ "test.device": "iPad Pro",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://m7iejg46kwi0hmc",
+ "doc.activeDoc": "ui://m7iejg46kwi0hk0",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "27vd145b",
+ "/",
+ "27vd145b",
+ "/component/",
+ "27vd145b",
+ "/component/head/",
"m7iejg46",
"/",
"m7iejg46",
@@ -32,6 +39,10 @@
"m7iejg46",
"/mgr/",
"m7iejg46",
+ "/mgr/component/",
+ "m7iejg46",
+ "/mgr/component/record/",
+ "m7iejg46",
"/mgr/imgs/",
"m7iejg46",
"/mgr/imgs/member/"
diff --git a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
index 6f40f669..77085982 100644
--- a/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
+++ b/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
@@ -18,17 +18,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
index 38ef48a8..1cdd5454 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
@@ -1,84 +1,86 @@
-
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
index e8aa4051..c2fa6904 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPlayStat.xml
@@ -1,11 +1,9 @@
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupRank.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupRank.xml
index 11133244..a5da83df 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupRank.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupRank.xml
@@ -1,55 +1,73 @@
-
-
+
+
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupXingYunStat.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupXingYunStat.xml
index 3393f550..2a6e1180 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupXingYunStat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupXingYunStat.xml
@@ -1,51 +1,94 @@
-
+
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
index 12cebada..f32cf931 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
@@ -1,68 +1,82 @@
-
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
+
+
-
+
-
-
+
-
-
+
+
-
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_xingyun_stat.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_xingyun_stat.xml
index 58bd5009..aa54d8b8 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_xingyun_stat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_xingyun_stat.xml
@@ -1,22 +1,28 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/rank/rank_item0.xml b/wb_new_ui/assets/NewGroup/mgr/component/rank/rank_item0.xml
index 24e5465b..faade8c0 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/rank/rank_item0.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/rank/rank_item0.xml
@@ -1,42 +1,38 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
-
-
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record(1).xml b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record(1).xml
new file mode 100644
index 00000000..eaa726c8
--- /dev/null
+++ b/wb_new_ui/assets/NewGroup/mgr/component/record/item_play_record(1).xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index c2a15e3b..35842d7b 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1037,6 +1037,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index a8fa0839..5b414a4e 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index 07124403..a19044fd 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png
index 8789b666..a7c50522 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png
index 1755edfe..bc8fa659 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png
index cb7fab48..1755edfe 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png 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 b703cce8..539f1619 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