同步前提交

lua_probject/base_project/Game/View/FamilyViewZuo.lua

@@ -3,6 +3,7 @@ local FamilyJoinView = import(".FamilyZuo.FamilyJoinView")
 local FamilyManagerView = import(".FamilyZuo.FamilyManagerView")
 local FamilyPlayListView = import(".FamilyZuo.FamilyPlayListView")
 local FamilyRoomCardView = import(".FamilyZuo.FamilyRoomCardView")
+local FamilyEventView = import(".FamilyZuo.FamilyEventView")
 
 FamilyViewZuo = {}
 
@@ -24,7 +25,7 @@ end
 function M:init(url)
     BaseView.InitView(self, url)
     local view = self._view
-
+    self._mgr_ctr = ControllerManager.GetController(GroupMgrController)
     --退出按钮
     view:GetChild('btn_exit').onClick:Set(function()
         ViewManager.ChangeView(ViewManager.View_Lobby)
@@ -33,7 +34,7 @@ function M:init(url)
     --亲友圈列表
     self._viewList_familyList = view:GetChild('familyList')
     self._viewList_familyList.itemRenderer = handler(self, self.FamilyListRenderer)
-    self._viewList_familyList.onClickItem:Set(handler(self,self.ClickFamilyList))
+    self._viewList_familyList.onClickItem:Set(handler(self, self.ClickFamilyList))
 
     view:GetController('showList').onChanged:Set(function(context)
         if context.sender.selectedIndex == 0 then
@@ -159,7 +160,7 @@ end
 --点击切换亲友圈
 function M:ClickFamilyList(context)
     local index = context.sender.selectedIndex
-    self:EnterFamily(index+1)
+    self:EnterFamily(index + 1)
 end
 
 --进入亲友圈
@@ -187,6 +188,11 @@ function M:EnterFamily(index_family, only)
             view:GetChild('text_fangka').text = self._group.groupDiamo
             self._viewList_familyList.selectedIndex = index_family - 1
             self:UpdateRoom()
+            --初始化事件
+            if not self._familyEventView then
+                self._familyEventView = FamilyEventView.new(self)
+                self._familyEventView:AddListener()
+            end
         end
     end)
 end
@@ -382,7 +388,6 @@ function M:Show()
     ViewUtil.ShowModalWait2()
 
     self:FillData()
-
     ViewUtil.CloseModalWait2()
 
     BaseView.Show(self)

lua_probject/base_project/Game/View/FamilyZuo/FamilyEventView.lua

@@ -33,7 +33,6 @@ function M:AddListener()
     mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice))
-    print("家族添加监听")
 end
 
 function M:RemoveAll()
@@ -59,9 +58,6 @@ function M:RemoveAll()
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefShowStartRoom))
     mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice))
-
-
-    print("家族去除监听")
 end
 
 function M:_evtAddPlay(...)
@@ -207,7 +203,6 @@ function M:_evtInviteResponse(...)
                 )
             end
         )
-    -- imv:FillData(data)
     imv:Show()
 end
 
@@ -243,26 +238,7 @@ function M:_evtOnMemberState(...)
         return
     end
     view:ReflashMember(...)
-    --[[
-    local view = ViewManager.GetCurrenView()
-    if view.class ~= "FamilyMainView" then
-        return
-    end
-    local arg = { ... }
-    local group = DataManager.groups:get(view._group.id)
 
-    for _, player in pairs(arg[1].offlineUserId) do
-        group.memberMap[player].online = 0
-    end
-
-    for _, player in pairs(arg[1].onlineUserId) do
-        group.memberMap[player].online = 0
-    end
-
-    for _, player in pairs(arg[1].playingUserId) do
-        group.memberMap[player].playing = "startPlaying"
-    end
-    ]]
 end
 
 function M:_evtOnPush_assistant(...)
@@ -319,12 +295,7 @@ function M:_evtOnFamilyReflash(...)
     end
 
     if reflashType == "outFamily" then
-        --local player = DataManager.
 
-        --local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈"
-        --string.format(tips, )
-
-        --MsgWindow.new(self._root_view, "确定要点过吗？")
     end
 
     if reflashType == "changeJoins" then
@@ -344,13 +315,6 @@ function M:_evtOnFamilyReflash(...)
         end
 
         Broadcast.Send(BroadcastEvent.OnJoinsChange)
