From b984e4eabe20069faca1e0eb660d734ea6c5178c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sat, 14 Jun 2025 05:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=B2=E5=8A=B3=E5=80=BC=E7=BB=9F=E8=AE=A1?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Game/Controller/NewGroupController.lua | 842 +++++++++---------
.../MngView/GroupMngPartnerStatViewAlone.lua | 445 ++++++++-
.../MngView/GroupPartnerStatMember.lua | 172 ++--
wb_new_ui/.objs/metas/m7iejg46/f6brhww.info | 3 +
wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info | 3 +
wb_new_ui/.objs/metas/m7iejg46/xt5s7iid.info | 7 +
.../assets/NewGroup/component/Label1.xml | 9 +
.../component/Lst_fag/Item_fag_info.xml | 4 +-
.../NewGroup/images/jifen/Group 795.png | Bin 0 -> 13054 bytes
.../NewGroup/images/jifen/Group 796.png | Bin 0 -> 12920 bytes
.../NewGroup/images/jifen/Group 797.png | Bin 0 -> 13748 bytes
.../NewGroup/images/jifen/Group 798.png | Bin 0 -> 14117 bytes
.../NewGroup/images/jifen/Group 799.png | Bin 0 -> 14557 bytes
.../NewGroup/images/jifen/Group 800.png | Bin 0 -> 2253 bytes
.../NewGroup/images/jifen/Group 801.png | Bin 0 -> 1962 bytes
.../NewGroup/images/jifen/Group 802.png | Bin 0 -> 1815 bytes
.../NewGroup/images/jifen/Group 803.png | Bin 0 -> 2062 bytes
.../NewGroup/images/jifen/Group 804.png | Bin 0 -> 1936 bytes
.../NewGroup/images/jifen/Rectangle 331.png | Bin 0 -> 360073 bytes
.../NewGroup/images/jifen/Rectangle 424.png | Bin 0 -> 7253 bytes
.../NewGroup/images/jifen/Rectangle 425.png | Bin 0 -> 1380 bytes
.../NewGroup/images/jifen/积分记录.png | Bin 0 -> 10268 bytes
.../mgr/View_GroupPartnerStatAlone.xml | 69 +-
.../assets/NewGroup/mgr/Win_MemberFagLog.xml | 48 +-
.../mgr/component/member/partner/btn_mul.xml | 10 +
.../member/partner/item_partner_stat.xml | 76 +-
.../member/partner/item_partner_stat2.xml | 79 ++
.../assets/NewGroup/mgr/imgs/Group 806.png | Bin 0 -> 7746 bytes
.../assets/NewGroup/mgr/imgs/Group 807.png | Bin 0 -> 7758 bytes
wb_new_ui/assets/NewGroup/package.xml | 19 +
30 files changed, 1136 insertions(+), 650 deletions(-)
create mode 100644 wb_new_ui/.objs/metas/m7iejg46/xt5s7iid.info
create mode 100644 wb_new_ui/assets/NewGroup/component/Label1.xml
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 795.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 796.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 797.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 798.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 799.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 800.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 801.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 802.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 803.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Group 804.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Rectangle 331.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Rectangle 424.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/Rectangle 425.png
create mode 100644 wb_new_ui/assets/NewGroup/images/jifen/积分记录.png
create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/btn_mul.xml
create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat2.xml
create mode 100644 wb_new_ui/assets/NewGroup/mgr/imgs/Group 806.png
create mode 100644 wb_new_ui/assets/NewGroup/mgr/imgs/Group 807.png
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 0000000000000000000000000000000000000000..8d23ca03cf610ef5e0d1ca890aed35ed7b23a668
GIT binary patch
literal 13054
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
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..0829a6bf3bcff5fcc62c5ee06ba32185fa1cd5dd
GIT binary patch
literal 12920
zcmV-;GKbBHP))Fqgd|J0Y|EByYGYe~%*!QUN=yy)N4*GKb!fjO*ez0iO<==$oNv@;QU}pW5`#-C4
zQo&A^zsu!7eSGujF#CnEXT9(e7o9q>!{>c);XLPy{|qHPa^S1L{kUIq8cwgE^)z%ML=Q|se2qLDQHN=rjHi^f2!gYYwUka?nX
z4~+m1s4!M?9qGb;OlC@9ETwUiuE6+;K>)D;%u3}&3ii-lY2G~P;*~c5hQr9RkQ8m~
zMNA{7YqMJX-aCEx$xmlROKs};8*SdaIXu&0<7jd11-gRCU{J!bvt$)A3oMZl*;rKp
z?8c&IidT%Z1wKp4oL49nD*#5^;
zCzrnY=QtQDkkw7~xM56s
zHeh9{Fsl;cB>^>9LGI<}Rc5;Ihz5;_q<@GTHE+>}Bj1O@!1~ozfXw%f|qOpuot_fi3xudO(F`b8CW6AI%%sCa(TyMZxVH-F}
z@nk#%<04Ytl(->$Id8Nw8{59@98t@Y=t%e#R9(-SRzeS8~
zHSI^jF6x-iKvm~ixR^_zwI#A}grSe*$uNc|fW=_ZTOpXaRB1b4ocjUBt&kUx#}LGg
zD|l~AX3g7kLA+N`iV1C;>yzdGj$xJaAO8$^l#PO$cY+5;o+zIR936V0lo28qtr1Z<
zFSgMXa#4)eMJ)s`EXXu#kDtE`m*|ZJa#s<=ZOQaeDxcDWBcUfWVr3N
z+t8F!Hxdgg=)stfkkLX{%wV;|3ZsQ2wXRa9%E*|-3k{L;J@I1VQDn&?S+s!-tI~R6
z+1V^5k+bln_nc!ReZn&f7S=&r1dpm1i&*y{xaYB#*1UmR^b&(iXT(t{~HQg2j=
zCC=7gy$gYdk@2$O7&vI1#@n&-t3p0y8aC&^bM+joW0$&aECZ1Xavsp`+4CyP6xKEQ
z@h}9AdQZmjii~lNaMHxe>O=H`o<6n72It6kiT3|q@@BPmp0j%8@>~Dxe}Cxg>FH?(
zU1*3`EOH-DQ3VUFW%)c9Vsp(V;1KpGQ8C2hb{LTrNSVi3ctRdD7a>SNYz)6JES+QS
z2~9(zXagj6^GpRUwi)y&OlFiaR0NZoHqCk~7@KBdK`KmQAc%aJMC1gxX&cOtpt22!
zoIr=rQdXyINPDQ)2qNWBn>u+@6>!y{aA8Emc!(?n-@bBuF(phi7?{xz*)seY`o!>?
zRXLmzW1WsMQHC=|<|O8zP2}Ix^&D;AC+qO>@py0jsuibw{f~Zc^Lhg1y7t;@Q>Z9w
zXUAJgt>ijHZ0yh8_e+g_ciSpC9B`pPU+SDCEF|;WB*_rSMmBnE89FM?DJuXzb2vdL
z!Q7p}%k?ze5J*E@3Q;XF~`EeMuPU
zSeXqXV`xhDFj{*CS|Z(r27OZk0=kr_3Qjt1xaL+HgV&-2G9r(6*=vZFTpE#|dSvRS
zS8aISYah+eqVK6rbaC2+h)zSz3aIVymJ<$j!-EcsI4G_-kR=%^7n+*)@Z%I*xv=Dv!#{5N902ZYG%77B;eCeCi7hcwL7!y=Fx0a%
z;y^8r)DJ)Ei9+^Z!UYJW$KCYE3dpVdNA1@
z)*#=%FSJ!q!TbW75wH=giaVH`k?zbmX5p!bz2K4w9tvC{oW%1?ULip6$O$Y{nJq*n
zIA)O-PQ*t;KZfum*c_r_WAGevOW@0}%oJUgEkZ#vqn&1CJD%&DR1~{V`sP`1N?ieL
z;em>kjw5s^CBV};rKgeNMc$}Lh)3i@SRA)EE({0q!<0Gu4h>0Vsv_A?@vcdcLTK><
z=|N>CQ*mM78POA;qnO$sFkkkHmtOuKwr<@zs1qK#_p)9mOTv{y#szt?{v=1+OMzu#
zass4^Mj$w-2vUDw^Ev13LI6)@j5JH>g;{&Z0w{u@N|}F~IT%{IWlmqs3`Z~K$m<^y#?F&cj@xD@w`w0v*-+zr5+dE!al^{oeK?&#Ar
zvSf_bzWhQOUp~>`)eMJc_B~1Q$RJV}@8H9*W0^Q}IgQq^8hl)T)S3s8dI@&p#N8g9
zw5Il!D46aNHgo{rmU-?*47tw$0@l71YGv9yE$;Rj^$jB!_@&5>Q}015_~z
z)R}@NFBFiYun8Oyc_ktu+=mnZj|3(ZI1sgkNc0*e*PRNk$}Qt0FL_NjQEBe`$X99Z
zsi&1Pqe~XiMgRIA(8L+1h27u!3Ge*sk7yR2FSM+@d_ArEg-dE>T}lTZdYpFN@of%sT7K9GQ}q|bP5Tqgj>G^
z#cm!N{E++9`zWSe2@s~Y~A4K&>@QxL|{tH?eLEeVxU
z*?5R0G=ic)wfi!QnxFmT#yjZ1k9N?Cms~@qUGdAb|IRPa{=06bWgAw}mp2q59p=J8s+tTl{4Xf$AUwI+j^E+RrpLL0feD*ItpH@8Q3~-Mfo{FfO2TEs*
zHo(>5&c?2Ns$y76L+SSz`u@2C58#hC{9ph|r%>V|b(fqSX!RRoo#e&d@YdhhPZkV|
zf`#Kzu!bzAV2Fg*fYue>fKUOQz3qzd18GS!DyCRU^qOed2)v$zG~y`>%ZRYCl;Ni0
zTwE81@}3WTiDvdcNtfPmH%*-PT$*|8QM%{N=O$r|B|ban?H{Ez*Sw34r$jhEeEaig
z_Q?auyBzuHep+?auhE%rx^BTR<_;gA`~U4L(s@+wkyB3Vt$XyLds1JqocD$o(W=YO
zZHH!5UNaa@jSir0JML@RyGWr46NG=>>w%5V572Sx%z&u1BMAHV(reLGYX?eCS@TAs
z#b?n|PtCl4$r&&CZNi+gK_04PqrJc@=W$pErbZ>eoMwPb01E=jU|A&vV9&b*pIKqZ
zJgLHp18OO9oa7F)Jy97>bXhoN3rPajRPM^UTw@xHL8-#XQZKwwv0@pmh5C4vE0*Z-
zR$lcM+I{oKl5)ke@>Oq1_ZM7FuMO~qjkMuCH!i5%j?ZqPoqw>IwtwkvT7L0aG`e^Z
zsW8TZ$|E$wXR%c1%XU6r1~V0Twycgn{ZX2#Th6
z%RP@aF1t?D*nRs?Xy>i>@qBYDRJ=X6+(>)BcH{8+wL)Ha-OYNAC5E398=gy}8D{i2
z(Mw@LMLJS@rDKmxEm$en)!y+?9h%1Q^vF*S(6Vz^kqUX^J+gTz=01&Fdh2LjBxshA
zWeUNV?qc}i0)V)m(m-3ZA#x>r3*0p{P`Kc48MoPtHM=h9=wGITmz;I#tFL+*peCP6J>hflg#*3?M8a
zutM_s!klKtWXOPrb?)MDBz#aIBJIN&GE(O4-TF|N`ttYFMVIi#dr|Nur`^A5M
z0nmEE+$$J0JuaC+jtk_*q~m7N2|G;9AOGGXsZ!V6Dk{ixKl4aB|8YJ4IaVu`lyz^~
zoQ~ry%g#NWmS1!hZU3{abRs2&eneY(pP%_puTupRqcA!?W>E<8rF=iGf>@9XdRB!;
zvNS$=!EBVFZDTic9rc_U46C~5y4WAV)L#?}mLxdW$2z9+*YBbgFhsC)|E6e
z;LCphzg>6QKY!M#BLOD|owZXK^*zn*I^mgJ#M*(X5JlXY#MLJtO^6Iq@_??h_`Z?0;K
zd|z6}c7t5UESX>63`H8>uaA)?C>qNnZacFKLJwIu6kKp5%{11b|NGY@;f>e(?`-B!W%zcyb1+Yb7SEDmEM$HalO-#z
zxF((N-te(B$6EJ_%V^h~575kkC)2!6%F%~@kbcKcoy6#c+%zF{g#H;*LlmPI*0^QRk23}IMF#+-j&zVuyfw_(R9pL;yg^s((^VZ1&dkEqr3OJK4R%viI9$#r>ZZ~9p@zUVR;ZwwPRZQ2xH&eRc6sY6tFu>4gi840*~v?9Tt$zaiw
zq(OQKrq%)U%|8PoFWSyg~cp$LU3%StZer=CI=
zz4a>Eb=L#*#61tu>{IKpg|Dj
zuF7yrU9c#ox#u#aS-y_$NmpYdi!Q~nZr!@IWBgvp`jZ^8@l+Hn4(=
zv6t)Eqrw=5EB)*)%95({iBn8w$7k3ZUYruzP}+SA5z
zBzrH+E*^O}E7<8PEK;!0oXn#og+PPli>AEum3okZFIoe7}O
zVEM4`+PWWk>mNm#}epjhB>tS)rG$U(;Y;IYUV%17zN)D&)oL%fc|oI$=5=gdTXR
zQIJqD%SaV)!-2N+MiAYQ*+^Y#O0C!ytaXi-XyNJpZyu)3&C9#Sr
zWFU4taUM+W=WDAMW)2+Y`)|C3W@q{rnbG4!FY{QP5INCu|7UKYGhg;x`u{0$-X)5+
z{3X|<9U`&Fy{LrKd44#tdbwrvG_=cWQ;irwbbxcA%n%LflxW#ds`)kL0@md=5<&uh
ztqFLnTmvH-;dRDa=KP9Z?yrKdv6-LS8Y+Q;POUbwh2gv4E0YU+tTd|GADGQhIL}7@$@_0iQHQd(O
z@>7{h0x@x2%rO?cW3IR3wjU(riW_`Se_gWRKF_N!qJ7h@I0l6c*ee&%2k7M}k4ceRu!3b@R3
zPTBbK6IQMSt5(*D4I7h!&2_wL5;y=9MrU$rH${bi|b)At75gvtA=(O#&nC4eV2(
z=zZdv(nJ6Gt-TA*OY4M$WcBvladS%Xmqq4SF{v_h@GzZ7iAuBgzHKRKBKV&9=IfFN
zjwLFe^t0@&JpV#LHp2yBRDP^$mzg)XmWlIM$%>TT3HjSffS?g3Ow)q}MPpjFWnJ#f
zQ7Wr|gg`D)hu?@49No7f>$_u<>8z@%?eQchI@05qNvstNy;i>miy!x}tx^m`LFptM
zYeo(q6`2~mcI!H#uLTT-`Z$sHZo0`hxscit9xIFBe3-&Qkc%GHaZ3Sb$6(`{!U$JWLMJvDIH7^Ylt5?u`C5DWb
z+;BHtTxa*9LiLpO*Ve!gTxvIj!RjXDJ0axN%&b1e#Yp=bQx(X&a{1ZWBt|M;M
zssrw@R#3acg)@;0Cn|ZarpqiSE>u^5ft#3eaPgpqgvL^
zd;!-7-Sdgh4-MVoTxTKa`S{LOS*C9I_2k(OZGTKcw-YNhO;=xXewg0AJ8kchWJfG9
zH6N91X>BZ)ty=?g)R1}Qgb;*-O|hEyvV4*NY1_26DMSVLb&k%MI1$fcIAnWEwytGf
zw1_0hMIb?@He^u?^kE+xGCl`@)c|VRjV()8M~^=B?LB+;NTmRscbLJZ4B70fpOvOe
zZ1YfoV1p!OD?;e4vi8fDY4h-LgJxrmf``iuVZ{rDyy4bcl*~BwFxh*mX9DXtz|VuR
z$1Q)~5Iv)MOZ8ww4jNi;ok_yEr3>(U*!Ix&T{QLQ|A$Vr9GcoiJHCBSqSu<&z1uyD
zdlaJqc=GXmwDXR;OD`UPrWSSBy@ua1&%q73?i%Ye2ywoTU#O~_*JAJGST=AQepp{{
z6Yr*9JR?$%914%;<<~rIP!E`8u>PGqGa-Fo|G|3+=0Y)xC?#+DZIyXmxMVW#q4N?;
z1i17mck6PwA=frllFiSce(-t@&&;RDx{T~zW-xV9t190s;%t>e(|@zZLpdQMJ+Q^>
zYR&*xbBgnoO8vHrR5`BYj`*m37Qi7e}`czz>j&HK9IVVVZIO^rN{yw!&_raU=gQ6{o^QMucu
zwRH^>S^~caH85)()HB&N!CT7#!x(5IeK+qaiX7!}WZ4|A=cW@Y
zl4H@LMPYV!Hc48%7emB2A1nV1QvY5=AzXlg#V+;lNU2aO2S~Gs>^Tqw4lqmqawRBf
zs^U6i_$UtS4hcpC#nq`|?kx8UIz(VA{5^sM3^h2jND~V~Qds!VSH49vhx)@qTxW_U
z?y`uxI=bdbdr~swn>4J%?{Q$bDa!%<^*1L4izOyg;+mY4n4F2qAMuM`?7UjZ9+VXe@;{1R8gJ5atX9%@h_{L=zPT7{j^wq@qo8@@!S
zjGAR`?nyXE8r5V;4c1r%fzuOxtRra!v2podmw`m67rTHL>0$*WXR&yzRf}3y#NAj=-kf
zg_I|^HT9#SN97jfjEl-sAOCfFu=ZN=f@SoEae+MIxc{Lk+Ii>qZR{0H6YxW)8pg>z
zDiTnX@4=Ue19eOl7{WC2d~Em(eXvax8acDj4nI2Tsi`d<#oGE($S1>Xg6VxZ;NgL8{_T!{DC|sA$)q3puRXkZgB0AFHy=2P~datREzdOxw
z;-Yg`csQ(-N*Ool4m)OxkKl|IAHfmjT6NKd^|WF#C0%*)_~wE2WL7fB3Ac2Vd^{aXZ5q5Q;u!7mG`$CN#=f)B{v
z+UD()r=FU*18KBw-MWxH7~wW4>L@PB0pHy=BBsKY67^mo5WbxZtHp#nEwCUOmhcD}
z2DSssmLAE(Q#PIwX|kVT=RoeIdF|Wqw<0rv_C7OxouR-t$Ic^*#(AW+@KIUfTqe$M
zWXHN}>Xls{@wx1Zk8d-_Bkt^ouZg5rOHLV{!ry;K-r>IP47%XztCIK3_%OQTsc+p$
z`yZatew$ZWrqV+9(hVCEemnnQOKKXG>%5L5#CT%5U%R4`;OWFxrLibPO;ps|H)JmBA
zzEuBCYn{>Yak}JFQ}tysF=tWciFe<7Bchu+{=iYc9JawV63IO;0}Y
zM4cenMKgz|Q(GH~Nu}J2uvTC6>@a!8T2k6LVYIUMfuDpO-`&blSz^CyF1s|oOBNn~
z;3qsfR$p(tl$M=w29=*7k6v-l0}t}PM;@W2&sv%4#eS)49$L(
zE?!@f;hR_To~SUeL82NZp!PukipoClmkQ(n|8+IbHe3<6Ms5GfpWpSGtKaa>M{>oa
zQ1$v(b?T|7R$I4jMWqTQ7DU55*zF%L@XFS}25FX}<%!A>bJJ5JAPzWxB6RbJ~uP{s<
ziJmTgAfAQC@%1dc?;mwZ@cC;v{D@oU?Q7H4eqLGkaX1r`fi}IKYfD9Y_wIlDvtNAe
z=l1Q}SJi7@A*bi%KGDdl#1}^AWEW-yMj19qf$Vzn7HQVBwc0U#!p|{f-g*l$-l4%=F}O!w3iJBOz74FD7Wv6
z+-JO-!+jh_7$be+;7~3~1_9B{gP8xYNiiy)7f0P~PKELa{A>)|$6y54V1id=#4V3x
zN{xH!;=MtBB0E%2p#lNHBlO@6C&pu*b{TI7y^$uOpbiF-85Mv{=`t2%*h#jqyI`_S
z_}e5X3?H==OsarVNBd<{Zlw+2{k+!_Ej}fMh9AHFk3UGJMDZ0Bu9d8cp9+XylbW2I
z3^_e7-=_~
z)(_x>awD-=R-!VbY5hSs4S^XT+gL>?-90L-xCm~*FbTeRrCwa%gCQcLrR|I$f
zl5l@~0pPQKkI?XyQIugE$+h$+O$V+LnM{=PC?W>xh{x6Nl&CN$Knt-h5M>Os9|nhG
zGS~e11>4p~;1LNtH?E7ySH;|}le#?TWkjc}NNZlVe(V3f<^!MjOj^H?&@d`jgs^Sf
zHuPRG^G?G&7?Y5+*$%}bu*^y7=6I(_`d4CLHBkl&Boiyrr^Vnlpc=^>tlPi+v
zs+H^NUwHl7x365eGDzl-sMy;B=b`aT)K~iFV6sNg#Dj9tFu2O9AK)`y%Csz5-bw{G
zum(Qo&w#;Kj6~+KJuuTO4^!s^JKvT??)ba{;bkDQ3P66Yf+x6Oh(txG$<%2Kf-o=y
zd!>V9Y#mB12(h>Fq}6;#=4eDfcT^k+?d2I2$taLgS*r?S{c)VGqo8A>K_CppN+Xou
zVps-N$**~J(XPP)=fvdDu(8O(u!mv&b1^qwS!y_@5_Ef-K`O9_20c%
zr=G|9FZT>K!Xdi`*zccH(gbIRbXNxx)FAtV>I6GODA@Q*7;r9sc-@a(Ci<|~QRpQ>
z8&hk1*e9`tLk*pq=d#yM!r*d8f+$+0g6{7N?flELB|KJIR?N^A@7X^aBWoR`8}i1D
z6J^A>+U&lN9V76!4WvyBsSUoo4#j@oDe(8~Iu#$^?yi+L}0i_lxW+k)<~JH=09BI1OD8V79F<_{S5f0Wb#$K@?h>HgSs-ak-%r
z{xCqaz5^6U+Z@~$FlC+F0#yp3Zv7Jc3|N6V1yZTrE#cyp_
z$%fw@J9em)$8AydoC{3^*6l1q-e_iN-kiw13)9RlC~hjjDTV|=VKJMl_FoXn;N+8T
z8kbx6(Zu_KaM4vl3B?yfn{=bVgQ>NiC+%cz#UP-9SUgYB5t)$5@O^|N%(ho@WSK$m
zN4o0RbyCibhE3o8UdY~%Bt&b4Kn5E*;6l!lP9!4AE)+)aq7;a$@LA`ZEut7K3Uc1u
z)NEyH&kk7=b$0V!k&OYHjA9X(lnnsqDb9+uOcy+_{%zh6k0Igi-FyDsnV0<1mw`el
zsWBJ~;%<#Jh>I`2IKI@P>x8&~0;N{TSTPD3$g#s0+W~dE_P1qF4jm_iMV5{VjO;VwzMa8D
zYli*V|7D-1jNQWDqCe0Vw?8>U2!!%*sW864>(UTNdnP|dv4KRbMfuVoOq|jv)Up-L
z@vJq?uayJShYsKHhky9>>;L6%ZaFA7YmZgsuSA6f9!TwZOTU7hEGNs~{&HY;cJ{s}
z_8+?bk8Zx@+tFi1ZBSqxBTEE`!(uhfoxR@O0U2&(pNM2T^f&iC5{%?$CCP(sE?)jIHf#l>u^ff{a9a~;cr>Lt9=j5r9J)VQM>-7
z#rb53L(h@w)eDW21r7plase<}I70oUC4R?2M{Or{0M62a)=P)Lo$R>Z%h!317Cja~
zn--1AHa+xN+D8vLkZ;gNkF{&pMj2j`kHz_jG9EwM9OXSG{zgO(@}Gt6e=+$u3g=^x
zkCEC%j^>Ud0!!-2UsAF-sEnxo=7Gwgiir2iI?}f1dFORsKZ1+Y5gcS6J0P%x($KT*+;xzDCvB7IDYkvbD|tqN$W1Y
z_tZtDT9V~C9d(va6{}8UjMTq_Lb-S$3(5;A0w^h2?kpe6&Lv%maI(
z=UiY;2#jIlspl+piqD4r90D(lM9PPNDej}WoXZl?F
zlXIyr*VHxw?mocRKERqS8q#)ANBgd}U1RN{RUZyz|BHI=EgDj{HHJQ3V7mf0Y^OAr
zYw!Z)IJ>S>UEq;BFYEP;V-XFPA%`c7r}R)GIU*CqiofWop7C(7x4>KslO8hpQ-lj^
zP%2@14ufhvr|!XbUYG4V`W~I9{V3uM&qs&!<6xD)!^TtA!*dh{c?RLQ6O6K5$FnY4
zbn-@E_3&-959cA{?j7R-=(=FK7j2~7sL-uPc0^Y3S3Fhvm8cD(x4+U-YBx^&60$J3
z0fdz9obup6IS1uYD6VT4e|w$}iZFIqosphCTleICIfjn=UCbLGbK$(Jzg9b}KZH(Q
zbnP8i*Z4ce(219{MHpRl>7#KR&oKJ;(0Byf7RoZRKv+zEKIP_Cs8D}h%0(Rr=x-bh
zW*iAJFQ9}BX-=8bxqH;1wB#q5j#xlMty93&`Wo7(p>BiBC?~}^m#Og*=O}Mo#t-`_<&U}(
z7JsGltOXZ9N)hf#XM*CnS715_R~9b%aL)in3trJb55ap_X)&Q>L`O(bwoze#=M3<;
z1CDzJICBxI?BTg&syhFWYk?1w-W92`P`7(cPWw(Jp+@W_%STVu%{q51dT)7|Iv@AU2a
zpOMLaQ%iUL_uhV;K7HQZ_geOwnwjNwMSX+6MQfsXB7$(5wet*?;F7&wCx~plYMxfo(
z`*J;r_{bx=o-7*5qc*_jRJVe)MHu+oVnnLpZQZN->fxz|L2N}O^EI+jzmHS!^CIVd@Kb^t)Bf|~BoMzYozId;z>~N!agtFRUqiS?_!Ty5k5k^jETpnnM*8dK`lA0r2n9gqpyY~FrX6eo
z_wgU6i!mv!c7qqhAgL^Z_}&BfV1BsCL}!D@cagi$d<
z2<#*oP9lLMDum4j_88jE{GKFQCeD}x%%`Fj^9`;nX$X2xR9GaPO@<*qxQSH_-~v7w
z_Hls%Z^xv>8UQ~s31i|y5LPdB?g)d64n^&+5?04tCpR7fV#x3skf`mI*c5LgWX{y4
zjAdEJoBu=sTL}xa90CEHBX%0B3<$3e
zvKD59EorMz3s2W=tZ?nM*M`R)d(4?N+gn`8o)-W9fK_s(m3}yjt7-`I5w%<
zwY!Ycj=a3mW0~0Uuq!1)mxD0Oi>ejX^5%X6(T_2!M>dW7>0bZ0c1
z`yH|G)95AV2b~8tSbW$oMiM*bGG@Nxjyo(f1kXmQ!I(TLk)78zcFJK_O4TX#{27Lp
z%2hD6OGynAn?wcCACblcrf0^C3Y#n|vWb%5irUU;FE%Jmq6QVZMVdKLW|Ie+Q=5U&
zjq`mqooalH1DIZwsTs((71V4Cg
z7{gV=D4;yfOM5xTh@6eaia%MZvt!6yo4t8xPCF7dB`v4p8ap$#2pKKg3v5skaA-;e
zBESce^XI(0E5R^}%#aDuc&BQ+46iUp6h0~&s=y1*d#n?<;24D-hz*5JWfZ#!6vje7
zjPJeo-VA9N*Fg?55ksxpRP{$C+VPN#B_-5#z9lxJi=ef
zgu~>`DNd$O+cXU^4^4-Jt&sDx`H*44zQ@T+P3C02NBMq)+14e&9Lq$lBtFjOaH=2N
zSjKK_A>j_jWO*YhIL^4TaY8vYamI*yC^uFu#R2f|=Vn~BJI=7VvU%PWj&$zpkKMeG
znPm|Nqdeb0TLpfGKGFPUGmmkOah$C&sR9s1p>w+ob&M8q+#|Lz5EtB!y#|xxvdb>h
zbGrHFn>|;7;G9;KR&yQ|$6w6}FSSxmzK3QcRZ+f5qF@~kp$sOQUn*fyBTzPdg12CD
zUrKzC2MF;Fed2-IBH>D~Q!S?f*$~YBPt|WPO
zdO2}u)Ord#7aY|RmGC~R?H`JyAED;po&_*bvopd#J&jbf_Q1U9m_n^RaZCztu(rlj
z&0i#=KAf@K2&@ax=tQ~Vz1=mYBHeC>}IEtK*vX;E*bSpS9M
z&2oXXefxImG+5|-G3tUHMr?Q9d1tf)Lt|5{E;g5~QqTQYs**~!a;jRVUca##Amp7G
zG3i#;#?0Sv8jsB0ri}PzJ|*eERhc3C-NE9rKvKD&4uDNHI?6ce#aa6Wn7t1Zpv^uG
zi>A(PDmHs6+R7?N^9Ue*;pG|%A+@U0PGgD55Y6S
z(Pj;r7FPXSIXuEVlxPTyAG%X|t8sJ5e@<7MZ`zP+pkuMD_kg+Ldf2FndXx_PS_&i+
z7l}|LPthK=#8$!RauE~Y7ooVH4|qhl<-6Siv_oxC5Z
z5mhT2`WA@g7a_HE>sCD#Eye|?!rGjzdr7!e$`vXmLQn}%WTmeBkI}aR$y6_NT9hj5
zY?E-As97g3cW6R}Ih%&w7fIo7swLdnm(S3#AI{UM!!OX(ni<-7?O9&M31&CAKBj`H!J9FDL>
z7~Z&>vTp-pO0#YKE;Cp(N)s^ez3@An8hk{~vQTSD`(~<^9$4|gWp243BVLcJBM8Zh
zA7{Jyr%yqxc_8AcDLx;g%luHcd5gMVqUQ
z#LB&fL@FwM>G&yr{I9-4OUF+mu(azvH`0#ZzRJ3LF_sy;_9xwHr8a4VJa#AhZ9-
zr2us>$PsS`)wE2P|7k3;?do@J=$Op(b{FIrcYYY^aosi*`D&Vm(%1p&0nknnzzj>-
zs>P{>+T~{2;edkQT1CEU1UG3nwqKXD4tEm!Xk@P0?Q?YL@7+mDN9O79SMH)i9n)-i
zV+qsorCoJ2Tt=8X1;CSn#5Y$hT#5(1$hgBryF8mAN0
zp;88)iIch^b)Lr!iDHDDC6$(`CA*F%YrVy%o{MKfSX&7T%YAeb8BONmd@n7-2H%CTP=DOz3ze5|Z-$$!W
zkA33SD6}L=J;kNMu=IR~=iNm;z~+H0Okr-vrg^B$KUg=8PAD~Ea}$bCmXz8Kws@?C
z{Blj9ZBrmTG*n}zr=EIB*1@O?)yL~DlE`=6b(fWyt}2ziiMCfvF+g6+h5+ic*r;s@
zVgvJbF-n-;5YWHL4D1&CK(YmDrm6K8#b03r(Qs!vVi)Ny%q2-Qi7$U~yCKu01s);9
z$3ORNR_2_PgsC)5=RSl%lu3H2Yg3qZ@xXJu>Gg3zleXXf5hK`>5C6Rpa@}s-pJ+H8
zZ!3ua5^a6#{%7dIP3w3nn!^<9oC|YFn%%yO7ANGNeEPZ0JYFBqJ59z!u+=I3)&e~k
z9S|2oRw9Q{%LLeL-k_&Ig)4DQHH?bHqyKCGf26
zH233wdMhn_uhV2V?T+_nI%d&yy3;^sGd?E4j4-y6FtHqxWIlGi`zG3S?Q4LBB&iBf
zKOx^!&BGv^ajRZvPCqbQ@VAN@VDHxS$TE0XTnc#|3>$abr6Pl&Q)Ulb>Pmgt?^W#M
zF$^^Rn3N#$>lUEd)Fj}_1}>t+@tB5yZM{baSxgKGZ2a_d-;SCL@s@8dh2b`OdLv5cH!<%NA0zmBupmSXX(hnrdEC8
zuG?bXYLhVR#v5*N?VHKm;aCKK{66vJ`}msw_;%4|#ZoctLga)oK4=>57kkA^slx
z%*SZqo=?YeO58`k`Gx4y?6~bCw3;LY@!7>pIIXE=7S-3;(#h<
ziA-v$3(B+EYc>ew8D~2eEffHGF=vD(U_xGiVW%f&3)dyBX~7BgwT9B#D{hFt65P-v
z8lc6LLrEA@iF)~TU&^0+=-y7_e1QHn((+3$nn||prYpkq>
zGY>=ou%=_kpLYyb=PPq9MU8ThrY@Z6H0Jtdds2301q>K>NlbNNFfsALyi?k!
z=*Y}A_QS>iM=0!->IHb*iHv(JZV-t4Q`|(Q7*mN6xE{A`*^-`Ao}Q*>pM6%hN(Eg9
z+rNK5I}KKCqOW~0G+Bdta@Byz_m%sl-UuUrxfQp~Mwx|*8R}R{%}>USvKfJFB{$A(
zqr;SP^QA`~ZmcGCuG
zrE@W(R!X9|F1_`7n%TIXx4dBw9sc$sQL8=p{<+wXFph-5hte|mOglSM@yx=(NYI*4
z*r+eMIr&4qG_`(H)OIT+F-t{o&2F2cwO8I~3@pM&{o75yd0T{C=VJMlGgO#LwF+k~
zLRoX+Mh5JWVG}mv7A_*(ysUnf(z-FB(H(64QsYwtDHPBmJ9g|?Y+>ilo$>d|E3f1(
zk{BOZ>5jM`(Y-PNwn}-C7J62dL5p!(
z%u32yENqp-s1N5t;voF0s2S4|*
z2;;^--xu#4{ni(v_LX$aj=8>BYU@sFy5*pNsxr6xBLL$O^#UYFb#)woJhS-v0VCE-
zA%yyFXMRc2eU6?*@{M8^wo_j*>F46(C7r~kZ`K1%l|J>R!>7~E7Ki)g=$q%?_W$N$m
z=~X4Af#Nfj5Pi%iG!rGMkZ-SLrKq5%yK!!}H6NtyGg1ARkFA~c)BOBAQ)vOEu07d2
zUETC=l~Rr``|f;ap2LIRV@M@RQy#9Xv>kIX=d%M
zOoZl2F_E(HSbFg#V=mEHb)Y~@UDei@mb<`@36w5;F508TmkSkv|6DsIr)vjXDGIEehEl5Bkx0@CuqOK^}R2_IP#
z5^Uln_U30TSyBUMmww3$-+wHcM6DzYG!*HRHLUCY>Van7<}MU2hbE1BE&S8twByaM
z^SE+}lP*@6O?rk}+LC{ag{p;gvh7W>!vvX2e40aF*&j{27K6z;+oYucVHVLqQh&M&
zY+U`j`@(GJ>-CB3+>!{oE!TI#?#tgir+TqZvx2fvrc5KYZ7kBDmZoB1p%Ss^BbhRA
zk2;aY22w@c4%Gvu7UVr2jHafh!oWxnD0^+2zV5d!njy`LdNmLzb?c;dwVHWc?cy*)
zDPuJuqOU0#B$|_Esq;ra`!}6gG`ySQRJT|wYg_BPb(w7)F=`M)5}vP=Hof&dk-*ekO|EdWOhY1k#iJXZ72%*eIdH?xjG7MTX4#t
zM+8((;6DHW0(6ee_gZ1pU`lA|EPyEhn_7uL@>@Nw+Y5@!<3Ig*WG*47%Rls~sHr4+
zrD@lPJ{>1t{1723)JT$E=!jzBYd4r_IJ?7#u0>O5l1QYawc9t*kWC(;MBl*#5tuu;
zb3pN9OvVLUvJ-oDmUg`9T3YzwWAsQTBs7WEk?Loc&P2u&L4i9v4u1BdCOl;PuRNCm
z85kA4XxEOg=XZXyi&Ab#(XtT*c%Q|JNpOova3#Az7PEOcxb3W!0-y^8x8AGw1>!Z>
zNV%=dXeQhfCziD`KR_2hfVLRiquLe93?V^|nVFf8_aR0IB*d7u6S?&Yyue7>*r_`ZB1b
zO&Iw~>sr2!1TS{H@mhN2#h03GNg7=^!)BW3WGn0@Wr_M*f3nai&UlopyWak$7*sj^
z+;Qv6mWjF~jE9TPB5Z`YbSM4L7N=KUSmejP^tX1sVb>16?6+=6VRQ0(8&{KXH;5$M
z4_WW|>?PcDI5sh?Iox}CTN9SIa6NHxL-Mt@)_Z3P{Ia_lK=^T`)UCZP$U(A`LpS?M
zh#oikO0w6s*}FM#s}w%)HttCgvW<{tx@BTgYWRxY&^m98|OvuD?X@nt|7C&^~
zgO0gkUrT4)H3l0**r;E2yjy}8!p+i)-mG4F_^EDO3$$+A=6F4|!VVRUA_`+^WD(OW
z>}6cersQB6*CBTl!h|L_6K?ehPWXDOVXVc>j|o->wKRU4KB7@;4rI-)Zld>+$^m0>9v=4
zX4Fh%pdY*|W#c;7W1rZ!BJ-iYvQiXLOtrOJH^=B+s=LeOOPaZ8eR_PID@jp`R1xMZXP91Oc$SNmrF
z0&IJ#IVRCyi;Ih~;aYo1n!KAnz9H1TC8l_K8mvy61nt+AsF+c#5
z(3x!Ex)0vQ2ma4}bnMY5>0HuEd+RU>Gajb9qK{%4Y)7eoCa)3AUbKOXxlD>u8H);y
zY((ggNPUbkNZPJ~_?`|e!wS!5$+AO>p_cOQ^`Rt8bgbGCj0^Miy|XK5MfC$?
z{e^j2F)6{9pcgPm$RxzY4+~j)RhA@yEoQEZZBoeh%-3UYNuh~Y0IOmHUVB03AwTJy
z*}wWe7#1vTj~LBe*i4xRiNs-Ip=yq)`KqsANC>`yw!?TGdgh_^S!5FR?247stBE3>
z%?yS_Bm}3@f8%948oFV1rl$XP4405Zfz=8Y~MGj7GK+E@k&=5|2k_ZW-0#~Lj@
zEwwXpN4g_gVbXok=fq^MCWo+x6iu?WbdZ_eIyXiYWEWV>YLCNmp4}LGA
zN?=qn(xrVz%Jg@w$%2>2`FB>d5zJb6yc^{P_W
zt@?Vn8(pRJ*1fMSzE`P}##e9u@%t*%?>H_{F1{Y%TVF6HS$c7ire1R{+
zU2zxvAag|=fgm@MRa$Z{76l?wP0vj30ZG$T-e=eP7IdoT$t<>_NaFpT(3Y>M;0KLj
zIo(YkTdtl5vx@$KOPlyIFzvDs2N$M52h<@V*J2-vc27z(yO-QBGNjzjj~W>3jV%A@
zPoAJ7KTa>Rk;y&R^&2ts)I`+h#w5u-^m$(H%%Y`}$y^cwLLWu_mkpO(q7lUGUlQ&*
zU@u?*k0!`QeoIyNJAd!@>Bs}+b#jS--xFbI?JZR15_3;rLnag4T-FH&c@|5aA~^cZ
zFUD~RXOE
z@y%dnfg<3n30*La$pR_{T@NtcxpQZb9rfhZt5dc0LUT1}BL-j=1W-FC%CEPo;mFbg
zp8bl004b4588KlO{dQ1*6)o9mu2`tG8Fr;KsZJe56m#;S_wSDW%?{W+EE{emZMtGt
z-i=<5#o4@I=C*e%y
zRni7NWh_3GFq=Nkk{?A6N@OcMsZr=Jtb$O%wpT(uM1%81ZcZwGR(>ppWbMf7TEj?X!*-TG_P
zO6T&pe`{R`iD<_gt}8I(2N%YzUs6WQulLrlJ_o}?hj!gnp#)yTE5t5qeQ}FYH&$5$
zzvkb+n|9oAeaGw@=(_*#UfO=+-dI+GB*JL=uqh^CT+~n+UDaU5+W3lsbWgRCX!ocU
zGfdJZMrG?43e^kODwx)7-I8$;P>+TD3U79FVz0aAOb3*RAMfe?G18Cx3&B2aQC|IC
z`gI>B0XlX}n3DKl`GHFU=ISN;Mze+$Wuv0yDgor8#(sVuSfEg8D3uQV=wE5q&dnAK
z&f^bYFPku8bv!wn0?{d5v!z@3J-KMlJxP+#@ZqoAm5_1GRk6C5K=S0X5UK_xq|T`o
zB4V0^fOI|Q=}&&3YwPaFXmWqk6&(Xya*0lu8%i++Rhy|WWiqWFMht#JYNR8KshQb$
zC0az8Lf{o2==o0LC_Hh`V#i3rOkEHL7gA~Nx8BOzuDL37+KiutR*nfC>SosRg{&oIc*vzYcbpPljniJbW_x8Jb=0E0UZOK1*@x7nfy+Q0HJz=
zOM)EuAwEhjSK#^!m-g!H?|-JD@Z2DaxnqNHXI?8RW9kw?K-jCceND>zS4>67KYi>N
zJ^r?39feD1yku-TFlF67_QD_s;D(kBN2R8)2(N>k%q$SbY{!={J
zdeu8O9y@ld*mr2_r8LHOa4+p?vbz}JSU*$ZRE<4@1?;UC@~rD-P2FtdIGFTJ$b
zXZEatvhf@zar(kp+O&Hv`dMcd7sE@(jNy|nleojiQFW87baQ_nxof)g<*
zcieCtZJL{-#b9)3iGVWd21ciZc(3Na{D2u7K#%m<>z30T!!>`+_AYCP5Q
z--&v>RQYQRyNHw)fBTOTRcyX#_$D`3m{4iv&0O!`|FoWIq*$S>K4ay)30rfOd
zJ>puphQ4m>6CGv7q{@6Ez#z2|7Vify9CBg5KnZPyb{hzr(Lz2Ml6*yc!X@7CofB9E
zgpfIti3qF&6!^jKufu#I^2`pfr#>3nxhS;f1L3SRjxSft`{7YHOqUf(IQWQr=l$!#
zt;2Iwx(_|P6o_v9qg1M6F!EYU-YB)4&BHYKqQUY1C1S{RLvR5hf_h~h7~r5mXWq>r
zj59!fIx_5|Mu35W00#<3066p;Vl~YM
zDzr&9HgaPIR+m=>R7uvqVxc?kxFe||kU6-}?9+Huv=geQv^kR8tFLX{hRV8+t^t)N
zc}<);!PooN7ol1YHZtI9ZBNSN8NjEAi
zM}RaNJ1$%j;fK_@z(YkS`47{T9Wy4d8U$=@5&6enpncY7^8j94V{(?aUWcM3bO9U+
zQK5;-$5D8xXn@)m^#TQOq0)uRoR6#@2CKBtoW9yxwY1_uvDY-8c1{(4wnA~8*m^)&q$K+g(LQ1|(W1=h!`a9-J^EwYI
z6wDHURZjnC3p?RrO)%1aC?5c~zKVvj?Po;#*bgxZq71Y1x2+#wc7q+@%5$OG*tD>r
zGp}V)rCCUsu`q3{3&OT&ob)@YG+&BDlI;pI(-L4aLB~p;L|h38+uD}?5bnSs53&4_
zR|WupQWA&gJc#)fa<)GeO&Tl7R%wFG9F=&cNSu{xHMbDh*`f9FG)V8K)z*
z{D5^w?B|K#ogag^BhZZK7v*1|2lN}g|5bkRzRqo#!$J#4W4$>e5MC~^exq4l8Bpgb
zKMlY1hHUat0_BMVj_#XYMJtU_dS?U`-$d(I`|?6DKcv2z2`=dLky>a<1YF1jiC>#UhAR|gnQ;vzF~1bDXaMbxuO9Oc
zA|jpwNOvf&glzaK7*(7kqEr}**;S-J!yHgG#!?UQrW(%7Kbx0e8l<$RA9~L?)Nd6)
zZ{?ML={kUhRP9FA0~fQD3muKs{82noHMbd-T;tH8LvGWrypuyrMCW!{ZgS4p!t~$z
z@BIltAA&1Fb$#18Qkmg`3LZo6ah9P4#85X0l^mmmzR$>2kY=^1KgQI#y&8;&`mJU7
zL%$tg0~m`CZ39f~0n7BF{*8yEIX3{C;=Y)qq_W8fiW>yzO>QOJia}H!D_FJPTa6vZ
zopS1sdKsJZ=W5!5K#Z?dfUlQm!T@et8UOYV
z@^XrV4#?wz82<*L+?>ABjVh_AM5|k-f@gk%7yN@fP7eoDZ#_@z6?dyL4RVvCP*53Q
z_@RKPqbOqyWI{yYN4(nD1Neo2LzU(ZuTkoUq7@uh__jTns{hl#Q--?uAXFGRH?O7?
z!fO7kw$(#QX-kEnEhsaz1;Gm|M@lomKY8vVnRt@T^GNVyMn1PeSK|vcomNbo+kyZS
zT6}YJbNKq~9#__1xTM|(_#nqvgfOz#lOk>`MeHTW3o{V;MaTf=K_J3~U3~FPd4`O7
zgjbuXC`wTVmU@MKix~s70cMXy`V21+=wT!VgOqF;ArqapX_HnkQH>=JQ1P6R$wZzI
zK_H~2+2fmvPO$Stp~)12{?%OK2GLq;I8HE`Envc4Af>uxM@}kJgo_C%E>Tq5V#XeB
zoNqN*mkCWs@|Foh&WN1=L^g;pu;01i+o2(gM>qRYgRzD_z!$QK2-PBm2N$L_WYy1T
zq1Q&Zk0vOVVCMroziTG>$JN$<7K%~tZ
zJ~bS;Cybon2x=9Sbx#$z)^DaW^Y?&`%yrGE~W|
z_)d5*C`3sj0VF}vka`kkqytZwb&ZqO~d}^j`SHEjRexg}Ln)zW}kV8Je7to9x
z=?h15STWG~bUvL=gGpZ5)-Vr?ox*5M`4lrcE|fUsR2SR7p!=0KyvRdI7k0;*?pWI$
z>#Jjf{%+m6wZ5;%`kc36%a$#64dvs#oVNk*X+3OfsE<~E0GGj6!MVO}L-GL@gBkm4
zjCBak4Xr)_zPgPT9ySb&r3nYXJJhG^cf!1Fm~h|0*T8oRFM~Kjd^cbk!qtWfj~go7
z^~zUs*@CTwU%9^y4&epiiP_92;%ZG%it%%RC4^D%>k0OD();hfKgb>{0XiF(EqQXTAx^oLE&sXccyDTIO4TiCKepN?d<=mFhS1#Kt54aguhgDlt{l;_rx=PJkY9QK!946=^M~50%MP6n-J4Vw@H7ZZ
z3n#5UsxtVyW(dv(9uTiRI9f1h8&a<|Csmt+bA@essyYXb3He+P~=
zlkQ1fWoB$^=vVt4>Km`CyfqVGY>r`-<6EiURrQBs%0#@XHdeqx#1+of5H7GCD7!}I
zy){RxJl0Gam-g3ab9Sgr5N0dle4y>s&X0{<4m1rjpSVZ9hP0O!FkdV;qQ?b#WDdq-
zwz{tG%{H#p{{o>2MCQ>Y*X6;e{`lUqkRv+-5Y0JSEZp&T&vBx
zJV?+XJkK=B;2ccEQKRok?avO>J?D9-@je6_4bWNDZ<8Je>JPSGwHaw&nM*ZS<`w^i
z2uu}oX&S*XMTOavbEic;QenF33IKOc&KvjRue38%NAtBmJ=gMjO?@HY?m_z(RQIL_
z`W=G(f=1mH$6DcP2!G&Ti?F;`D(VFH^GRUJbEstWDM9ZxlmY0aN&U#7+Fa{2+HSUimjggXtt016
zQD19fdv$)ZpInXy>hgrTaeR8e&R6&w^`?ek0_S%KR#y+pBV3c(sPCS>Uo(o
zw}7)A>@prG&ow@4nyCAkfRo31wX?t*8vS!TaJ51c>;qW^EpNXEjQ9m
zpe@%i-XHo!fXQpm7K7LKxRNBjYlL$Zb%WD6Pa)j_f9@Q|na5w2_;27tJRtft#
zm(e-LF-@w|m|MqKNP7)>sLu)O4dLQk##xm$Av@Imz(Mu%ludrBc68`3*Y~T2UE~Do
zRdrn0a)_Y^d_ii}8z8LuK22zIQeVx7Pysg%!2mxJBErTMF}Zetc(9+^RCh2?H4jxk
z)PRqukEa#^)nysRXLZA{ztIw`z46xYRQH?xLmRC!IQF{jUSHIoJd<=y3uk<+s{+wG%hg
z=4zxxquyX&D~yF#11r`&*YUR687ebGWUmI-EA=_)dNpl8I_LR1*E9t0N^q}4+f{1P
e=1}=bW&R(hQjrX&$Q*tE0000UFP)T^iueI(kRDZE$0ngqt3tg}4
zH`-nhKc%03>NZ;V_LUn^r_=tZI(3_itp}$CuC05cpf%Qd3?uL=zJFb~5Pn>2-Nm$1
z6VR^dbvYl!d{h#;o-FFSM{R^JsBVR8i!t!KC5Tkx+qzcu)uB_3gVJ&_%z<>&I#v5k
zf&Bjgead0fSX`;#Mk%l`2f$}|4^Me9%Chbg1hVd9A>QFpJW;nXQXw^NVgp=tikhbL
zX)rI|!@*Lk?N*!BfSPrwBuLQ~_E+9>+16b6r=PcJR%K5AO@)vbh#8~ygtq^2oR
z{~R^j8}TWGqUwtpc=XYwC4il>J9g|CfP!hYF_K^Eaxnh|4QigQ$A)dzW7cuh!b~+(
zTBp_oi0A+j5hA2(dVSC!zyQAMWBW9Ox40+Y&|e3is_#LXpqg-f_!V`v-D-S;R$1*w
z>CtLGwbN>wd+6Du9oCWKMtN?vU(wI*>Gd95xk2|n-0C@P&2fjmt$C>CvNbO?J?ruG
z_0z(k54Qo#ht;jDF4Bmo6vnJYn8P8v<3AhHMYsqTp$WX|=5ha}u0;3-`AMhFpK`c2
z(0W+mB3y)vFcQ#OaV1=&!X+?Hv4lw?op?OnIrFC!5mpg
zabXg&ztUof^5X@=99qI*IZdAb9=bS{MhNZ_X&5nr`-$ba
z%LJwS>vFw>aF`PUg}_-jh)aW?+a|*s5VNl#5WpqhU1glO9t(6*Gp04;I!Xqa#G$}w
z@tU?!Q(y?nMvezb(!zDl(pblYdC+CZd4V
z@|+l>5(MYC&}2A?1ez!_HXGVQXgkS!)M$x0!yOPlRke8E@JgD7p!djyS<~5M81Y>(
zv1$Q|gipeKn6bdi0hC!C&_^a=NSqnM>c!3r#^7v2(fX@~)iKvljE8_36268cT6<+S
zrP~07Gqx#Xnb+~AKS9A($^tzHM}X&m3k#M91miHF%gjFnnsmmC7CR_}E=_7H6~~g8SI1yFq6|aTMEIe^jA5{@
zC^O_#hjQ6aj^o6Hdjqyf)yWzv@m#c8+LqI6>HaWHx@o^bWRa-V05^*57;cG?hN;hC
z_)xBgW0ShR-Feh@RO&1J%oE%FF!qEGaWw{0LJnvX%e82%W7KnkHto2eZ60IP&MuE7
zwJ&YX8@xW
ze1P)}d}lnH`Wn%$BuWn
zD5d6JLO?0@pK9MwLy{70E@3cm-=$ST8m#O`|$hx>=hQ
zs>~)2ET=XDqZ_8{>N?f*7&>shDp%7{*_Knc%~4^gvdf099Z~H98|nisP`0NQOkGW<
z#}pL~Dc(x6L>nBNVw~r*=h}G-Ck?4uNqsFLQny>!QzoQ=nFJejL=A&{vym+qkj?a0^^t(=Z)Sh%rS
z$!OV5VuP}RLs!ZX0X>+Cc&^lUIT>b|88Rgru2gO3;bq|n%13oWm3YB<4|N=88l%z!
zwV}AFj^bhhMX)dqm_aWhgeGg-l8r{isjnegiv#m>l
zJC>MQS$vq>;aJ}lV;L4>bCGs1Cc8JFOyfi=8z+=g7iWmHhjK%;QtW{K<=hObc83YK
zqHLOX#Umb<^@qj0khx`n27@%;z*`xAhCb2#W^<2mj&Yo=F{uF%L!om!4|R+eaohv8
zF%W0k4@(OspY`k4>oINLzP*$xP@Lmx(rU@09Qdm{QEIJtCtX7~lBz6UrBSdBJC_HO
z+%MIzXb~v6KCbj&QeVn^a1RJl2J}$|YL}IpfU94G-_&!GnQuCE2lS*DjSI
zq+x)8>)BKbTEKKisX5_e0r#Mx5eJo4WVMKD5j5G+)iR2MCPB2HY*nJAA~-J+A(WF0
zW>K*HG^RXG#g!{fo`PPE5*n151`QS=N+P_}7mZeHI+caEaYSzh19h#D1POf1Yi^TLd)f(>Xp%e7lWBY0TjlZX{
zB@?vvmTPHp^UWit-TX2_-3Mo`je}cQ4v2WE-3?d{_J@^_ILZ}
z%%PLCV#}30{jLq}{F~?L*kk)xu1WprcWvUyRZA<)sACJ`jMl^Ak}xd8M%p{^)WI;W
zW$RW-TU2-gzWS+`UgP6Wze;a-IxJbYlGeW8kAKy2McSQu@im_P{tKbamDjK1>3_Jf
z><>8L?5ii-nL{U7>aV!wO3HlUY-)f~X&lBzZtnP5KKSjY>GX@Qh4HU`=O*&~kcXOlz3((9(Jp3Ojq;XKL-!%&V!383?HzeHB!=+DCOLamAuMv^5Nf+jM;l3Zyc`sZF6J9vB{o!qNsb@xEynSE$iD%TmrwfId4_r&@?zrAF
z#3fWtsxZr-(40zA};CVXm%_rLTmtNx1tgs&s?Y{THVmveN-%1;P
z`yKJ55GKW&Gv5B*-0@#_+7MWJ)k+auJ70gtKcIED-vC6Qtjwtj1AyjKCqSBnOl563
z2$un>=BN^6V=bqamg(v*gd$hI^@CGh$jom0B*)OlVQ9y7+fq7lJkoOa@wBs3`pkBQ3q=CYrwe_h|MTU#7Vu
z`@`*3@4b^Qf8R$9mje$xPTM|x8^IbAnX