diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 345dcdae..022d4610 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1,4 +1,3 @@ - NewGroupController = {} local M = {} @@ -7,14 +6,13 @@ local GroupMgrController = import(".GroupMgrController") --- Create a new NewGroupController function NewGroupController.new() - setmetatable(M, {__index = IController}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = IController }) + local self = setmetatable({}, { __index = M }) self.baseType = NewGroupController self.class = "NewGroup" return self end - --获取圈列表 function M:FG_GroupList(callback) local _client = ControllerManager.GroupClient @@ -27,7 +25,7 @@ function M:FG_GroupList(callback) local r_groups = res.Data.groups local l_groups = DataManager.groups l_groups:clear() - for i=1,#r_groups do + for i = 1, #r_groups do local tem = r_groups[i] local group = GroupData.new() group.id = tem.id @@ -53,10 +51,10 @@ end --创建圈 function M:FG_CreateGroup(name, pay_type, type, callback) local _client = ControllerManager.GroupClient - local data = {} - data.name= name + local data = {} + data.name = name data.pay_type = pay_type - data.type = type + data.type = type _client:send(Protocol.WEB_FG_CREATE_GROUP, data, function(res) if res.ReturnCode == 0 then local l_groups = DataManager.groups @@ -78,10 +76,10 @@ function M:FG_CreateGroup(name, pay_type, type, callback) end --删除圈 -function M:FG_RemoveGroup(id,callback) +function M:FG_RemoveGroup(id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = id + local data = {} + data.id = id _client:send(Protocol.WEB_FG_REMOVE_GROUP, data, function(res) if res.ReturnCode == 0 then local l_groups = DataManager.groups @@ -94,8 +92,8 @@ end --退出圈子 function M:FG_ExitGroup(group_id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id + local data = {} + data.id = group_id _client:send(Protocol.WEB_FG_EXIT_GROUP, data, function(res) if res.ReturnCode == 0 then local l_groups = DataManager.groups @@ -106,21 +104,21 @@ function M:FG_ExitGroup(group_id, callback) end --加入圈 -function M:FG_JoinGroup(id,callback) +function M:FG_JoinGroup(id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = id + local data = {} + data.id = id _client:send(Protocol.WEB_FG_JOIN_GROUP, data, function(res) callback(res) end) end --置顶圈 -function M:FG_TopGroup(group_id,top,callback) +function M:FG_TopGroup(group_id, top, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.top = top + local data = {} + data.id = group_id + data.top = top _client:send(Protocol.WEB_FG_GROUP_TOP, data, function(res) if res.ReturnCode == 0 then local l_groups = DataManager.groups @@ -131,7 +129,8 @@ function M:FG_TopGroup(group_id,top,callback) end) end -function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option, showNum, callback) +function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option, showNum, + callback) local _client = ControllerManager.GroupClient local data = {} data.id = id @@ -151,22 +150,22 @@ function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, app end --圈邀请列表 -function M:FG_GroupJoins(id,callback) +function M:FG_GroupJoins(id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = id + local data = {} + data.id = id _client:send(Protocol.WEB_FG_GROUP_JOINS, data, function(res) callback(res) end) end --圈审核玩家加入 -function M:FG_GroupVerifyJoin(id,tagId,allow,callback) +function M:FG_GroupVerifyJoin(id, tagId, allow, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = id - data.tagId = tagId - data.allow = allow + local data = {} + data.id = id + data.tagId = tagId + data.allow = allow _client:send(Protocol.WEB_FG_GROUP_VERIFY_JOIN, data, function(res) callback(res) end) @@ -174,13 +173,13 @@ end --圈玩家列表 function M:FG_GroupMembers(group_id, limit, num, minus_only, sort_type, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num data.minus_only = minus_only - data.type = sort_type + data.type = sort_type --print(debug.traceback()) _client:send(Protocol.WEB_FG_GROUP_MEMBERS, data, function(res) --print("查询圈子玩家列表============") @@ -188,27 +187,25 @@ function M:FG_GroupMembers(group_id, limit, num, minus_only, sort_type, callback if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local members = res.Data.members - for i=1,#members do + for i = 1, #members do local m = members[i] group:addMember(m) end end callback(res) - end) end - function M:FG_GroupMembers11(group_id, limit, num, minus_only, sort_type, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num - data.minus_only = minus_only - data.type = sort_type - self.currentGroupMembersData=data - self.currentGroupMembersCallBack=callback + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num + data.minus_only = minus_only + data.type = sort_type + self.currentGroupMembersData = data + self.currentGroupMembersCallBack = callback --print(debug.traceback()) _client:send(Protocol.WEB_FG_GROUP_MEMBERS, data, function(res) --print("查询圈子玩家列表============") @@ -216,28 +213,27 @@ function M:FG_GroupMembers11(group_id, limit, num, minus_only, sort_type, callba if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local members = res.Data.members - for i=1,#members do + for i = 1, #members do local m = members[i] group:addMember(m) end end callback(res) - end) end -function M:FG_GroupMembers12(group_id, limit, num,type,online, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num - data.online = online - data.type = type +function M:FG_GroupMembers12(group_id, limit, num, type, online, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num + data.online = online + data.type = type --data.minus_only = minus_only --data.type = sort_type - self.currentGroupMembersData=data - self.currentGroupMembersCallBack=callback + self.currentGroupMembersData = data + self.currentGroupMembersCallBack = callback --print(debug.traceback()) _client:send(Protocol.WEB_FG_GROUP_MEMBERS1, data, function(res) --print("查询圈子玩家列表============") @@ -245,86 +241,80 @@ function M:FG_GroupMembers12(group_id, limit, num,type,online, callback) if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local members = res.Data.members - for i=1,#members do + for i = 1, #members do local m = members[i] group:addMember(m) end end callback(res) - end) end -function M:FG_GroupTiChu(group_id,limit, num,callback) +function M:FG_GroupTiChu(group_id, limit, num, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num - _client:send(Protocol.WEB_FG_GROUP_TICHU, data, function(res) + local data = {} + data.id = group_id + data.limit = limit + data.num = num + _client:send(Protocol.WEB_FG_GROUP_TICHU, data, function(res) if res.ReturnCode == 0 then - + end - callback(res) + callback(res) end) end - function M:SendGetGroupMembersInfo() local _client = ControllerManager.GroupClient if self.currentGroupMembersData and self.currentGroupMembersCallBack then - _client:send(Protocol.WEB_FG_GROUP_MEMBERS1, self.currentGroupMembersData, function(res) + _client:send(Protocol.WEB_FG_GROUP_MEMBERS1, self.currentGroupMembersData, function(res) --print("查询圈子玩家列表============") --pt(res) if res.ReturnCode == 0 then local group = DataManager.groups:get(self.currentGroupMembersData.id) local members = res.Data.members - for i=1,#members do + for i = 1, #members do local m = members[i] group:addMember(m) end end self.currentGroupMembersCallBack(res) - end) end - end -- 查询成员 -function M:FG_FindMember(group_id, member_id, callback, tag_name,tag_type) +function M:FG_FindMember(group_id, member_id, callback, tag_name, tag_type) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = member_id - data.tagName = tag_name - data.tagType = tag_type - _client:send(Protocol.WEB_FG_FIND_MEMBER, data, function(res) + local data = {} + data.id = group_id + data.tagId = member_id + data.tagName = tag_name + data.tagType = tag_type + _client:send(Protocol.WEB_FG_FIND_MEMBER, data, function(res) --print("查询圈子单个玩家列表============") --pt(res) - if res.ReturnCode == 0 then - local group = DataManager.groups:get(group_id) - local m = res.Data - if group.lev == 3 then - if res.Data.parentId == DataManager.SelfUser.account_id then - group:addMember(m) - end - end - end + if res.ReturnCode == 0 then + local group = DataManager.groups:get(group_id) + local m = res.Data + if group.lev == 3 then + if res.Data.parentId == DataManager.SelfUser.account_id then + group:addMember(m) + end + end + end callback(res) end) end - - -- 强制提取 function M:FG_TakeHp1(group_id, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = tagId + local data = {} + data.id = group_id + data.tagId = tagId - _client:send(Protocol.WEB_FG_TAKE_HP, data, function(res) + _client:send(Protocol.WEB_FG_TAKE_HP, data, function(res) --print("查询圈子单个玩家列表============") --pt(res) callback(res) @@ -337,7 +327,7 @@ function M:FG_DeployMember(group_id, member_id, partner_id, callback) local data = {} data.id = group_id data.tagId = member_id - data.parId = partner_id + data.parId = partner_id _client:send(Protocol.WEB_FG_DEPLOY_MEMBER, data, function(res) callback(res) end) @@ -349,19 +339,19 @@ function M:FG_MovePartner(group_id, member_id, partner_id, callback) local data = {} data.id = group_id data.tagId = member_id - data.parId = partner_id + data.parId = partner_id _client:send(Protocol.WEB_FG_MOVE_PARTNER, data, function(res) callback(res) end) end -- 获取合伙人列表（合伙人管理） -function M:FG_GetPartnerList(group_id, simple_all, limit, num ,callback,tagId) +function M:FG_GetPartnerList(group_id, simple_all, limit, num, callback, tagId) local _client = ControllerManager.GroupClient local data = {} data.id = group_id data.simple_all = simple_all - if tagId then + if tagId then data.tagId = tagId end if simple_all == 0 then @@ -387,14 +377,13 @@ function M:FG_QueryPartnerList(group_id, query_id, query_nick, callback) end) end -function M:FG_GetMemberStat(group_id,query_id,partner_id,limit,num,time_type,begin_time,end_time,callback) - - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.qid = query_id +function M:FG_GetMemberStat(group_id, query_id, partner_id, limit, num, time_type, begin_time, end_time, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.qid = query_id data.partner_id = partner_id - data.tt = time_type + data.tt = time_type if time_type == 3 then data.bt = begin_time data.et = end_time @@ -406,13 +395,11 @@ function M:FG_GetMemberStat(group_id,query_id,partner_id,limit,num,time_type,beg end) end - -function M:FG_GetPartnerStat(group_id,limit,num,time_type,begin_time,end_time,callback) - +function M:FG_GetPartnerStat(group_id, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tt = time_type + local data = {} + data.id = group_id + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time @@ -424,12 +411,11 @@ function M:FG_GetPartnerStat(group_id,limit,num,time_type,begin_time,end_time,ca end) end -function M:FG_GetZuanShiStat(group_id,limit,num,time_type,begin_time,end_time,callback) - +function M:FG_GetZuanShiStat(group_id, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tt = time_type + local data = {} + data.id = group_id + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time @@ -442,38 +428,38 @@ function M:FG_GetZuanShiStat(group_id,limit,num,time_type,begin_time,end_time,ca end -- WEB_FG_FIND_PARTNER_STAT -function M:FG_FindPartnerStat(group_id,member_id,limit,num,time_type,begin_time,end_time,callback) +function M:FG_FindPartnerStat(group_id, member_id, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = member_id - data.limit = limit - data.num = num - data.tt = time_type - + local data = {} + data.id = group_id + data.tagId = member_id + data.limit = limit + data.num = num + data.tt = time_type + if time_type == 0 then data.bt = begin_time data.et = end_time end - _client:send(Protocol.WEB_FG_FIND_PARTNER_STAT, data, function(res) + _client:send(Protocol.WEB_FG_FIND_PARTNER_STAT, data, function(res) callback(res) end) end -function M:FG_FindZuanShiStat(group_id,member_id,limit,num,time_type,begin_time,end_time,callback) +function M:FG_FindZuanShiStat(group_id, member_id, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = member_id - data.limit = limit - data.num = num - data.tt = time_type - + local data = {} + data.id = group_id + data.tagId = member_id + data.limit = limit + data.num = num + data.tt = time_type + if time_type == 0 then data.bt = begin_time data.et = end_time end - _client:send(Protocol.WEB_FG_FIND_COST_COUNT_STAT, data, function(res) + _client:send(Protocol.WEB_FG_FIND_COST_COUNT_STAT, data, function(res) callback(res) end) end @@ -481,52 +467,53 @@ end --find_partner_stat_member -- WEB_FG_FIND_PARTNER_STAT -function M:FG_FindPartnerStatMember(group_id,uid,root_uid,member_id,limit,num,time_type,begin_time,end_time,callback) +function M:FG_FindPartnerStatMember(group_id, uid, root_uid, member_id, limit, num, time_type, begin_time, end_time, + callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = member_id - data.limit = limit - data.num = num - data.id = group_id - data.tt = time_type - data.uid = uid + local data = {} + data.id = group_id + data.tagId = member_id + data.limit = limit + data.num = num + data.id = group_id + data.tt = time_type + data.uid = uid data.root_uid = 0 if time_type == 0 then data.bt = begin_time data.et = end_time end - _client:send(Protocol.WEB_FG_FIND_PARTNER_STAT_Member, data, function(res) + _client:send(Protocol.WEB_FG_FIND_PARTNER_STAT_Member, data, function(res) callback(res) end) end -function M:FG_FindPartnerZuanShiMember(group_id,uid,root_uid,member_id,limit,num,time_type,begin_time,end_time,callback) +function M:FG_FindPartnerZuanShiMember(group_id, uid, root_uid, member_id, limit, num, time_type, begin_time, end_time, + callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = member_id - data.limit = limit - data.num = num - data.id = group_id - data.tt = time_type - data.uid = uid + local data = {} + data.id = group_id + data.tagId = member_id + data.limit = limit + data.num = num + data.id = group_id + data.tt = time_type + data.uid = uid data.root_uid = 0 if time_type == 0 then data.bt = begin_time data.et = end_time end - _client:send(Protocol.WEB_FG_FIND_PARTNER_COST_COUNT_Member, data, function(res) + _client:send(Protocol.WEB_FG_FIND_PARTNER_COST_COUNT_Member, data, function(res) callback(res) end) end -function M:FG_GetXingYunStat(group_id,limit,num,time_type,begin_time,end_time,callback) - +function M:FG_GetXingYunStat(group_id, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tt = time_type + local data = {} + data.id = group_id + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time @@ -538,117 +525,113 @@ function M:FG_GetXingYunStat(group_id,limit,num,time_type,begin_time,end_time,ca end) end -function M:FG_GetMembersCount(group_id,callback) +function M:FG_GetMembersCount(group_id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - + local data = {} + data.id = group_id + _client:send(Protocol.WEB_FG_GET_MEMBERS_COUNT, data, function(res) callback(res) end) end -function M:FG_GetPartnerStatMember(group_id,uid,root_uid,limit,num,time_type,begin_time,end_time,callback) - +function M:FG_GetPartnerStatMember(group_id, uid, root_uid, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} + local data = {} - data.id = group_id - data.uid = uid - data.limit = limit - data.num = num + data.id = group_id + data.uid = uid + data.limit = limit + data.num = num data.root_uid = root_uid - data.tt = time_type + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time end - + _client:send(Protocol.WEB_FG_GET_PARTNER_STAT_MEMBER, data, function(res) callback(res) end) end -function M:FG_GetDirectMemberStat(group_id,uid,root_uid,limit,num,time_type,begin_time,end_time,callback) +function M:FG_GetDirectMemberStat(group_id, uid, root_uid, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.uid = uid - data.limit = limit - data.num = num + local data = {} + data.id = group_id + data.uid = uid + data.limit = limit + data.num = num data.root_uid = root_uid - data.tt = time_type + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time - end + end _client:send(Protocol.WEB_FG_GET_DIRECT_MEMBER_STAT, data, function(res) callback(res) end) end -function M:FG_GetPartnerZuanShiMember(group_id,uid,root_uid,limit,num,time_type,begin_time,end_time,callback) - +function M:FG_GetPartnerZuanShiMember(group_id, uid, root_uid, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} + local data = {} - data.id = group_id - data.uid = uid - data.limit = limit - data.num = num + data.id = group_id + data.uid = uid + data.limit = limit + data.num = num data.root_uid = root_uid - data.tt = time_type + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time end - + _client:send(Protocol.WEB_FG_GET_PARTNER_COST_COUNT, data, function(res) callback(res) end) end -function M:FG_GetDirectZuanShiStat(group_id,uid,root_uid,limit,num,time_type,begin_time,end_time,callback) +function M:FG_GetDirectZuanShiStat(group_id, uid, root_uid, limit, num, time_type, begin_time, end_time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.uid = uid - data.limit = limit - data.num = num + local data = {} + data.id = group_id + data.uid = uid + data.limit = limit + data.num = num data.root_uid = root_uid - data.tt = time_type + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time - end + end _client:send(Protocol.WEB_FG_GET_DIRECT_COST_COUNT, data, function(res) callback(res) end) end -function M:FG_GetPartnerStatPlay(group_id,uid,parent_id,limit,num,time_type,begin_time,end_time,callback) +function M:FG_GetPartnerStatPlay(group_id, uid, parent_id, limit, num, time_type, begin_time, end_time, callback) + local _client = ControllerManager.GroupClient + local data = {} - local _client = ControllerManager.GroupClient - local data = {} - - data.id = group_id - data.uid = uid + data.id = group_id + data.uid = uid data.parent_id = parent_id - data.limit = limit - data.num = num + data.limit = limit + data.num = num - data.tt = time_type + data.tt = time_type if time_type == 0 then data.bt = begin_time data.et = end_time end - + _client:send(Protocol.WEB_FG_GET_PARTNER_STAT_PLAY, data, function(res) callback(res) end) end - -- 获取合伙人成员列表 function M:FG_GetPartnerMembers(group_id, partner_id, limit, num, quary_id, callback) local _client = ControllerManager.GroupClient @@ -666,13 +649,13 @@ end -- 获取管理员/合伙人上下分 function M:FG_GetMngHpLog(group_id, limit, num, hp_type, qid, qName, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num - data.type = hp_type - data.qid = qid - data.tagName = qName + local data = {} + data.id = group_id + data.limit = limit + data.num = num + data.type = hp_type + data.qid = qid + data.tagName = qName _client:send(Protocol.WEB_FG_GET_MNG_HP_LOG, data, function(res) callback(res) end) @@ -681,21 +664,21 @@ end -- 获取管理员上下分统计 function M:FG_GetMngHpStatistic(group_id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id + local data = {} + data.id = group_id _client:send(Protocol.WEB_FG_MNG_HP_STATISTIC, data, function(res) callback(res) end) end -- 获取管理员上下分详情 -function M:FG_GetMngHpInfo(group_id, type, begin_time, end_time, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.type = type +function M:FG_GetMngHpInfo(group_id, type, begin_time, end_time, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.type = type data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_MNG_HP_INFO, data, function(res) callback(res) end) @@ -715,9 +698,9 @@ end -- 获取玩家体力值日统计 function M:FG_GetPlayerDailyHPCount(group_id, id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = id + local data = {} + data.id = group_id + data.tagId = id _client:send(Protocol.WEB_FG_GET_PLAYER_DAILY_COUNT, data, function(res) callback(res) end) @@ -726,111 +709,108 @@ end -- 获取体力值日志牌局明细 function M:FG_GetHpLogDetail(group_id, id, roomid, time, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = id - data.roomId = roomid - data.time = time + local data = {} + data.id = group_id + data.tagId = id + data.roomId = roomid + data.time = time _client:send(Protocol.WEB_FG_HPLOG_DETAIL_INFO, data, function(res) callback(res) end) end --获取所有玩法 -function M:FG_GetAllplays(groupid,uid,callback) +function M:FG_GetAllplays(groupid, uid, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = groupid - data.uid = uid + local data = {} + data.id = groupid + data.uid = uid _client:send(Protocol.WEB_FG_GET_ALLPLAYS, data, function(res) callback(res) end) end --设置屏蔽玩法 -function M:FG_SetBanPlayid(groupId,pid,ban,uid,callback) +function M:FG_SetBanPlayid(groupId, pid, ban, uid, callback) local _client = ControllerManager.GroupClient - local data = {} - data.groupid = groupId - data.pid = pid - data.ban = ban - data.uid = uid + local data = {} + data.groupid = groupId + data.pid = pid + data.ban = ban + data.uid = uid _client:send(Protocol.WEB_FG_SET_BANPLAYID, data, function(res) callback(res) end) end -- 获取推广奖励值 -function M:FG_GetRewards(group_id, pid, lev, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = pid +function M:FG_GetRewards(group_id, pid, lev, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.tagId = pid data.partnerLev = lev _client:send(Protocol.WEB_FG_GET_REWARDS, data, function(res) callback(res) end) end - - -- 设置推广奖励值 -function M:FG_SetRewards(group_id, tag, lev, partner_id, all, val, single,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = tag +function M:FG_SetRewards(group_id, tag, lev, partner_id, all, val, single, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = tag data.partnerLev = lev - data.value = val - data.tagId = partner_id - data.all = all - data.single = single + data.value = val + data.tagId = partner_id + data.all = all + data.single = single _client:send(Protocol.WEB_FG_SET_REWARDS, data, function(res) callback(res) end) end -function M:FG_SetXIPAI(group_id, tag, lev, partner_id, all, val, single,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = tag +function M:FG_SetXIPAI(group_id, tag, lev, partner_id, all, val, single, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = tag data.partnerLev = lev - data.value = val - data.tagId = partner_id - data.all = all - data.single = single + data.value = val + data.tagId = partner_id + data.all = all + data.single = single _client:send(Protocol.WEB_FG_SET_XIPAI, data, function(res) callback(res) end) end -function M:FG_SetANCHOU(group_id, tag, lev, partner_id, all, val, single,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = tag +function M:FG_SetANCHOU(group_id, tag, lev, partner_id, all, val, single, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = tag data.partnerLev = lev - data.value = val - data.tagId = partner_id - data.all = all - data.single = single + data.value = val + data.tagId = partner_id + data.all = all + data.single = single _client:send(Protocol.WEB_FG_SET_ANCHOU, data, function(res) callback(res) end) end - -- 获取奖励日志 function M:FG_GetRewardsLog(group_id, limit, num, begin_time, end_time, tag, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = tag - data.limit = limit - data.num = num + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.tagId = tag + data.limit = limit + data.num = num data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_GET_REWARDS_LOG, data, function(res) callback(res) end) @@ -838,55 +818,55 @@ end -- 获取奖励统计 function M:FG_GetRewardStatistic(group_id, pid, begin_time, end_time, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = pid + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = pid data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_GET_REWARDS_STATISTIC, data, function(res) callback(res) end) end -- 排行 -function M:FG_GetMemberRank(group_id, pid, limit, num, begin_time, end_time, type,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = pid +function M:FG_GetMemberRank(group_id, pid, limit, num, begin_time, end_time, type, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = pid data.beginTime = begin_time - data.endTime = end_time - data.limit = limit - data.num = num - data.type = type + data.endTime = end_time + data.limit = limit + data.num = num + data.type = type _client:send(Protocol.WEB_FG_MEMBER_RANK, data, function(res) callback(res) end) end -- 局数统计 -function M:FG_GetRoundStat(group_id, pid, callback) +function M:FG_GetRoundStat(group_id, pid, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.pid = pid + local data = {} + data.id = group_id + data.pid = pid _client:send(Protocol.WEB_FG_GET_ROUND_STATISTIC, data, function(res) callback(res) end) end -- 获取成员体力值日志 -function M:FG_GetMemberHpLog(group_id, tag, limit, num, filter, begin_time, end_time, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = tag - data.limit = limit - data.num = num - data.choose = filter +function M:FG_GetMemberHpLog(group_id, tag, limit, num, filter, begin_time, end_time, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.tagId = tag + data.limit = limit + data.num = num + data.choose = filter data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_GET_MEMBER_HP_LOG, data, function(res) callback(res) end) @@ -895,20 +875,20 @@ end -- 获取玩法局数统计 function M:FG_GetGameStat(group_id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id + local data = {} + data.id = group_id _client:send(Protocol.WEB_FG_GET_GAME_ROUND_STATISTIC, data, function(res) callback(res) end) end -- 获取消费统计 -function M:FG_GetConsumeStat(group_id,begin_time, end_time, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id +function M:FG_GetConsumeStat(group_id, begin_time, end_time, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_GET_CONSUME_STATISTIC, data, function(res) callback(res) end) @@ -916,13 +896,13 @@ end -- 获取赢家抽水记录 function M:FG_GetPropLog(group_id, limit, num, begin_time, end_time, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num data.beginTime = begin_time - data.endTime = end_time + data.endTime = end_time _client:send(Protocol.WEB_FG_GET_PROPORTION_LOG, data, function(res) callback(res) end) @@ -931,30 +911,31 @@ end -- 获取战绩 function M:FG_GetGroupRecord(group_id, platform, qid, limit, num, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.qid = qid + local data = {} + data.id = group_id + data.qid = qid data.platform = platform - data.limit = limit - data.num = num + data.limit = limit + data.num = num _client:send(Protocol.WEB_FG_GET_RECORD, data, function(res) callback(res) end) end -- 获取战绩 -function M:FG_GetGroupRecordSpe(group_id, platform, qid, includeMembers, limit, num, begin_time, end_time, time_type, callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.qid = qid - data.platform = platform +function M:FG_GetGroupRecordSpe(group_id, platform, qid, includeMembers, limit, num, begin_time, end_time, time_type, + callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.qid = qid + data.platform = platform data.includeMembers = includeMembers - data.limit = limit - data.num = num - data.bt = begin_time - data.et = end_time - data.tt = time_type + data.limit = limit + data.num = num + data.bt = begin_time + data.et = end_time + data.tt = time_type _client:send(Protocol.WEB_FG_GET_RECORD, data, function(res) callback(res) end) @@ -963,10 +944,10 @@ end -- 获取战绩 function M:FG_GetGroupPersonRecord(group_id, platform, qid, time_type, begin_time, end_time, limit, num, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.qid = qid - data.tt = time_type + local data = {} + data.id = group_id + data.qid = qid + data.tt = time_type if time_type == 3 then data.bt = begin_time data.et = end_time @@ -979,13 +960,12 @@ function M:FG_GetGroupPersonRecord(group_id, platform, qid, time_type, begin_tim end) end - -- 根据房间号查询战绩 -function M:FG_GetRecordByRoomid(group_id, roomid, platform, callback) +function M:FG_GetRecordByRoomid(group_id, roomid, platform, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.roomid = roomid + local data = {} + data.id = group_id + data.roomid = roomid data.platform = platform _client:send(Protocol.WEB_FG_GET_RECORD_BY_ROOMID, data, function(res) callback(res) @@ -993,117 +973,107 @@ function M:FG_GetRecordByRoomid(group_id, roomid, platform, callback) end -- 获取能量包数据 -function M:FG_GetTakeInfo(group_id, tagId,callback) +function M:FG_GetTakeInfo(group_id, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = tagId + local data = {} + data.id = group_id + data.tagId = tagId _client:send(Protocol.WEB_FG_GET_TAKE_INFO, data, function(res) callback(res) end) end - -- 获取银行信息 -function M:FG_GetBankInfo(group_id, tagId,callback) +function M:FG_GetBankInfo(group_id, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.tagId = tagId + local data = {} + data.id = group_id + data.tagId = tagId _client:send(Protocol.GET_BANK_HP, data, function(res) callback(res) end) end - - -function M:FG_TakeBankInfo(group_id, gethp,tagId,callback) +function M:FG_TakeBankInfo(group_id, gethp, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.hp=gethp - data.tagId = tagId + local data = {} + data.id = group_id + data.hp = gethp + data.tagId = tagId _client:send(Protocol.TAKE_BANK_HP, data, function(res) callback(res) end) end - -function M:FG_SAVEBankInfo(group_id, gethp,tagId,callback) +function M:FG_SAVEBankInfo(group_id, gethp, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.hp=gethp - data.tagId = tagId + local data = {} + data.id = group_id + data.hp = gethp + data.tagId = tagId _client:send(Protocol.SAVE_BANK_HP, data, function(res) callback(res) end) end - - - - -- 提取体力值 -function M:FG_TakeHp(group_id, num, tagId,callback) +function M:FG_TakeHp(group_id, num, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.hp = num - data.tagId = tagId + local data = {} + data.id = group_id + data.hp = num + data.tagId = tagId _client:send(Protocol.WEB_FG_TAKE_FAG, data, function(res) callback(res) end) end -- 获取提取记录 -function M:FG_GetTakeLog(group_id, limit, num, begin_time, end_time, tagId,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num +function M:FG_GetTakeLog(group_id, limit, num, begin_time, end_time, tagId, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num data.beginTime = begin_time - data.endTime = end_time - data.tagId = tagId + data.endTime = end_time + data.tagId = tagId _client:send(Protocol.WEB_FG_FAG_TAKE_LOG, data, function(res) callback(res) end) end - -- 获取提取记录 -function M:FG_GetBankLog(group_id, limit, num, begin_time, end_time, tagId,callback) - local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id - data.limit = limit - data.num = num +function M:FG_GetBankLog(group_id, limit, num, begin_time, end_time, tagId, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.limit = limit + data.num = num data.beginTime = begin_time - data.endTime = end_time - data.tagId = tagId + data.endTime = end_time + data.tagId = tagId _client:send(Protocol.WEB_FG_GET_BANK_LOG, data, function(res) callback(res) end) end - -- 获取能量包统计 function M:FG_GetFagPackInfo(group_id, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = group_id + local data = {} + data.id = group_id _client:send(Protocol.WEB_FG_FAG_PACK_INFO, data, function(res) callback(res) end) end --圈删除玩家 -function M:FG_GroupRemoveMember(id,tagId,callback) +function M:FG_GroupRemoveMember(id, tagId, callback) local _client = ControllerManager.GroupClient - local data = {} - data.id = id - data.tagId = tagId + local data = {} + data.id = id + data.tagId = tagId _client:send(Protocol.WEB_FG_GROUP_KICK, data, function(res) if res.ReturnCode == 0 then local group = DataManager.groups:get(id) @@ -1112,6 +1082,7 @@ function M:FG_GroupRemoveMember(id,tagId,callback) callback(res) end) end + function M:FG_GroupSetVip(group_id, member_id, isvip, callback) local _client = ControllerManager.GroupClient local _data = {} @@ -1119,7 +1090,7 @@ function M:FG_GroupSetVip(group_id, member_id, isvip, callback) _data.tagId = member_id _data.isvip = isvip _client:send(Protocol.WEB_FG_SET_GROUP_VIP, _data, function(res) - if res.ReturnCode == 0 then + if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local member = group:getMember(member_id) if member then @@ -1129,21 +1100,22 @@ function M:FG_GroupSetVip(group_id, member_id, isvip, callback) callback(res) end) end -function M:FG_EnterGroup(group_id,callback) + +function M:FG_EnterGroup(group_id, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id - printlog("FG_EnterGroup===>>>",_data.id) + printlog("FG_EnterGroup===>>>", _data.id) _client:send(Protocol.WEB_ENTER_GROUP, _data, function(res) if res.ReturnCode == 0 then -- 获取玩法列表 local group = DataManager.groups:get(group_id) group:clear() - group.notice = res.Data.notice - group.hide_action = res.Data.hide_action - + group.notice = res.Data.notice + group.hide_action = res.Data.hide_action + self.mgr_ctr = ControllerManager.GetController(GroupMgrController) - self.mgr_ctr:connect(res.Data.host,group_id,function(res1) + self.mgr_ctr:connect(res.Data.host, group_id, function(res1) if res1.ReturnCode == 0 then callback(res) else @@ -1153,7 +1125,6 @@ function M:FG_EnterGroup(group_id,callback) else callback(res) end - end) end @@ -1164,7 +1135,7 @@ function M:FG_ExitGroupMgr() end --指定圈删除房间 -function M:FG_RemoveRoom(group_id,roomid,callback) +function M:FG_RemoveRoom(group_id, roomid, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1200,7 +1171,7 @@ function M:FG_SetManager(group_id, member_id, opt, callback) end) end --- 设置成员禁止娱乐 +-- 设置成员禁止娱乐 function M:FG_BanMember(group_id, member_id, ban, opType, callback) local _client = ControllerManager.GroupClient local _data = {} @@ -1209,7 +1180,7 @@ function M:FG_BanMember(group_id, member_id, ban, opType, callback) _data.ban = ban _data.opType = opType _client:send(Protocol.WEB_FG_BAN_MEMBER, _data, function(res) - if res.ReturnCode == 0 then + if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local member = group:getMember(member_id) if member then @@ -1221,45 +1192,40 @@ function M:FG_BanMember(group_id, member_id, ban, opType, callback) end) end - --- 获取成员调度 -function M:FG_GetBanMemberHB(group_id, member_id,callback) +-- 获取成员调度 +function M:FG_GetBanMemberHB(group_id, member_id, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id _data.tagId = member_id _client:send(Protocol.GROUP_GET_BLACK_MEMBER, _data, function(res) callback(res) - end) end - --- 设置成员调度 -function M:FG_BanMemberHB(group_id, member_id,opt,ban_rate,black_max_value,callback) +-- 设置成员调度 +function M:FG_BanMemberHB(group_id, member_id, opt, ban_rate, black_max_value, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id _data.tagId = member_id - _data.ban =opt + _data.ban = opt _data.opType = 2 _data.ban_rate = ban_rate _data.ban_max_value = black_max_value - + _client:send(Protocol.GROUP_BLACK_MEMBER, _data, function(res) - if res.ReturnCode == 0 then + if res.ReturnCode == 0 then local group = DataManager.groups:get(group_id) local member = group:getMember(member_id) if member then - member.group_black=opt + member.group_black = opt end end callback(res) - end) end - -- 设置禁止同桌 function M:FG_SetBanTable(group_id, member_id, list, del_list, callback) if #list == 0 then table.insert(list, 0) end @@ -1285,8 +1251,7 @@ function M:FG_GetBanTable(group_id, member_id, callback) end) end - -function M:GetAddMember(group_id,member_id,callback) +function M:GetAddMember(group_id, member_id, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1296,9 +1261,8 @@ function M:GetAddMember(group_id,member_id,callback) end) end - --添加成员 -function M:FG_AddMember(group_id,member_id,callback) +function M:FG_AddMember(group_id, member_id, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1309,7 +1273,7 @@ function M:FG_AddMember(group_id,member_id,callback) end -- 改变体力值 -function M:FG_ChangeFag(group_id,member_id,fag,callback ) +function M:FG_ChangeFag(group_id, member_id, fag, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1321,7 +1285,7 @@ function M:FG_ChangeFag(group_id,member_id,fag,callback ) end -- 获取合伙人列表 -function M:FG_PartnerList(group_id, index, num, qid, callback) +function M:FG_PartnerList(group_id, index, num, qid, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1365,7 +1329,7 @@ function M:FG_SetMngPermission(group_id, target, permission, callback) local group = DataManager.groups:get(group_id) local member = group:getMember(target) if member then - member.permission = permission + member.permission = permission end end callback(res) @@ -1421,7 +1385,7 @@ function M:FG_SetPartnerThreshold(group_id, uid, score, callback) end) end -function M:FG_StopService(group_id,ban,callback) +function M:FG_StopService(group_id, ban, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1447,7 +1411,7 @@ function M:FG_AddPlay(group_id, game_id, config_data, name, hpData, hpOnOff, gty end) end -function M:FG_DelPlay(group_id,pid,callback) +function M:FG_DelPlay(group_id, pid, callback) local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id @@ -1494,4 +1458,4 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff, _client:send(Protocol.WEB_FG_UPDATE_PLAY, _data, function(res) callback(res) end) -end \ No newline at end of file +end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua index 7559f1ff..0ae272d0 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua @@ -28,6 +28,68 @@ function M:initData() --self:ShowPeopleNum() end +function M:NewRecordTable(lev) + self.record_total_data = {} + print("lingmeng self.lst_record3", self.lst_record) + local mainRecord = self.record_data[1] + local obj = self.lst_record:AddItemFromPool() + self:OnRenderRecordItemNew(obj, mainRecord) + local tempTable = {} + tempTable.lev = lev + tempTable.obj = obj + tempTable.childCount = 0 + tempTable.list = obj:GetChild("lst_record") + tempTable.list.height = 0 + self.record_total_data[mainRecord.uid] = tempTable + obj:GetController("more").selectedIndex = 1 +end + +function M:NewRecordTableChildHou(table, isMe, fatherId) + isMe = isMe or 0 + print("lingmeng NewRecordTableChild", isMe, fatherId) + pt(table) + local childNum = #table - isMe + local fatherList = self.record_total_data[fatherId].list + self:RecursionChangeHeight(fatherId, childNum) + for i = 1 + isMe, childNum + isMe do + local mainRecord = table[i] + local obj = fatherList:GetFromPool("") + fatherList:AddChildAt(obj, fatherList.numItems) + self:OnRenderRecordItemNew(obj, mainRecord, fatherId) + local tempTable = {} + tempTable.father = fatherId + tempTable.obj = obj + tempTable.childCount = 0 + tempTable.list = obj:GetChild("lst_record") + tempTable.list.height = 0 + tempTable.obj.height = 113 + self.record_total_data[mainRecord.uid] = tempTable + end +end + +function M:NewRecordTableChildQian(table, isMe, fatherId) + isMe = isMe or 0 + print("lingmeng NewRecordTableChild", isMe, fatherId) + pt(table) + local childNum = #table - isMe + local fatherList = self.record_total_data[fatherId].list + self:RecursionChangeHeight(fatherId, childNum) + for i = 1 + isMe, childNum + isMe do + local mainRecord = table[i] + local obj = fatherList:GetFromPool("") + fatherList:AddChildAt(obj, 0) + self:OnRenderRecordItemNew(obj, mainRecord, fatherId) + local tempTable = {} + tempTable.father = fatherId + tempTable.obj = obj + tempTable.childCount = 0 + tempTable.list = obj:GetChild("lst_record") + tempTable.list.height = 0 + tempTable.obj.height = 113 + self.record_total_data[mainRecord.uid] = tempTable + end +end + -- function M:ShowPeopleNum() -- local fgCtr = ControllerManager.GetController(NewGroupController) -- fgCtr:FG_GetMembersCount(self.group_id,function(res) @@ -57,18 +119,21 @@ function M:InitView() -- end self.lst_record = self._view:GetChild("lst_record") - self.lst_record:SetVirtual() - self.lst_record.itemRenderer = function(index, obj) - self:OnRenderRecordItem(index, obj) - end - self.lst_record.scrollPane.onPullUpRelease:Set(function() - self:GetRecordData(self.lst_record.numItems) - end) + -- self.lst_record:SetVirtual() + -- self.lst_record.itemRenderer = function(index, obj) + -- self:OnRenderRecordItem(index, obj) + -- end + -- self.lst_record.scrollPane.onPullUpRelease:Set(function() + -- self:GetRecordData(group.lev == 1 and self.lst_record.numItems - 1 or self.lst_record.numItems) + -- end) self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() self.begin_time, self.end_time = self.time_panel:GetDate() - self:GetRecordData(self.lst_record.numItems) + self.lst_record:RemoveChildren(0, -1, true) + self.lst_record = nil + self.lst_record = self._view:GetChild("lst_record") + self:GetRecordData(0) end, true) self.begin_time, self.end_time = self.time_panel:GetDate() local ctr_page = self._view:GetController("type") @@ -133,7 +198,7 @@ function M:InitView() self._view:GetChild('tex_id').text = '' ctr_search.selectedIndex = 1 local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildrenToPool() + item_result:RemoveChildren() for j = 1, #res.Data.members do local tem = item_result:AddItemFromPool() @@ -160,43 +225,38 @@ function M:GetRecordData(index) if self.begin_time ~= nil and self.end_time ~= nil then time_type = 0 end - + print("lingmeng self.lst_record1", self.lst_record) + if not self.lst_record then + self.lst_record = self._view:GetChild("lst_record") + end local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res) ViewUtil.CloseModalWait() if res.ReturnCode == 0 then + if not self.lst_record then + self.lst_record = self._view:GetChild("lst_record") + end + print("lingmeng self.lst_record2", self.lst_record) + local members = res.Data.members - printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc") pt(members) if group.lev == 1 then - ViewUtil.ShowModalWait() - fgCtr:FG_GetPropLog(self.group_id, 0, 8, self.begin_time, self.end_time, function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") - else - local info = res.Data - self.groupumberTemp = {} - self.groupumberTemp.uid = group.owner - self.groupumberTemp.nick = group.o_nick - self.groupumberTemp.total_round = info.count - self.groupumberTemp.valid_round = info.valid_count * 100 - self.groupumberTemp.reward_hp = 0 - self.groupumberTemp.total_win = 0 - self.record_data[1] = self.groupumberTemp - for i = 1, #members do - self.record_data[#self.record_data + 1] = members[i] - end - self.lst_record.numItems = #self.record_data - end - end) + ViewUtil.ShowModalWait("获取盟主数据中") + self.groupumberTemp = {} + self.groupumberTemp.uid = group.owner + self.groupumberTemp.nick = group.o_nick + self.groupumberTemp.total_round = 0 + self.groupumberTemp.valid_round = 0 + self.groupumberTemp.reward_hp = 0 + self.groupumberTemp.total_win = 0 + self:RecursionGetPropLog(members, 0) else - self.record_data[1] = self.groupumberTemp for i = 1, #members do self.record_data[#self.record_data + 1] = members[i] end - self.lst_record.numItems = #self.record_data + self:NewRecordTable(0) + -- self.lst_record.numItems = #self.record_data end end end) @@ -325,4 +385,321 @@ function M:OnRenderRecordItem(index, obj) self:FillRecordItem(data, obj) end +function M:OnRenderRecordItemNew(obj, mainRecord, root_id) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(mainRecord.nick) + obj:GetChild("tex_id").text = "ID:" .. mainRecord.uid + local tex_total_score = obj:GetChild("tex_total_score") + local ctr_show_total = obj:GetController("show_total") + if mainRecord._total_hp then + tex_total_score.text = mainRecord._total_hp + ctr_show_total.selectedIndex = 1 + else + ctr_show_total.selectedIndex = 0 + end + obj:GetChild("tex_round_valid").text = d2ad(mainRecord.reward_hp + mainRecord.total_win) --d2ad(data.reward_hp) --data.valid_round / 100 + obj:GetChild("tex_round_total").text = mainRecord.total_round + obj:GetChild("tex_total").text = d2ad(mainRecord.total_win) + obj:GetChild("tex_round_youxiao").text = mainRecord.valid_round / 100 + obj:GetChild("btn_more").visible = not mainRecord.partnerLev or mainRecord.partnerLev > 0 + obj:GetController("more").onChanged:Set(function() end) + obj:GetController("more").selectedIndex = 0 + obj:GetController("more").onChanged:Set(function(context) + self:MoreChanged(context, mainRecord.uid) + end) + + local btn_check_members = obj:GetChild("btn_check_members") + btn_check_members.visible = not mainRecord.partnerLev or mainRecord.partnerLev > 0 + btn_check_members.onClick:Set(function() + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + if mainRecord.uid == DataManager.SelfUser.account_id then + fgCtr:FG_GetMembersCount(self.group_id, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + tex_total_score.text = d2ad(res.Data.hp_num1 + res.Data.otherHp) + ctr_show_total.selectedIndex = 1 + else + ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") + end + end) + else + fgCtr:FG_GetTotalHp(self.group_id, mainRecord.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) + tex_total_score.text = hp + mainRecord._total_hp = hp + -- mainRecord.total = res.Data.total_member - 1 + -- obj:GetChild("tex_name").text = data.nick .. "(" .. data.total .. ")" + ctr_show_total.selectedIndex = 1 + end + end) + end + end) + + obj:GetChild('btn_super').visible = not mainRecord.partnerLev or mainRecord.partnerLev > 0 + obj:GetChild('btn_super').onClick:Set(function() + self.record_data = {} + if not root_id and not mainRecord.partnerLev then + ViewUtil.ShowModalWait("正在获取成员中") + self:RecursionGetNumberRecordForLev1(0, mainRecord.uid, {}) + else + self:RecursionGetNumberRecord(mainRecord.uid, root_id, 0) + end + end) +end + +function M:MoreChanged(context, id) + print("lingmeng MoreChanged", context.sender.selectedIndex) + local fgCtr = ControllerManager.GetController(NewGroupController) + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + if context.sender.selectedIndex == 1 then + self.record_data = {} + local myInfo = self.record_total_data[id] + pt(myInfo, id, self.group_id) + if myInfo then + ViewUtil:ShowModalWait() + if myInfo.lev == 1 then + fgCtr:FG_GetPartnerStat(self.group_id, 0, 6, time_type, self.begin_time, self.end_time, function(res) + ViewUtil.CloseModalWait() + + if res.ReturnCode == 0 then + local members = res.Data.members + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self:RecursionGetRecordData(6, 0, id) + end + end) + else + -- if myInfo.father == nil then + -- fgCtr:FG_GetPartnerStat(self.group_id, 0, 6, time_type, self.begin_time, self.end_time, function(res) + -- ViewUtil.CloseModalWait() + + -- if res.ReturnCode == 0 then + -- local members = res.Data.members + -- for i = 1, #members do + -- self.record_data[#self.record_data + 1] = members[i] + -- end + -- self:RecursionGetRecordData(6, 1, id) + -- end + -- end) + -- else + fgCtr:FG_GetPartnerStatMember(self.group_id, id, myInfo.father, 0, 6, + time_type, + self.begin_time, + self.end_time, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local members = res.Data.members + for i = 1, #members do + if members[i].uid ~= id then + self.record_data[#self.record_data + 1] = members[i] + end + end + self:RecursionGetAllRecordData(6, id, myInfo.father) + end + end) + -- end + end + else + ViewUtil.ErrorTip(nil, "统计页面失效，请重新打开") + end + else + local info = self.record_total_data[id] + info.list:RemoveChildrenToPool() + self:RecursionChangeHeight(id, -info.childCount) + end +end + +function M:RecursionGetNumberRecordForLev1(index, id, tempTable) + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupMembers12( + self.group_id, + index * 10, + 10, + 1, + 2, + function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') + else + local numbers = res.Data.members + if #numbers == 0 then + local one = table.remove(tempTable) + self:RecursionGetNumberRecordByLev1(tempTable, one.uid, id) + else + for i = 1, #numbers do + if numbers[i].lev ~= 1 and numbers[i].partnerLev == 0 then + table.insert(tempTable, numbers[i]) + end + end + self:RecursionGetNumberRecordForLev1(index + 1, id, tempTable) + end + end + end + ) +end + +function M:RecursionGetNumberRecordByLev1(tempTable, id, root_id) + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetDirectMemberStat(self.group_id, id, root_id, 0, 1, + time_type, + self.begin_time, + self.end_time, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local members = res.Data.members + self.record_data[#self.record_data + 1] = members[1] + local numberid = table.remove(tempTable) + if numberid then + self:RecursionGetNumberRecordByLev1(tempTable, numberid.uid, root_id) + else + self:NewRecordTableChildQian(self.record_data, 0, root_id) + ViewUtil.CloseModalWait() + end + end + end) +end + +function M:RecursionGetNumberRecord(id, root_id, index) + ViewUtil.ShowModalWait("正在获取成员中") + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetDirectMemberStat(self.group_id, id, root_id, index * 10, 10, + time_type, + self.begin_time, + self.end_time, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local members = res.Data.members + pt(members) + if #members > 0 then + for i = 1, #members do + if members[i].partnerLev and members[i].partnerLev == 0 then + self.record_data[#self.record_data + 1] = members[i] + end + end + self:RecursionGetNumberRecord(id, root_id, index + 1) + else + self:NewRecordTableChildQian(self.record_data, 0, id) + -- self.lst_record.numItems = #self.record_data + ViewUtil.CloseModalWait() + end + end + end) +end + +function M:RecursionGetPropLog(members, index) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetPropLog(self.group_id, index * 20, 20, self.begin_time, self.end_time, function(res) + if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") + else + local info = res.Data + if #info.hp_logs > 0 then + self.groupumberTemp.total_round = self.groupumberTemp.total_round + #info.hp_logs + self.groupumberTemp.valid_round = self.groupumberTemp.valid_round + info.valid_count * 100 + self.groupumberTemp.reward_hp = 0 + self.groupumberTemp.total_win = 0 + self:RecursionGetPropLog(members, index + 1) + else + ViewUtil.CloseModalWait() + self.record_data[1] = self.groupumberTemp + + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self:NewRecordTable(1) + end + -- self.lst_record.numItems = #self.record_data + end + end) +end + +function M:RecursionGetRecordData(index, isMe, fatherId) + ViewUtil.ShowModalWait() + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetPartnerStat(self.group_id, index, 1, time_type, self.begin_time, self.end_time, function(res) + if res.ReturnCode == 0 then + local members = res.Data.members + pt(members) + if #members > 0 then + self.record_data[1] = self.groupumberTemp + for i = 1, #members do + self.record_data[#self.record_data + 1] = members[i] + end + self:RecursionGetRecordData(#self.record_data, isMe, fatherId) + else + self:NewRecordTableChildHou(self.record_data, isMe, fatherId) + -- self.lst_record.numItems = #self.record_data + ViewUtil.CloseModalWait() + end + end + end) +end + +function M:RecursionGetAllRecordData(index, id, root_id) + ViewUtil.ShowModalWait() + local time_type = self._view:GetController("type").selectedIndex + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 0 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetPartnerStatMember(self.group_id, id, root_id, index, 6, + time_type, + self.begin_time, + self.end_time, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local members = res.Data.members + pt(members) + if #members > 0 then + for i = 1, #members do + if members[i].uid ~= id then + self.record_data[#self.record_data + 1] = members[i] + end + end + self:RecursionGetAllRecordData(#self.record_data, id, root_id) + else + self:NewRecordTableChildHou(self.record_data, 0, id) + -- self.lst_record.numItems = #self.record_data + ViewUtil.CloseModalWait() + end + end + end) +end + +function M:RecursionChangeHeight(fatherId, childNum) + self.record_total_data[fatherId].childCount = self.record_total_data[fatherId].childCount + childNum + self.record_total_data[fatherId].list.height = self.record_total_data[fatherId].list.height + childNum * 113 + self.record_total_data[fatherId].obj.height = self.record_total_data[fatherId].obj.height + childNum * 113 + if self.record_total_data[fatherId].father ~= nil then + self:RecursionChangeHeight(self.record_total_data[fatherId].father, childNum) + end +end + return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua index af62fd13..0af501f2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua @@ -5,8 +5,8 @@ local GroupPartnerStatMember = {} local M = GroupPartnerStatMember function GroupPartnerStatMember.new(group_id, uid, time_type, begin_time, end_time) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupPartnerStatMember" self._close_destroy = true self.group_id = group_id @@ -18,20 +18,19 @@ function GroupPartnerStatMember.new(group_id, uid, time_type, begin_time, end_ti self.end_time = end_time self.check_member = false -- true的话是查询直属成员统计 self._full = true - + self:init("ui://NewGroup/Win_PartnerStatMember") return self end - function M:init(url) - BaseWindow.init(self,url) + BaseWindow.init(self, url) self.members_log = {} self.lst_member = self._view:GetChild("lst_member") - self.lst_member:SetVirtual() + self.lst_member:SetVirtual() self.lst_member.itemRenderer = function(index, obj) self:OnRenderItem(index, obj) - end + end self.lst_member.scrollPane.onPullUpRelease:Set(function() self:getRewardsLog(self.lst_member.numItems) end) @@ -55,69 +54,68 @@ function M:init(url) self:getRewardsLog(0) end) - -- 搜索玩家 - local ctr_search = self._view:GetController('search') - self._view:GetChild('btn_search').onClick:Set( - function() + -- 搜索玩家 + local ctr_search = self._view:GetController('search') + self._view:GetChild('btn_search').onClick:Set( + function() -- printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111") - ViewUtil.ShowModalWait(nil) - local text = self._view:GetChild('tex_id').text - local qid, qnick - if text == "" then - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(nil, '输入不能为空') - return - end - qid = tonumber(text) or 0 - qnick = text - local time_type = 0 - - local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_FindPartnerStatMember( - self.group_id,self.uids[#self.uids],0, - qid,0, 6, time_type,self.begin_time,self.end_time, - function(res) + ViewUtil.ShowModalWait(nil) + local text = self._view:GetChild('tex_id').text + local qid, qnick + if text == "" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(nil, '输入不能为空') + return + end + qid = tonumber(text) or 0 + qnick = text + local time_type = 0 + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_FindPartnerStatMember( + self.group_id, self.uids[#self.uids], 0, + qid, 0, 6, time_type, self.begin_time, self.end_time, + function(res) -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222") -- pt(res) - ViewUtil.CloseModalWait() - if self._is_destroy then - return - end - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') - else - self._view:GetChild('tex_id').text = '' - ctr_search.selectedIndex = 1 - local item_result = self._view:GetChild('lst_member_find') - item_result:RemoveChildrenToPool() - - for j = 1, #res.Data.members do - local tem = item_result:AddItemFromPool() - self:FillRecordItem(res.Data.members[j],tem) - end - end - end - ) - end - ) - - local btn_back1 = self._view:GetChild('btn_back1') - btn_back1.onClick:Set( - function() - - end - ) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') + else + self._view:GetChild('tex_id').text = '' + ctr_search.selectedIndex = 1 + local item_result = self._view:GetChild('lst_member_find') + item_result:RemoveChildrenToPool() + + for j = 1, #res.Data.members do + local tem = item_result:AddItemFromPool() + self:FillRecordItem(res.Data.members[j], tem) + end + end + end + ) + end + ) + + local btn_back1 = self._view:GetChild('btn_back1') + btn_back1.onClick:Set( + function() + + end + ) end function M:getRewardsLog(index) - ViewUtil.ShowModalWait() local fgCtr = ControllerManager.GetController(NewGroupController) local func = self.check_member and fgCtr.FG_GetDirectMemberStat or fgCtr.FG_GetPartnerStatMember - func(fgCtr, self.group_id,self.uids[self.top],self.uids[1], index, 6, self.time_type, self.begin_time, self.end_time, function(res) - + func(fgCtr, self.group_id, self.uids[self.top], self.uids[1], index, 6, self.time_type, self.begin_time, + self.end_time, function(res) ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取数据失败") else local member_logs = res.Data.members @@ -144,18 +142,19 @@ end -- end function M:OnRenderItem(index, obj) - local data = self.members_log[index + 1] - --pt(data) - obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - obj:GetChild("tex_id").text = "ID:" .. data.uid - obj:GetChild("tex_score").text = d2ad(data.total_win) - obj:GetChild("tex_total_round").text = ""..data.total_round - obj:GetChild("tex_perfect_round").text = "" - obj:GetChild("tex_valid_round").text = ""..d2ad(data.reward_tongji)--""..d2ad(data.reward_hp)--(data.valid_round / 100) + local data = self.members_log[index + 1] + --pt(data) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + obj:GetChild("tex_id").text = "ID:" .. data.uid + obj:GetChild("tex_score").text = d2ad(data.total_win) + obj:GetChild("tex_total_round").text = "" .. data.total_round + obj:GetChild("tex_perfect_round").text = "" + obj:GetChild("tex_valid_round").text = "" .. + d2ad(data.reward_tongji) --""..d2ad(data.reward_hp)--(data.valid_round / 100) + + local tex_reward = obj:GetChild("tex_reward") + tex_reward.text = d2ad(data.reward_tongji) + d2ad(data.total_win) --d2ad(data.reward_tongji) - local tex_reward = obj:GetChild("tex_reward") - tex_reward.text = d2ad(data.reward_tongji)+d2ad(data.total_win)--d2ad(data.reward_tongji) - if data.partnerLev > 0 and data.uid ~= self.uids[self.top] then obj:GetController("mng").selectedIndex = 1 elseif list_check(self.uids, data.uid) and not self.check_member then @@ -192,24 +191,25 @@ function M:OnRenderItem(index, obj) local btn_zhanji = obj:GetChild("btn_zhanji") btn_zhanji.onClick:Set(function() - - local groupRecordView = GroupRecordView.new(self.group_id,data.uid,data.partnerLev > 0 and 1 or 0, self.begin_time, self.end_time, self.time_type) + local groupRecordView = GroupRecordView.new(self.group_id, data.uid, data.partnerLev > 0 and 1 or 0, + self.begin_time, self.end_time, self.time_type) groupRecordView:Show() end) end function M:FillRecordItem(data, obj) - --pt(data) - obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) - obj:GetChild("tex_id").text = "ID:" .. data.uid - obj:GetChild("tex_score").text = d2ad(data.total_win) - obj:GetChild("tex_total_round").text = ""..data.total_round - obj:GetChild("tex_perfect_round").text = "" - obj:GetChild("tex_valid_round").text = ""..d2ad(data.reward_tongji)--""..d2ad(data.reward_hp)--(data.valid_round / 100) + --pt(data) + obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) + obj:GetChild("tex_id").text = "ID:" .. data.uid + obj:GetChild("tex_score").text = d2ad(data.total_win) + obj:GetChild("tex_total_round").text = "" .. data.total_round + obj:GetChild("tex_perfect_round").text = "" + obj:GetChild("tex_valid_round").text = "" .. + d2ad(data.reward_tongji) --""..d2ad(data.reward_hp)--(data.valid_round / 100) + + local tex_reward = obj:GetChild("tex_reward") + tex_reward.text = d2ad(data.reward_tongji) + d2ad(data.total_win) --d2ad(data.reward_tongji) - local tex_reward = obj:GetChild("tex_reward") - tex_reward.text = d2ad(data.reward_tongji)+d2ad(data.total_win)--d2ad(data.reward_tongji) - if data.partnerLev > 0 and data.uid ~= self.uids[self.top] then obj:GetController("mng").selectedIndex = 1 elseif list_check(self.uids, data.uid) and not self.check_member then @@ -246,10 +246,10 @@ function M:FillRecordItem(data, obj) local btn_zhanji = obj:GetChild("btn_zhanji") btn_zhanji.onClick:Set(function() - - local groupRecordView = GroupRecordView.new(self.group_id,data.uid,data.partnerLev > 0 and 1 or 0, self.begin_time, self.end_time, self.time_type) + local groupRecordView = GroupRecordView.new(self.group_id, data.uid, data.partnerLev > 0 and 1 or 0, + self.begin_time, self.end_time, self.time_type) groupRecordView:Show() end) end -return M \ No newline at end of file +return M diff --git a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index 9c9a8201..be6da697 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -2,6 +2,9 @@ "objectStatus": { "n56_j120": { "hidden": true + }, + "n54_j120": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info index 33d250c7..e56b7506 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n86_kwi0": { + "hidden": true + }, "n157_sbng": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/xt5s7iid.info b/wb_new_ui/.objs/metas/m7iejg46/xt5s7iid.info new file mode 100644 index 00000000..8ae66b9c --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/xt5s7iid.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n54_j120": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/component/Label1.xml b/wb_new_ui/assets/NewGroup/component/Label1.xml new file mode 100644 index 00000000..f10b3268 --- /dev/null +++ b/wb_new_ui/assets/NewGroup/component/Label1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml b/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml index 5edc246f..3c2da8d2 100644 --- a/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml +++ b/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml @@ -1,10 +1,10 @@ - + - + diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png new file mode 100644 index 00000000..8d23ca03 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 795.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png new file mode 100644 index 00000000..0829a6bf Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 796.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png new file mode 100644 index 00000000..1f7b62d1 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 797.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png new file mode 100644 index 00000000..513d14bc Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 798.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png new file mode 100644 index 00000000..567b9e08 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 799.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png new file mode 100644 index 00000000..8673732f Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 800.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png new file mode 100644 index 00000000..217e743c Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 801.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png new file mode 100644 index 00000000..49384049 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 802.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png new file mode 100644 index 00000000..d81c4d91 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 803.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png b/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png new file mode 100644 index 00000000..53752e2f Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Group 804.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 331.png b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 331.png new file mode 100644 index 00000000..25090c7e Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 331.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 424.png b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 424.png new file mode 100644 index 00000000..49970ce2 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 424.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 425.png b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 425.png new file mode 100644 index 00000000..aca29bb7 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/Rectangle 425.png differ diff --git a/wb_new_ui/assets/NewGroup/images/jifen/积分记录.png b/wb_new_ui/assets/NewGroup/images/jifen/积分记录.png new file mode 100644 index 00000000..32790490 Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/jifen/积分记录.png differ diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml index 24695aec..f625aa9d 100644 --- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml +++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml @@ -4,80 +4,79 @@ - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - @@ -93,13 +92,13 @@