diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index c04b9266..d998572b 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -5,7 +5,7 @@ local FamilyNumberRecord = { local M = FamilyNumberRecord -function FamilyNumberRecord.New(root) +function FamilyNumberRecord.New(root, page) local self = setmetatable({}, { __index = M }) self._father = root @@ -18,6 +18,7 @@ function FamilyNumberRecord.New(root) comp_numberRecord.height = root._view.height comp_numberRecord:Center() self._view = comp_numberRecord + self._data_minPage = page - 1 local group_id = self.group_id local MJScore = 0 @@ -108,9 +109,13 @@ function FamilyNumberRecord.New(root) end end) self._view:GetChild('btn_close').onClick:Set(function() - root.familyType.selectedIndex = self._lastTpe - self._lastTpe = nil - self._view.visible = false + if self.ctr_numberRecord.selectedIndex > self._data_minPage then + self.ctr_numberRecord.selectedIndex = self.ctr_numberRecord.selectedIndex - 1 + else + root.familyType.selectedIndex = self._lastTpe + self._lastTpe = nil + self._view.visible = false + end end) self._view:GetChild('btn_clearInput').onClick:Set(function() input_IDSerach.text = "" @@ -179,7 +184,17 @@ function FamilyNumberRecord.New(root) self._viewlist_numberRecordDetail:RefreshVirtualList() end) - self:OnClickSortType() + if self._data_minPage == 0 then + self:OnClickSortType() + else + self.ctr_numberRecord.selectedIndex = 1 + self:OnClickNumberRank(group_id, DataManager.SelfUser.account_id, 0) + self._view:GetChild('text_numberRecordName').text = DataManager.SelfUser.nick_name + self._view:GetChild('text_numberRecordID').text = string.format("ID:%s", DataManager.SelfUser.account_id) + ImageLoad.Load(DataManager.SelfUser.head_url, self._view:GetChild('btn_numberRecordHead')._iconObject) + self.rankNumber.uid = DataManager.SelfUser.account_id + self.rankNumber.round = 0 + end -- fgCtr:FG_GetConsumeStat(group_id, self.familyChooseTimeView:GetBeginTime(), self.familyChooseTimeView:GetEndTime(), -- function(res) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 922c84d7..df3bc032 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -69,10 +69,16 @@ function M:init(url) end) -------绑定成员战绩按钮 view:GetChild('btn_family_record').onClick:Set(function() - self._child_familyNumberRecord = FamilyNumberRecord.New(self) + self._child_familyNumberRecord = FamilyNumberRecord.New(self, 1) self.lastType = 1 end) + view:GetChild('btn_person_record').onClick:Set(function() + self._child_familyNumberRecord = FamilyNumberRecord.New(self, 2) + self.lastType = 1 + end) + + if FamilyEventView then self._familyEventView = FamilyEventView.new(self) self._familyEventView:_evtAddPlay() @@ -266,10 +272,10 @@ end function M:BanFamily() local fgCtr = ControllerManager.GetController(NewGroupController) - local data = { + local data = { id = self._group.id, - ban = not self._group.ban - } + ban = not self._group.ban + } fgCtr:FG_UpdateGroupInfo(data, function(res) if res.ReturnCode ~= 0 then @@ -533,6 +539,7 @@ function M:ConnetFamily(index, groups, isCreate) list_family:SetVirtual() self._group = DataManager.groups:get(groups[index].id) self._view:GetChild('text_familyId').text = self._group.id + self._view:GetController('lev').selectedIndex = self._group.lev - 1 print("===================================self._group") pt(self._group) self._roomNum = self._group.room_num @@ -815,7 +822,7 @@ function M:RefalshMoreBtn() MORE_LIST[5].name = tex local tex = "" - if self._group.ban then + if self._group.ban then tex = "一键开启" else tex = "一键打烊" diff --git a/wb_new_ui/assets/Common/font/images/win/shurukuang5.png b/wb_new_ui/assets/Common/font/images/win/shurukuang5.png index 964a98f9..74ee6b69 100644 Binary files a/wb_new_ui/assets/Common/font/images/win/shurukuang5.png and b/wb_new_ui/assets/Common/font/images/win/shurukuang5.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 02af4c7c..70caea7a 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -608,7 +608,7 @@ - + diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index ac762959..a731152d 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -1,12 +1,12 @@ - + - + @@ -23,44 +23,47 @@ - - + + - - + + + + + - + - + - - + + - + - + - + - - - + + + - + - - + + @@ -75,7 +78,7 @@ - + @@ -85,7 +88,7 @@ - + @@ -93,31 +96,31 @@ - + - + - + - + - + - + - + diff --git a/wb_new_ui/assets/Family/Main/Component/btn_family_record.xml b/wb_new_ui/assets/Family/Main/Component/btn_family_record.xml index 8f3eb88a..a54e51a8 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_family_record.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_family_record.xml @@ -1,8 +1,8 @@ - + - + diff --git a/wb_new_ui/assets/Family/Main/Component/btn_inviteFriends.xml b/wb_new_ui/assets/Family/Main/Component/btn_inviteFriends.xml index 4447e0a3..6da4fb96 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_inviteFriends.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_inviteFriends.xml @@ -2,7 +2,7 @@ - +