-        --[[
-        view:ChangeOther()
-        local win = BaseWindow.FindWindow("FamilyAuditNumber")
-        if win then
-            win:Reflash()
-        end
-        ]]
     end
 end
 
@@ -418,11 +382,6 @@ function M:_evtOnRefShowStartRoom(...)
 
     local evt_data = arg[1]
 
-    -- local view = ViewManager.GetCurrenView()
-    -- if view.class ~= "FamilyMainView" then
-    --     return
-    -- end
-    printlog("lingmeng _evtOnRefShowStartRoom", self._group.id, evt_data.groupId)
     if self._group.id == nil or evt_data.groupId ~= self._group.id then
         return
     end
@@ -438,7 +397,6 @@ function M:_evtOnRefNotice(...)
     if view.class ~= "FamilyMainView" then
         return
     end
-    printlog("lingmeng _evtOnRefShowStartRoom", self._group.id, evt_data.groupId)
     if self._group.id == nil or evt_data.groupId ~= self._group.id then
         return
     end

lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua

@@ -11,24 +11,29 @@ local ManagerMenberChild_JoinsView = import(".ManagerMenberChild_JoinsView")
 local ManagerMenberChild_ExitsView = import(".ManagerMenberChild_ExitsView")
 local ManagerMenberChild_DisInviteView = import(".ManagerMenberChild_DisInviteView")
 local ManagerMenberChild_DisSameDeskView = import(".ManagerMenberChild_DisSameDeskView")
