diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index ae1d81dc..2bf17fc9 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -189,17 +189,18 @@ function FamilyNumberRecord.New(root) self:OnClickSortType(group_id) - fgCtr:FG_GetConsumeStat(group_id, os.time() - 3600 * 1200, os.time(), function(res) - pt(res) - if res.ReturnCode ~= 0 then - ViewUtil.ShowOneChooose("获取总信息失败" .. res.ReturnCode) - else - MJScore = tonumber(res.Data.mj_score) - PKScore = tonumber(res.Data.pk_score) - text_score_majiang.text = MJScore - text_score_poker.text = PKScore - end - end) + fgCtr:FG_GetConsumeStat(group_id, self.familyChooseTimeView:GetBeginTime(), self.familyChooseTimeView:GetEndTime(), + function(res) + pt(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("获取总信息失败" .. res.ReturnCode) + else + MJScore = tonumber(res.Data.mj_score) + PKScore = tonumber(res.Data.pk_score) + text_score_majiang.text = MJScore + text_score_poker.text = PKScore + end + end) return self end @@ -340,7 +341,8 @@ function M:OnClickSortType(groupId, pid, sortType) print("lingmengOnClickSortType") local fgCtr = ControllerManager.GetController(NewGroupController) local numberRecordList = self._viewList_numverRecord - fgCtr:FG_GetMemberRank(groupId, 0, 0, 10, os.time() - 3600 * 120, os.time(), sortType, function(res) + fgCtr:FG_GetMemberRank(groupId, 0, 0, 10, self.familyChooseTimeView:GetBeginTime(), + self.familyChooseTimeView:GetEndTime(), sortType, function(res) pt(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("获取排行榜失败" .. res.ReturnCode) @@ -357,7 +359,8 @@ function M:OnClickNumberRank(groupId, uid, round) local fgCtr = ControllerManager.GetController(NewGroupController) local numberRankListRead = self._viewList_numberRankRead local numberRankListUnRead = self._viewList_numberRankUnRead - fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, 0, round, os.time() - 3600 * 120, os.time(), 3, + fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, 0, round, self.familyChooseTimeView:GetBeginTime(), + self.familyChooseTimeView:GetEndTime(), 3, function(res) pt(res) if res.ReturnCode ~= 0 then diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index f12fb61b..7ff56a8b 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -341,7 +341,7 @@ function M:OnNumButtonAction(context) if index < 9 or index == 10 then if (self._currenIndex < 6) then self._currenIndex = self._currenIndex + 1 - self.tex_num.text = self.tex_num.text .. (index < 9 and index + 1 or index - 9) + self.tex_num.text = self.tex_num.text .. (index < 9 and index + 1 or index - 10) if (self._currenIndex == 6) then self:JoinRoom(self.tex_num.text) end