+--战绩
+local ManagerRecordChild_BattleStatsView = import(".ManagerRecordChild_BattleStatsView")
 
 local FamilyManagerTable = {}
 
 local M = FamilyManagerTable
 
 M.ManagerTable = {
+    --管理设置页面
     { id = 1, title = "基本设置", view = ManagerChild_SettingView },
     { id = 2, title = "成员管理", view = ManagerChild_PlayerView },
     { id = 3, title = "快速组局", view = ManagerChild_GamePlayView },
     { id = 4, title = "小黑屋管理", view = ManagerChild_BlackView },
-    { id = 4, title = "禁止同桌", view = ManagerChild_ForbidSameTableView},
-    { id = 4, title = "战绩统计", view = ManagerChild_RecordView},
+    { id = 5, title = "禁止同桌", view = ManagerChild_ForbidSameTableView},
+    { id = 6, title = "战绩统计", view = ManagerChild_RecordView},
     --成员管理页面
-    { id = 4, title = "成员列表", view = ManagerMenberChild_PlayerView },
-    { id = 5, title = "进驻申请", view = ManagerMenberChild_JoinsView },
-    { id = 6, title = "离开申请", view = ManagerMenberChild_ExitsView },
-    { id = 7, title = "屏蔽邀请", view = ManagerMenberChild_DisInviteView },
-    { id = 8, title = "禁止Ta进房", view = ManagerMenberChild_DisSameDeskView }
+    { id = 7, title = "成员列表", view = ManagerMenberChild_PlayerView },
+    { id = 8, title = "进驻申请", view = ManagerMenberChild_JoinsView },
+    { id = 9, title = "离开申请", view = ManagerMenberChild_ExitsView },
+    { id = 10, title = "屏蔽邀请", view = ManagerMenberChild_DisInviteView },
+    { id = 11, title = "禁止Ta进房", view = ManagerMenberChild_DisSameDeskView },
+    --战绩页面
+    { id = 12, title = "战绩统计", view = ManagerRecordChild_BattleStatsView },
 }
 
 M.ManagerShow = {
@@ -38,7 +43,13 @@ M.ManagerShow = {
 }
 
 M.ManagerMenberShow = {
-    { 6,6,7,8,9 }, --群主
+    { 7,8,9,10,11 }, --群主
+    {},  --代理
+    {}   --用户
+}
+
+M.ManagerRecordShow = {
+    { 12 }, --群主
     {},  --代理
     {}   --用户
 }
@@ -46,6 +57,7 @@ M.ManagerMenberShow = {
 M.ManagerManger = {
     {id=1,url="ui://Family/FamilyManager",table = M.ManagerShow},
     {id=2,url="ui://Family/FamilyManagerMenber",table = M.ManagerMenberShow},
+    {id=3,url="ui://Family/FamilyManagerRecord",table = M.ManagerManger},
 }
 
 return M

lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_BattleStatsView.lua

@@ -0,0 +1,45 @@
+local ManagerRecordChild_BattleStatsView = {}
+
+local M = ManagerRecordChild_BattleStatsView
+
+function ManagerRecordChild_BattleStatsView.new(data, callback)
+    local self = setmetatable({}, { __index = M })
+    self.class = "ManagerRecordChild_BattleStatsView"
+    self._data = data or {}
+    self._callback = callback
+    self:init("ui://Family/ManagerRecordChild_BattleStats")
+    return self
+end
+
+function M:init(url)
+    local root = self._data.root
+    if not root then
+        ViewUtil:ErrorTip("点击太快，请重新打开页面")
+        return
+    end
+    local page = root._view:GetChild('page')
+    ViewUtil.LoadPage(page, url, function(view)
+        self._view = view
+    end)
+end
+
+function M:FillData()
+
+end
+
+-- 打开窗口
+function M:Show()
+    getmetatable(M).__index.Show(self)
+end
+
+-- 关闭窗口
+function M:Close()
+    getmetatable(M).__index.Close(self)
+end
+
+-- 销毁窗口
+function M:Destroy()
+    getmetatable(M).__index.Destroy(self)
+end
+
+return M

lua_probject/extend_project/extend/poker/sandaha/EXGameController.lua

@@ -55,6 +55,7 @@ function M:RegisterEvt()
     self._eventmap[EXProtocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard
     self._eventmap[EXProtocol.EXBomb_Score_New] = self.OnBompScoreNew
     self._eventmap[EXProtocol.EXCheckCard_Succ] = self.OnCheckCard
+    self._eventmap[EXProtocol.EXIndex_Jiaofu] = self.OnShowJiaofen
 end
 
 -- function M:Oener(evt_data)
@@ -765,4 +766,12 @@ function M:OnCheckCard(evt_data)
     )
 end
 
+function M:OnShowJiaofen(evt_data)
+    self._cacheEvent:Enqueue(
+        function()
+            DispatchEvent(self._dispatcher, EXGameEvent.OnShowJiaofen, evt_data)
+        end
+    )
+end
+
 return M

lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua

@@ -21,6 +21,6 @@ local EXGameEvent = {
     OnPassSuccCheckCard = "OnPassSuccCheckCard",
     OnBompScoreNew = "OnBompScoreNew",
     OnCheckCard = "OnCheckCard",
-    OnJiaofen = "OnJiaofen"
+    OnShowJiaofen = "OnShowJiaofen"
 }
 return EXGameEvent

lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua

@@ -1169,11 +1169,14 @@ function M:EventInit()
             info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
         end
     )
-    _gamectr:AddEventListener(EXGameEvent.OnJiaofen, function(...)
+    _gamectr:AddEventListener(EXGameEvent.OnShowJiaofen, function(...)
         local arg = { ... }
-        local seat = arg[1]
-        local info = self._player_card_info[self:GetPos(seat)]
-        info._ctr_jiaofen.selectedIndex = 1
+        local data = arg[1]
+        local index = self:GetPos(data.index)
+        if index == 1 then
+            local info = self._player_card_info[self:GetPos(data.index)]
+            info:ShowJiaofen(data.maxScore)
+        end
     end)
 end
 

lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua

@@ -94,11 +94,6 @@ function M:init()
     self._btn_bujiao = self._view:GetChild('btn_bujiao')
     self._viewList_jiaofen = self._view:GetChild('List_jiaofen')
     self._viewList_jiaozhu = self._view:GetChild('List_jiaozhu')
-
-    self._viewList_jiaofen.onClickItem:Set(function(context)
-        self.gameCtr:SendJiaofen(tonumber(context.sender.title))
-         self._ctr_jiaofen.selectedIndex = 0
-    end)
     self._btn_bujiao.onClick:Set(function()
         self.gameCtr:SendJiaofen(0)
         self._ctr_jiaofen.selectedIndex = 0
@@ -1353,6 +1348,21 @@ function M:CheckOnes(pokerMap)
     return one_card_list
 end
 
+function M:ShowJiaofen(Score)
+    for i = 1, self._viewList_jiaofen.numItems do
+        local item = self._viewList_jiaofen:GetChildAt(i-1)
+        item.grayed = tonumber(item.title) >= Score
+    end
+    self._viewList_jiaofen.onClickItem:Set(function(context)
+        if tonumber(context.data.title) >= Score then
+            return
+        end
+        self.gameCtr:SendJiaofen(tonumber(context.data.title))
+        self._ctr_jiaofen.selectedIndex = 0
+    end)
+    self._ctr_jiaofen.selectedIndex = 1
+end
+
 function M:Clear()
     self:PlayScore(nil)
     self:SetOutCardInfo(nil, false)

lua_probject/extend_project/extend/poker/sandaha/EXProtocol.lua

@@ -46,6 +46,7 @@ local EXProtocol = {
 
     EXJiaofen               = "2005",
     EXJiaofen_Send               = "1016",
+    EXIndex_Jiaofu            = "2026",
 }
 
 return EXProtocol

wb_new_ui/assets/Common/buttons/ComboBox_Time.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="225,87" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n4_r6s3" name="n4" src="b9ztbt7dcn" fileName="images/bg_input_manegerMenber.png" xy="0,0" size="225,87">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n3_r6s3" name="title" xy="88,16" pivot="0.5,0.5" size="10,54" font="ui://27vd145bej1ib7jgh" fontSize="40" color="#8f736c" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="">
+      <relation target="" sidePair="left-left%"/>
+    </text>
+    <image id="n5_r6s3" name="n5" src="r6s3bt7daa" fileName="images/icon_down.png" xy="144,34" pivot="0.481,0.5" rotation="180">
+      <gearLook controller="button" pages="1" values="1,0,0,0" default="1,180,0,0"/>
+      <relation target="" sidePair="right-right"/>
+    </image>
+  </displayList>
+  <ComboBox dropdown="ui://27vd145br6s3bt7da8"/>
+</component>

wb_new_ui/assets/Common/buttons/ComboBox_Time_item.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="225,86" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <graph id="n3_k2fm" name="n3" xy="0,0" size="225,86" type="rect" lineSize="0" lineColor="#ffffffff" fillColor="#ff282828">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n4_k2fm" name="n4" xy="0,0" size="225,86" type="rect" lineSize="0" fillColor="#ff353535">
+      <gearDisplay controller="button" pages="0"/>
+    </graph>
+    <graph id="n5_k2fm" name="n5" xy="0,85" size="225,1" type="rect" lineSize="0" fillColor="#26ffffff">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width"/>
+    </graph>
+    <text id="n2_r6s3" name="title" xy="0,0" size="225,86" font="ui://27vd145bej1ib7jgl" fontSize="36" color="#b7b7b7" align="center" vAlign="middle" autoSize="none" singleLine="true" text="今天">
+      <gearColor controller="button" pages="0,1" values="#b7b7b7,#000000|#fbff7d,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/buttons/ComboBox_Time_popup.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="225,200">
+  <displayList>
+    <graph id="n0_r6s3" name="n0" xy="0,0" size="225,200" touchable="false" type="rect" lineSize="0" lineColor="#ffa0a0a0" fillColor="#ff353535">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <list id="n1_r6s3" name="list" xy="0,0" size="225,200" overflow="scroll" defaultItem="ui://27vd145br6s3bt7da7">
+      <relation target="" sidePair="width-width"/>
+    </list>
+  </displayList>
+  <relation target="n1_r6s3" sidePair="height-height"/>
+</component>

wb_new_ui/assets/Common/package.xml

@@ -2288,6 +2288,12 @@
     <image id="ka5cbt7da3" name="12 - -.png" path="/images/font_time/image/"/>
     <image id="ka5cbt7da4" name="13 - 号.png" path="/images/font_time/image/"/>
     <font id="ka5cbt7da5" name="FontTime.fnt" path="/images/font_time/" exported="true"/>
+    <image id="r6s3bt7da6" name="btn_notice3.png" path="/images/"/>
+    <component id="r6s3bt7da7" name="ComboBox_Time_item.xml" path="/buttons/"/>
+    <component id="r6s3bt7da8" name="ComboBox_Time_popup.xml" path="/buttons/"/>
+    <component id="r6s3bt7da9" name="ComboBox_Time.xml" path="/buttons/" exported="true" favorite="true"/>
+    <image id="b9ztbt7dcn" name="bg_input_manegerMenber.png" path="/images/" exported="true" scale="9grid" scale9grid="36,21,72,42"/>
+    <image id="r6s3bt7daa" name="icon_down.png" path="/images/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048" rotation="true">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerMenberChild_Player.xml

@@ -8,7 +8,7 @@
     <component id="n6_b9zt" name="btn_invite" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1667,30" size="64,102">
       <Button icon="ui://htcn7v3rb9ztbt7dco"/>
     </component>
-    <image id="n7_b9zt" name="n7" src="b9ztbt7dcn" fileName="FamilyManager/image/bg_input_manegerMenber.png" xy="25,161" size="1619,87"/>
+    <image id="n7_b9zt" name="n7" src="b9ztbt7dcn" fileName="FamilyManager/image/bg_input_manegerMenber.png" xy="25,161" size="1619,87" pkg="27vd145b"/>
     <component id="n8_b9zt" name="btn_search" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1657,161" size="87,87">
       <Button icon="ui://htcn7v3rb9ztbt7dcp"/>
     </component>

wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerRecordChild_BattleStats.xml

@@ -10,10 +10,54 @@
       <relation target="" sidePair="top-bottom%"/>
       <Button title="我的战绩"/>
     </component>
-    <component id="n14_r6s3" name="btn_time" src="ka5cbt7d9q" fileName="buttons/btn_time.xml" pkg="27vd145b" xy="1442,23"/>
     <component id="n15_r6s3" name="btn_" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2016,26" size="68,102">
       <Button icon="ui://htcn7v3rr6s3bt7deg"/>
     </component>
-    <image id="n16_r6s3" name="n16" src="r6s3bt7deh" fileName="FamilyManager/image/bg_top_BattleStats.png" xy="662,414"/>
+    <image id="n17_r6s3" name="n17" src="l8fnb7jgs" fileName="images/bg_tongyong.png" pkg="27vd145b" xy="54,210" size="2063,911"/>
+    <image id="n16_r6s3" name="n16" src="r6s3bt7deh" fileName="FamilyManager/image/bg_top_BattleStats.png" xy="59,215" size="2053,78"/>
+    <text id="n18_r6s3" name="n18" xy="780,224" size="280,61" font="ui://27vd145bej1ib7jgh" fontSize="46" color="#684f4f" text="今日数据详情"/>
+    <text id="n19_r6s3" name="n19" xy="1060,224" size="188,61" font="ui://27vd145bej1ib7jgh" fontSize="46" color="#684f4f" text="（截止）"/>
+    <component id="n24_r6s3" name="btn_allCards" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1719,397" size="49,49">
+      <Button icon="ui://27vd145br6s3bt7da6"/>
+    </component>
+    <component id="n25_r6s3" name="btn_allNum" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="688,812" size="49,49">
+      <Button icon="ui://27vd145br6s3bt7da6"/>
+    </component>
+    <component id="n26_r6s3" name="btn_allOwner" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1719,812" size="49,49">
+      <Button icon="ui://27vd145br6s3bt7da6"/>
+    </component>
+    <component id="n27_r6s3" name="btn_AllRound" src="ej1ib7jgf" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="665,397" size="49,49">
+      <Button icon="ui://27vd145br6s3bt7da6"/>
+    </component>
+    <loader id="n28_r6s3" name="icon_allCards" xy="1436,399" size="39,44" url="ui://htcn7v3rr6s3bt7dei" fill="scaleFree"/>
+    <loader id="n29_r6s3" name="icon_allNum" xy="402,813" size="47,47" url="ui://htcn7v3rr6s3bt7dej" fill="scaleFree"/>
+    <loader id="n30_r6s3" name="icon_allOwner" xy="1436,813" size="41,47" url="ui://htcn7v3rr6s3bt7dek" fill="scaleFree"/>
+    <loader id="n31_r6s3" name="icon_AllRound" xy="430,395" size="52,52" url="ui://htcn7v3rr6s3bt7del" fill="scaleFree"/>
+    <text id="n32_r6s3" name="text_allCards" xy="1568,495" size="60,124" font="ui://27vd145bej1ib7jgl" fontSize="96" color="#229f61" text="0"/>
+    <text id="n33_r6s3" name="text_allNum" xy="537,909" size="60,124" font="ui://27vd145bej1ib7jgl" fontSize="96" color="#229f61" text="0"/>
+    <text id="n34_r6s3" name="text_allRound" xy="537,495" size="60,124" font="ui://27vd145bej1ib7jgl" fontSize="96" color="#229f61" text="0"/>
+    <text id="n35_r6s3" name="text_allOwner" xy="1568,909" size="60,124" font="ui://27vd145bej1ib7jgl" fontSize="96" color="#229f61" text="0"/>
+    <text id="n36_r6s3" name="textTitle_allCards" xy="1504,391" size="188,61" font="ui://27vd145bej1ib7jgl" fontSize="46" color="#684f4f" text="总耗卡数"/>
+    <text id="n37_r6s3" name="textTitle_allNum" xy="473,806" size="188,61" font="ui://27vd145bej1ib7jgl" fontSize="46" color="#684f4f" text="打牌人数"/>
+    <text id="n38_r6s3" name="textTitle_allRound" xy="496,391" size="142,61" font="ui://27vd145bej1ib7jgl" fontSize="46" color="#684f4f" text="总把数"/>
+    <text id="n39_r6s3" name="textTitle_allOwner" xy="1504,806" size="188,61" font="ui://27vd145bej1ib7jgl" fontSize="46" color="#684f4f" text="房主人数"/>
+    <graph id="n40_r6s3" name="n40" xy="76,707" size="2012,0" type="rect" lineSize="2" lineColor="#ffe4e1d0"/>
+    <graph id="n41_r6s3" name="n41" xy="1085,314" size="0,787" type="rect" lineSize="2" lineColor="#ffe4e1d0"/>
+    <component id="n42_k2fm" name="cb_time" src="r6s3bt7da9" fileName="buttons/ComboBox_Time.xml" pkg="27vd145b" xy="1304,38">
+      <relation target="" sidePair="top-bottom%"/>
+      <ComboBox visibleItemCount="10" direction="down">
+        <item title="今天"/>
+        <item title="昨天"/>
+        <item title="三天前"/>
+      </ComboBox>
+    </component>
+    <component id="n43_k2fm" name="cb_type" src="r6s3bt7da9" fileName="buttons/ComboBox_Time.xml" pkg="27vd145b" xy="1591,38" size="298,87">
+      <relation target="" sidePair="top-bottom%"/>
+      <ComboBox visibleItemCount="10" direction="down">
+        <item title="今天"/>
+        <item title="昨天"/>
+        <item title="三天前"/>
+      </ComboBox>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -567,7 +567,6 @@
     <image id="b9ztbt7dck" name="bg_listLeft_menber.png" path="/FamilyManager/image/"/>
     <image id="b9ztbt7dcl" name="bg_manager_menber_top.png" path="/SameImage/" scale="9grid" scale9grid="60,60,120,120"/>
     <component id="b9ztbt7dcm" name="ManagerMenberChild_Player.xml" path="/FamilyManager/compomemt/" exported="true"/>
-    <image id="b9ztbt7dcn" name="bg_input_manegerMenber.png" path="/FamilyManager/image/" scale="9grid" scale9grid="36,21,72,42"/>
     <image id="b9ztbt7dco" name="btn_invite_mangerMenber.png" path="/FamilyManager/image/" exported="true"/>
     <image id="b9ztbt7dcp" name="btn_search_managerMenber.png" path="/SameImage/" exported="true"/>
     <image id="b9ztbt7dcq" name="icon_onlineNum.png" path="/FamilyManager/image/"/>
@@ -633,6 +632,10 @@
     <component id="r6s3bt7def" name="ManagerRecordChild_BattleStats.xml" path="/FamilyManager/compomemt/" exported="true"/>
     <image id="r6s3bt7deg" name="btn_filter.png" path="/SameImage/"/>
     <image id="r6s3bt7deh" name="bg_top_BattleStats.png" path="/FamilyManager/image/" scale="9grid" scale9grid="50,19,100,38"/>
+    <image id="r6s3bt7dei" name="icon_allCards.png" path="/FamilyManager/image/"/>
+    <image id="r6s3bt7dej" name="icon_allNum.png" path="/FamilyManager/image/"/>
+    <image id="r6s3bt7dek" name="icon_allOwner.png" path="/FamilyManager/image/"/>
+    <image id="r6s3bt7del" name="icon_allRound.png" path="/FamilyManager/image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\family\ui" packageCount="2"/>
 </packageDescription>