diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index 28fe00ad..609510ef 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -242,18 +242,41 @@ 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
-
- if #members>0 then
+
+ if #members > 0 then
for i = 1, #members do
-
local m = members[i]
-
- group:addMember(m)
-
-
+
+ group:addMember(m)
+ end
+ end
+ end
+ callback(res)
+ end)
+end
+
+function M:FG_GroupSubMembers(group_id, limit, num, tagId, callback)
+ local _client = ControllerManager.GroupClient
+ local data = {}
+ data.id = group_id
+ data.limit = limit
+ data.num = num
+ data.tagId = tagId
+ self.currentGroupMembersData = data
+ self.currentGroupMembersCallBack = callback
+ _client:send(Protocol.WEB_FG_GROUP_SubMEMBERS, data, function(res)
+ print("查询圈子下级玩家列表222============")
+ --pt(res)
+ if res.ReturnCode == 0 then
+ local group = DataManager.groups:get(group_id)
+ local members = res.Data.members
+
+ if #members > 0 then
+ for i = 1, #members do
+ local m = members[i]
+ group:addMember(m)
end
end
-
end
callback(res)
end)
@@ -284,10 +307,9 @@ function M:SendGetGroupMembersInfo()
local members = res.Data.members
for i = 1, #members do
local m = members[i]
- if m.partnerLev~=0 or m.lev==1 then
+ if m.partnerLev ~= 0 or m.lev == 1 then
group:addMember(m)
end
-
end
end
self.currentGroupMembersCallBack(res)
diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua
index 3819b997..1fafb370 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -1,48 +1,47 @@
-
Protocol = {
-------------------- Web --------------------------
-------------- acc -----------
-- 用户登录
- WEB_USER_LOGIN = "acc/regist_login",
+ WEB_USER_LOGIN = "acc/regist_login",
-- 快速登录
- WEB_QUICK_LOGIN = "acc/quick_login",
+ WEB_QUICK_LOGIN = "acc/quick_login",
-- 手机密码
- WEB_PHONE_PASSWORD_LOGIN = "acc/phone_pw_login",
+ WEB_PHONE_PASSWORD_LOGIN = "acc/phone_pw_login",
-- 手机登录
- WEB_PHONE_LOGIN = "acc/phone_login",
- -- ID密码
- WEB_ID_PASSWORD_LOGIN = "acc/id_login",
+ WEB_PHONE_LOGIN = "acc/phone_login",
+ -- ID密码
+ WEB_ID_PASSWORD_LOGIN = "acc/id_login",
-- 获取手机验证码
- WEB_GET_VERIFCATION_CODE="acc/get_verification_code",
+ WEB_GET_VERIFCATION_CODE = "acc/get_verification_code",
--绑定手机号码
- WEB_BINDING_PHONE="acc/binding_phone",
+ WEB_BINDING_PHONE = "acc/binding_phone",
--更换微信
- WEB_change_weChat="acc/change_weChat",
+ WEB_change_weChat = "acc/change_weChat",
-- 更新用户信息
- WEB_UPDATE_USER_INFO = "acc/update_user_info",
+ WEB_UPDATE_USER_INFO = "acc/update_user_info",
-- 获取用户信息
- WEB_GET_USER_INFO = "acc/get_user_info",
+ WEB_GET_USER_INFO = "acc/get_user_info",
- WEB_UPDATE_INFO = "acc/update_player_info",
+ WEB_UPDATE_INFO = "acc/update_player_info",
-- 实名认证
- WEB_REAL_NAME_IDENTIFY = "acc/certification",
+ WEB_REAL_NAME_IDENTIFY = "acc/certification",
- ----map mode----
- WEB_GET_PROVINCES = "acc/get_provinces",
+ ----map mode----
+ WEB_GET_PROVINCES = "acc/get_provinces",
- WEB_GET_CITIES = "acc/get_citys",
+ WEB_GET_CITIES = "acc/get_citys",
- WEB_ADD_GAME = "acc/add_game",
+ WEB_ADD_GAME = "acc/add_game",
- WEB_DEL_GAME = "acc/del_game",
+ WEB_DEL_GAME = "acc/del_game",
- WEB_GET_AGENT_SECRET = "acc/agent_secret",
+ WEB_GET_AGENT_SECRET = "acc/agent_secret",
-- 设置被邀请开关
- WEB_SET_GROUP_INVITATED = "acc/set_group_invitation",
- ----index----
+ WEB_SET_GROUP_INVITATED = "acc/set_group_invitation",
+ ----index----
-- 获取公告
- WEB_UPDATE_NOTICE = "index/get_notice",
+ WEB_UPDATE_NOTICE = "index/get_notice",
@@ -51,9 +50,9 @@ Protocol = {
----rank----
WEB_GET_MILITARY = "military/get_military",
-
+
WEB_GET_MILITARY_BY_ROOMID = "military/get_militaryByRoomId",
- --回放
+ --回放
WEB_GET_PLAY_BACK = "military/get_playBack",
-- 牌友圈排行
WEB_FG_RANK_LIST = "military/get_rankListByGroup",
@@ -62,7 +61,7 @@ Protocol = {
-- 设置排行是否可访问
WEB_FG_SET_RANK_ACCESSIBLE = "military/set_randListRightByGroup",
- ----room----
+ ----room----
-- 创建房间
WEB_CREATE_ROOM = "room/create_room",
-- 加入房间
@@ -73,380 +72,382 @@ Protocol = {
--start::::::::::::::牌友圈协议::::::::::::::::::::
--牌友圈获取组列表
- WEB_FG_GROUP_LIST = "group/get_groups",
+ WEB_FG_GROUP_LIST = "group/get_groups",
--牌友圈创建组
- WEB_FG_CREATE_GROUP = "group/create_group",
+ WEB_FG_CREATE_GROUP = "group/create_group",
--牌友圈加入组
- WEB_FG_JOIN_GROUP = "group/join_group",
+ WEB_FG_JOIN_GROUP = "group/join_group",
--牌友圈删除组
- WEB_FG_REMOVE_GROUP = "group/del_group",
+ WEB_FG_REMOVE_GROUP = "group/del_group",
--牌友圈退出圈子
- WEB_FG_EXIT_GROUP = "group/exit_group",
+ WEB_FG_EXIT_GROUP = "group/exit_group",
--牌友圈更改组名
- WEB_FG_GROUP_RENAME = "group/group_rename",
+ WEB_FG_GROUP_RENAME = "group/group_rename",
--牌友圈邀请列表
- WEB_FG_GROUP_JOINS = "group/get_group_joins",
+ WEB_FG_GROUP_JOINS = "group/get_group_joins",
--牌友圈审核玩家加入
- WEB_FG_GROUP_VERIFY_JOIN = "group/verify_join_group",
+ WEB_FG_GROUP_VERIFY_JOIN = "group/verify_join_group",
--牌友圈玩家列表
- WEB_FG_GROUP_MEMBERS = "group/get_group_members",
+ WEB_FG_GROUP_MEMBERS = "group/get_group_members",
--牌友圈玩家列表1
- WEB_FG_GROUP_MEMBERS1 = "group/get_my_members",
+ WEB_FG_GROUP_MEMBERS1 = "group/get_my_members",
+ --牌友圈下级列表
+ WEB_FG_GROUP_SubMEMBERS = "group/get_child_members",
--踢出玩家列表
- WEB_FG_GROUP_TICHU = "group/get_kick_log",
+ WEB_FG_GROUP_TICHU = "group/get_kick_log",
--牌友圈删除玩家
- WEB_FG_GROUP_KICK = "group/group_kick",
+ WEB_FG_GROUP_KICK = "group/group_kick",
--牌友圈获取房间列表
- WEB_FG_GROUP_ROOMS = "group/get_group_rooms",
+ WEB_FG_GROUP_ROOMS = "group/get_group_rooms",
--牌友圈创建房间
- WEB_FG_GROUP_CREATE_ROOM = "group/create_group_room",
+ WEB_FG_GROUP_CREATE_ROOM = "group/create_group_room",
--牌友圈删除房间
- WEB_FG_GROUP_DEL_ROOM = "group/del_group_room",
+ WEB_FG_GROUP_DEL_ROOM = "group/del_group_room",
--牌友圈获取战绩列表
- WEB_FG_GROUP_RECORD = "group/group_game_record",
+ WEB_FG_GROUP_RECORD = "group/group_game_record",
-- 牌友圈创建机器人
- WEB_FG_CREATE_BOT = "group/create_group_bot",
+ WEB_FG_CREATE_BOT = "group/create_group_bot",
-- 牌友圈获取机器人列表
- WEB_FG_GET_BOTS = "group/get_group_bots",
+ WEB_FG_GET_BOTS = "group/get_group_bots",
-- 牌友圈删除机器人
- WEB_FG_DEL_BOT = "group/del_group_bot",
+ WEB_FG_DEL_BOT = "group/del_group_bot",
-- 授权副盟主
- WEB_FG_SET_MANAGER = "group/set_member_mgr",
+ WEB_FG_SET_MANAGER = "group/set_member_mgr",
-- 设置合伙人
- WEB_FG_SET_PARTNER = "group/set_partner",
+ WEB_FG_SET_PARTNER = "group/set_partner",
-- 禁止娱乐
- WEB_FG_BAN_MEMBER = "group/ban_member",
- --获取heibai
- GROUP_GET_BLACK_MEMBER= "group/get_black_member",
- --heibai调动
- GROUP_BLACK_MEMBER = "group/black_member",
+ WEB_FG_BAN_MEMBER = "group/ban_member",
+ --获取heibai
+ GROUP_GET_BLACK_MEMBER = "group/get_black_member",
+ --heibai调动
+ GROUP_BLACK_MEMBER = "group/black_member",
-- 设置vip
- WEB_FG_SET_GROUP_VIP = "group/set_group_vip",
+ WEB_FG_SET_GROUP_VIP = "group/set_group_vip",
-- 禁止同桌
- WEB_FG_SET_BAN_TABLE = "group/set_ban_desk",
+ WEB_FG_SET_BAN_TABLE = "group/set_ban_desk",
-- 添加玩家
- WEB_FG_INVITE_MEMBER = "group/invite_group_member",
- --获取添加玩家
- GET_PLAYER_INFO = "group/get_player_info",
+ WEB_FG_INVITE_MEMBER = "group/invite_group_member",
+ --获取添加玩家
+ GET_PLAYER_INFO = "group/get_player_info",
-- 玩家备注
- WEB_FG_NOTE_MEMBER = "group/note_group_member",
+ WEB_FG_NOTE_MEMBER = "group/note_group_member",
-- 圈子备注
- WEB_FG_NOTE_GROUP = "group/group_note",
+ WEB_FG_NOTE_GROUP = "group/group_note",
-- 获取禁止同桌列表
- WEB_FG_GET_BAN_TABLE = "group/get_ban_desk_list",
+ WEB_FG_GET_BAN_TABLE = "group/get_ban_desk_list",
-- 克隆牌友圈
- WEB_FG_CLONE_GROUP = "group/clone_group",
+ WEB_FG_CLONE_GROUP = "group/clone_group",
-- 改变体力值
- WEB_FG_CHANGE_FAG ="group/update_member_hp",
+ WEB_FG_CHANGE_FAG = "group/update_member_hp",
-- 体力值详情
- WEB_FG_FAG_LOG ="group/get_hp_log",
+ WEB_FG_FAG_LOG = "group/get_hp_log",
-- 体力值记录
- WEB_FG_FAG_UPDATE_LOG ="group/get_hpUpdate_log",
+ WEB_FG_FAG_UPDATE_LOG = "group/get_hpUpdate_log",
-- 体力值设置
- WEB_FG_FAG_HPDATA ="group/set_group_hpData",
+ WEB_FG_FAG_HPDATA = "group/set_group_hpData",
-- 设置体力值权限
- WEB_FG_SHOW_FAG ="group/show_hp",
+ WEB_FG_SHOW_FAG = "group/show_hp",
-- 查看整线体力值
- GET_HP_TOTAL = "group/get_hp_total",
+ GET_HP_TOTAL = "group/get_hp_total",
-- 添加层
- WEB_FG_CREATE_SUB_GROUP = "group/create_subGroup",
+ WEB_FG_CREATE_SUB_GROUP = "group/create_subGroup",
-- 删除层
- WEB_FG_DEL_SUB_GROUP = "group/del_subGroup",
+ WEB_FG_DEL_SUB_GROUP = "group/del_subGroup",
-- 置顶
- WEB_FG_GROUP_TOP ="group/stick_group",
+ WEB_FG_GROUP_TOP = "group/stick_group",
-- 查看预览
- WEB_FG_GROUP_PREVIEW = "group/group_preview",
+ WEB_FG_GROUP_PREVIEW = "group/group_preview",
-- 获取排名列表
- WEB_FG_GROUP_HPRANK = "group/group_hp_ranking",
+ WEB_FG_GROUP_HPRANK = "group/group_hp_ranking",
-- 核实转让对象
- WEB_FG_CHECK_REMIT_MEMBER = "group/transfer_accounts_query",
+ WEB_FG_CHECK_REMIT_MEMBER = "group/transfer_accounts_query",
-- 转让体力值
- WEB_FG_REMIT = "group/transfer_accounts",
+ WEB_FG_REMIT = "group/transfer_accounts",
-- 添加玩法
- WEB_FG_ADD_PLAY = "group/add_play",
+ WEB_FG_ADD_PLAY = "group/add_play",
-- 删除玩法
- WEB_FG_DEL_PLAY = "group/del_play",
+ WEB_FG_DEL_PLAY = "group/del_play",
-- 更新玩法
- WEB_FG_UPDATE_PLAY = "group/update_play",
+ WEB_FG_UPDATE_PLAY = "group/update_play",
-- 禁止、恢复玩法
- WEB_FG_BAN_PLAY = "group/ban_play",
+ WEB_FG_BAN_PLAY = "group/ban_play",
-- 进入圈子
- WEB_ENTER_GROUP = "group/enter_group",
+ WEB_ENTER_GROUP = "group/enter_group",
-- 获取上级合伙人
- WEB_GET_SUPERIOR_PARTNERS = "group/get_member_parents",
+ WEB_GET_SUPERIOR_PARTNERS = "group/get_member_parents",
--获取积分转移限制
- WEB_GET_TRANS_HP_LIMIT = "group/get_trans_hp_limit",
+ WEB_GET_TRANS_HP_LIMIT = "group/get_trans_hp_limit",
--设置积分转移限制
- WEB_SET_TRANS_HP_LIMIT = "group/set_trans_hp_limit",
+ WEB_SET_TRANS_HP_LIMIT = "group/set_trans_hp_limit",
-- 查询成员
- WEB_FG_FIND_MEMBER = "group/find_member",
+ WEB_FG_FIND_MEMBER = "group/find_member",
--搜索
- WEB_FG_FIND_PARTNER_STAT = "group/log/find_partner_stat",
+ WEB_FG_FIND_PARTNER_STAT = "group/log/find_partner_stat",
- --搜索
- WEB_FG_FIND_COST_COUNT_STAT = "group/log/find_partner_stat_cost_count",
+ --搜索
+ WEB_FG_FIND_COST_COUNT_STAT = "group/log/find_partner_stat_cost_count",
--find_partner_stat_member
- WEB_FG_FIND_PARTNER_STAT_Member = "group/log/find_partner_stat_member",
+ WEB_FG_FIND_PARTNER_STAT_Member = "group/log/find_partner_stat_member",
WEB_FG_FIND_PARTNER_COST_COUNT_Member = "group/log/find_partner_stat_member_cost_count",
-- 强制提取
- WEB_FG_TAKE_HP = "group/group_take_hp",
+ WEB_FG_TAKE_HP = "group/group_take_hp",
-- 修改牌友圈信息
- WEB_FG_UPDATE_GROUP_INFO = "group/update_info",
+ WEB_FG_UPDATE_GROUP_INFO = "group/update_info",
-- 获取合伙人列表（推广奖励）
- WEB_FG_GET_PARTNERS = "group/get_group_partners",
+ WEB_FG_GET_PARTNERS = "group/get_group_partners",
-- 获取所有玩法
- WEB_FG_GET_ALLPLAYS = "group/get_panter_allplays",
+ WEB_FG_GET_ALLPLAYS = "group/get_panter_allplays",
-- 设置屏蔽玩法
- WEB_FG_SET_BANPLAYID = "group/set_panter_banplay",
+ WEB_FG_SET_BANPLAYID = "group/set_panter_banplay",
-- 获取推广奖励值
- WEB_FG_GET_REWARDS = "group/get_rewards",
+ WEB_FG_GET_REWARDS = "group/get_rewards",
-- 设置推广奖励值
- WEB_FG_SET_REWARDS = "group/set_reward",
+ WEB_FG_SET_REWARDS = "group/set_reward",
+
+ WEB_FG_SET_XIPAI = "group/set_xipai_reward",
- WEB_FG_SET_XIPAI = "group/set_xipai_reward",
-
--管理--
- WEB_FG_SET_ANCHOU = "group/set_anchou_reward",
+ WEB_FG_SET_ANCHOU = "group/set_anchou_reward",
-- 获取全民推广
- WEB_FG_GET_PROMOTE = "group/get_promotion",
+ WEB_FG_GET_PROMOTE = "group/get_promotion",
-- 设置全民推广
- WEB_FG_SET_PROMOTE = "group/update_promotion",
+ WEB_FG_SET_PROMOTE = "group/update_promotion",
-- 牌友圈预览
- WEB_FG_PREVIEW = "group/group_preview",
+ WEB_FG_PREVIEW = "group/group_preview",
-- 调配成员
- WEB_FG_DEPLOY_MEMBER = "group/distribute_member",
+ WEB_FG_DEPLOY_MEMBER = "group/distribute_member",
-- 转移合伙人
- WEB_FG_MOVE_PARTNER = "group/move_partner",
+ WEB_FG_MOVE_PARTNER = "group/move_partner",
-- 获取合伙人列表（合伙人管理）
- WEB_FG_GET_PARTNER_DATA = "group/get_partner_data",
+ WEB_FG_GET_PARTNER_DATA = "group/get_partner_data",
-- 获取合伙人列表（合伙人管理）
- WEB_FG_QUERY_PARTNER_DATA = "group/query_partner_data",
+ WEB_FG_QUERY_PARTNER_DATA = "group/query_partner_data",
-- 获取合伙人成员
- WEB_FG_GET_PARTNER_MEMBERS = "group/get_partner_members",
+ WEB_FG_GET_PARTNER_MEMBERS = "group/get_partner_members",
-- 设置合伙人权限
- WEB_FG_SET_PARTNER_HPOPT = "group/set_partner_hpopt",
+ WEB_FG_SET_PARTNER_HPOPT = "group/set_partner_hpopt",
-- 查询成员（转账）
- WEB_FG_REMIT_FIND_MEMBER = "group/find_member1",
+ WEB_FG_REMIT_FIND_MEMBER = "group/find_member1",
-- 转账
- WEB_FG_REMIT = "group/trade_hp",
+ WEB_FG_REMIT = "group/trade_hp",
-- 获取能量包数据
- WEB_FG_GET_TAKE_INFO = "group/get_take_info",
+ WEB_FG_GET_TAKE_INFO = "group/get_take_info",
-- 提取体力值
- WEB_FG_TAKE_FAG = "group/take_hp",
+ WEB_FG_TAKE_FAG = "group/take_hp",
-- 获取能量包统计
- WEB_FG_FAG_PACK_INFO = "group/log/get_hp_count_info",
+ WEB_FG_FAG_PACK_INFO = "group/log/get_hp_count_info",
-- 设置管理员权限
- WEB_FG_SET_MNG_PERMISSION = "group/set_mgr_permission",
+ WEB_FG_SET_MNG_PERMISSION = "group/set_mgr_permission",
-- 获取圈子邮件
- WEB_FG_GET_MAIL_LIST = "group/get_mail_list",
+ WEB_FG_GET_MAIL_LIST = "group/get_mail_list",
-- 删除圈子邮件
- WEB_FG_DEL_ALL_MAIL = "group/del_mail_all",
+ WEB_FG_DEL_ALL_MAIL = "group/del_mail_all",
-- 设置成员备注
- WEB_FG_SET_MEMBER_TAG = "group/update_member_score",
+ WEB_FG_SET_MEMBER_TAG = "group/update_member_score",
--设置亲友圈合伙人阀值
- WEB_FG_SET_AUTO_SCORE = "group/set_auto_score",
- --标记玩法排行
- GROUP_MARK_PLAY = "group/mark_play",
-
+ WEB_FG_SET_AUTO_SCORE = "group/set_auto_score",
+ --标记玩法排行
+ GROUP_MARK_PLAY = "group/mark_play",
- GET_BANK_HP = "group/get_bank_hp", --获取银行信息
- TAKE_BANK_HP = "group/take_bank_hp",
- SAVE_BANK_HP = "group/save_bake_hp",
+
+ GET_BANK_HP = "group/get_bank_hp", --获取银行信息
+ TAKE_BANK_HP = "group/take_bank_hp",
+ SAVE_BANK_HP = "group/save_bake_hp",
-------------- group-log---------------------
-- 获取奖励日志
- WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",
+ WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",
-- 获取奖励统计
- WEB_FG_GET_REWARDS_STATISTIC = "group/log/get_reward_count",
+ WEB_FG_GET_REWARDS_STATISTIC = "group/log/get_reward_count",
-- 获取成员排名
- WEB_FG_MEMBER_RANK = "group/log/get_member_rank",
+ WEB_FG_MEMBER_RANK = "group/log/get_member_rank",
-- 获取局数统计
- WEB_FG_GET_ROUND_STATISTIC = "group/log/get_round_count",
+ WEB_FG_GET_ROUND_STATISTIC = "group/log/get_round_count",
-- 成员体力值详情
- WEB_FG_GET_MEMBER_HP_LOG = "group/log/get_hplog_info",
+ WEB_FG_GET_MEMBER_HP_LOG = "group/log/get_hplog_info",
-- 获取玩法局数统计
WEB_FG_GET_GAME_ROUND_STATISTIC = "group/log/get_play_round_count",
-- 获取消耗统计
- WEB_FG_GET_CONSUME_STATISTIC = "group/log/get_cost_count",
+ WEB_FG_GET_CONSUME_STATISTIC = "group/log/get_cost_count",
-- 获取抽水记录
- WEB_FG_GET_PROPORTION_LOG = "group/log/get_hplog_pump",
+ WEB_FG_GET_PROPORTION_LOG = "group/log/get_hplog_pump",
-- 获取战绩
- WEB_FG_GET_RECORD = "group/log/get_records",
+ WEB_FG_GET_RECORD = "group/log/get_records",
-- 获取个人战绩
- WEB_FG_GET_PERSON_RECORD = "group/log/get_person_records",
+ WEB_FG_GET_PERSON_RECORD = "group/log/get_person_records",
-- 获取成员战绩
- WEB_FG_GET_MEMBER_STAT = "group/log/get_member_stat",
+ WEB_FG_GET_MEMBER_STAT = "group/log/get_member_stat",
-- 获取合伙人统计
- WEB_FG_GET_PARTNER_STAT = "group/log/get_partner_stat",
+ WEB_FG_GET_PARTNER_STAT = "group/log/get_partner_stat",
--获取钻石消耗统计
- WEB_FG_GET_COST_COUNT_STAT = "group/log/get_partner_stat_cost_count",
+ WEB_FG_GET_COST_COUNT_STAT = "group/log/get_partner_stat_cost_count",
--幸运号数据
- WEB_FG_GET_XINGYUNHAO_INFO = "group/get_xingyunhao_info",
+ WEB_FG_GET_XINGYUNHAO_INFO = "group/get_xingyunhao_info",
--获取玩家和积分
- WEB_FG_GET_MEMBERS_COUNT = "group/get_members_count",
- -- 获取合伙人统计
- WEB_FG_GET_PARTNER_STAT_MEMBER = "group/log/get_partner_stat_member",
+ WEB_FG_GET_MEMBERS_COUNT = "group/get_members_count",
+ -- 获取合伙人统计
+ WEB_FG_GET_PARTNER_STAT_MEMBER = "group/log/get_partner_stat_member",
-- 获取直属下级统计
- WEB_FG_GET_DIRECT_MEMBER_STAT = "group/log/get_direct_stat_member",
+ WEB_FG_GET_DIRECT_MEMBER_STAT = "group/log/get_direct_stat_member",
- WEB_FG_GET_DIRECT_COST_COUNT = "group/log/get_direct_stat_member_cost_count",
+ WEB_FG_GET_DIRECT_COST_COUNT = "group/log/get_direct_stat_member_cost_count",
- WEB_FG_GET_PARTNER_COST_COUNT = "group/log/get_partner_stat_member_cost_count",
- -- 获取合伙人统计
- WEB_FG_GET_PARTNER_STAT_PLAY = "group/log/get_partner_stat_play",
+ WEB_FG_GET_PARTNER_COST_COUNT = "group/log/get_partner_stat_member_cost_count",
+ -- 获取合伙人统计
+ WEB_FG_GET_PARTNER_STAT_PLAY = "group/log/get_partner_stat_play",
-- 根据房间号查询战绩
- WEB_FG_GET_RECORD_BY_ROOMID = "group/log/find_record_room",
+ WEB_FG_GET_RECORD_BY_ROOMID = "group/log/find_record_room",
-- 获取提取记录
- WEB_FG_FAG_TAKE_LOG = "group/log/get_take_log",
- --提取银行记录
- WEB_FG_GET_BANK_LOG = "group/log/get_bank_log",
+ WEB_FG_FAG_TAKE_LOG = "group/log/get_take_log",
+ --提取银行记录
+ WEB_FG_GET_BANK_LOG = "group/log/get_bank_log",
-- 获取管理上下分记录
- WEB_FG_GET_MNG_HP_LOG = "group/log/get_hplog_mgr",
+ WEB_FG_GET_MNG_HP_LOG = "group/log/get_hplog_mgr",
-- 获取管理员上下分统计
- WEB_FG_MNG_HP_STATISTIC = "group/log/get_hplog_mgr_count",
+ WEB_FG_MNG_HP_STATISTIC = "group/log/get_hplog_mgr_count",
-- 获取管理员个人上下分统计
- WEB_FG_MNG_HP_INFO = "group/log/get_hplog_mgr_info",
+ WEB_FG_MNG_HP_INFO = "group/log/get_hplog_mgr_info",
-- 获得玩家输赢分日统计
- WEB_FG_GET_PLAYER_DAILY_COUNT = "group/log/get_hpconsume_count",
+ WEB_FG_GET_PLAYER_DAILY_COUNT = "group/log/get_hpconsume_count",
-- 体力值日志牌局明细
- WEB_FG_HPLOG_DETAIL_INFO = "group/log/get_hplog_detail_info",
+ WEB_FG_HPLOG_DETAIL_INFO = "group/log/get_hplog_detail_info",
------------- group-room ------------
-- 圈子匹配房间
- WEB_FG_MATCH_ROOM = "group/room/match_room",
+ WEB_FG_MATCH_ROOM = "group/room/match_room",
-- 圈子排队房间
- WEB_FG_QUEUE_ROOM = "group/room/queue_room",
+ WEB_FG_QUEUE_ROOM = "group/room/queue_room",
-- 圈子加入房间
- WEB_FG_JOIN_ROOM = "group/room/join_room",
+ WEB_FG_JOIN_ROOM = "group/room/join_room",
-- 圈子删除房间
- WEB_FG_DEL_ROOM = "group/room/del__room",
+ WEB_FG_DEL_ROOM = "group/room/del__room",
-------------- group-mgr --------------------
-- 进入圈子
- FGMGR_ENTER_GROUP = "11001",
+ FGMGR_ENTER_GROUP = "11001",
-- 更新房间
- FGMGR_EVT_UPDATE_ROOM = "12001",
+ FGMGR_EVT_UPDATE_ROOM = "12001",
-- 删除房间
- FGMGR_EVT_DEL_ROOM = "12002",
+ FGMGR_EVT_DEL_ROOM = "12002",
-- 添加房间
- FGMGR_EVT_ADD_ROOM = "12003",
+ FGMGR_EVT_ADD_ROOM = "12003",
-- 删除玩法
- FGMGR_EVT_DEL_PLAY = "12004",
+ FGMGR_EVT_DEL_PLAY = "12004",
-- 添加玩法
- FGMGR_EVT_ADD_PLAY = "12005",
+ FGMGR_EVT_ADD_PLAY = "12005",
-- 更新玩法
- FGMGR_EVT_UPDATE_PLAY = "12006",
+ FGMGR_EVT_UPDATE_PLAY = "12006",
-- 圈子消息
- FGMGR_EVT_MESSAGE = "12007",
+ FGMGR_EVT_MESSAGE = "12007",
-- 刷新圈子
- FGMGR_EVT_UPDATE_GROUP = "12008",
+ FGMGR_EVT_UPDATE_GROUP = "12008",
-- 更新体力值
- FGMGR_EVT_UPDATE_PLAYER_INFO = "12009",
+ FGMGR_EVT_UPDATE_PLAYER_INFO = "12009",
-- 获取在线列表
- FGMGR_GET_ONLINE_PLAYERS = "11002",
+ FGMGR_GET_ONLINE_PLAYERS = "11002",
-- 邀请玩家
- FGMGR_INVITE_PLAYER = "11003",
+ FGMGR_INVITE_PLAYER = "11003",
-- 邀请回复
- FGMGR_RESPONSE_INVITE = "11004",
+ FGMGR_RESPONSE_INVITE = "11004",
-- 收到邀请
- FGMGR_EVT_INVITED = "12010",
+ FGMGR_EVT_INVITED = "12010",
-- 未读邮件提示事件
- FGMGR_EVT_NEW_MAIL = "update_mail_tip",
+ FGMGR_EVT_NEW_MAIL = "update_mail_tip",
--end::::::::::::::牌友圈协议::::::::::::::::::::
-------------------Game ----------------------------
-- 进入房间
- GAME_JOIN_ROOM = "1002",
+ GAME_JOIN_ROOM = "1002",
-- 玩家进入房间
- GAME_EVT_PLAYER_JOIN = "2001",
+ GAME_EVT_PLAYER_JOIN = "2001",
-- 玩家退出
- GAME_EVT_PLAYER_EXIT = "2002",
+ GAME_EVT_PLAYER_EXIT = "2002",
-- 玩家网络状态
- GAME_EVT_PLAYER_NET_STATE = "2003",
+ GAME_EVT_PLAYER_NET_STATE = "2003",
-- 发送聊天
- GAME_INTERACTION = "1006",
+ GAME_INTERACTION = "1006",
-- 聊天事件
- GAME_EVT_INTERACTION = "2017",
+ GAME_EVT_INTERACTION = "2017",
-- 退出房间
- GAME_EXIT_ROOM = "1005",
+ GAME_EXIT_ROOM = "1005",
-- 房主退出房间解散
- GAME_EVT_EXIT_ROOM_DISMISS = "2008",
+ GAME_EVT_EXIT_ROOM_DISMISS = "2008",
-- 发送准备
- GAME_READY = "1003",
+ GAME_READY = "1003",
-- 准备事件
- GAME_EVT_READY = "2009",
-
- --洗牌
- GAME_READY_AND_XIPAI = "201004",
- GAME_EVT_READY_AND_XIPAI = "202009",
-
+ GAME_EVT_READY = "2009",
+
+ --洗牌
+ GAME_READY_AND_XIPAI = "201004",
+ GAME_EVT_READY_AND_XIPAI = "202009",
+
-- 请求开始游戏
- GAME_START = "1004",
+ GAME_START = "1004",
-- 请求解散房间
- GAME_ASK_DISMISS_ROOM = "1007",
+ GAME_ASK_DISMISS_ROOM = "1007",
-- 解散房间
- GAME_EVT_DISMISS_ROOM = "2005",
+ GAME_EVT_DISMISS_ROOM = "2005",
-- 请求解散房间投票
- GAME_DISMISS_ROOM_VOTE = "1008",
+ GAME_DISMISS_ROOM_VOTE = "1008",
-- 解散房间投票事件
- GAME_EVT_DISMISS_ROOM_VOTE = "2006",
+ GAME_EVT_DISMISS_ROOM_VOTE = "2006",
-- 解散房间失败
- GAME_EVT_DISMISS_ROOM_FAIL = "2027",
+ GAME_EVT_DISMISS_ROOM_FAIL = "2027",
-- 发送GPS坐标
- GAME_SEND_GPS = "1001",
+ GAME_SEND_GPS = "1001",
-- GPS更新事件
- GAME_EVT_UPDATE_GPS = "2000",
+ GAME_EVT_UPDATE_GPS = "2000",
-- 更新庄家协议
- GAME_EVT_UPDATE_BANKER = "2031",
+ GAME_EVT_UPDATE_BANKER = "2031",
-- 删除代理房间
- GAME_REMOVE_AGENT_ROOM = "1000",
+ GAME_REMOVE_AGENT_ROOM = "1000",
-- 获得红包
- GAME_EVT_HONGBAO = "3000",
+ GAME_EVT_HONGBAO = "3000",
-- 被踢出房间
- GAME_EVT_KICKED = "3001",
+ GAME_EVT_KICKED = "3001",
--托管
- GAME_ENTRUST = "1301",
+ GAME_ENTRUST = "1301",
--入座
- GAME_JOIN_SEAT = "1302",
+ GAME_JOIN_SEAT = "1302",
--玩家进入观众席
- GAME_EVT_JOIN_SPECTATOR = "3002",
+ GAME_EVT_JOIN_SPECTATOR = "3002",
--更新玩家信息
- GAME_EVT_UPDATE_PLAYERINFO = "3003",
-
- FGMGR_EVT_UPDATE_RECONECT = "3005",
-
- GAME_EVT_READY_ENTRUST = "22010", --显示托管倒计时
-
- GAME_EVT_CANCEL_READY_ENTRUST = "22011", --关闭托管倒计时
-
- GAME_AUTO_CARD = "1303", --开启游戏托管
-}
\ No newline at end of file
+ GAME_EVT_UPDATE_PLAYERINFO = "3003",
+
+ FGMGR_EVT_UPDATE_RECONECT = "3005",
+
+ GAME_EVT_READY_ENTRUST = "22010", --显示托管倒计时
+
+ GAME_EVT_CANCEL_READY_ENTRUST = "22011", --关闭托管倒计时
+
+ GAME_AUTO_CARD = "1303", --开启游戏托管
+}
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
index 922b6d6d..876a3b50 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
@@ -31,7 +31,7 @@ function GroupMngMemberHpListView.new(group_id, blur_view)
self.curGroup = DataManager.groups:get(self.group_id)
self.member_data = {}
self.online = 2
- self.stype = 2
+ self.stype = 1
self:FillView()
return self
end
@@ -231,8 +231,8 @@ end
function M:RecursionGetMenberData(fgCtr, index)
fgCtr:FG_GroupMembers12(
self.group_id,
- index * 67,
- 67,
+ index * 166,
+ 166,
self.stype,
self.online,
function(res)
@@ -511,7 +511,6 @@ function M:FillItem(obj, member, refresh, index)
end
self._view:GetChild('tex_id').text = ''
self._view:GetController('search').selectedIndex = 1
-
ViewUtil.CloseModalWait()
table.insert(self.backTable, { 2, text })
self.lst_member_find.numItems = #tempNumberList
@@ -521,23 +520,8 @@ function M:FillItem(obj, member, refresh, index)
function()
ViewUtil.ShowModalWait(nil)
local text = member.uid
- local tempNumberList = self.numberMap[1][text]
- if tempNumberList == nil then
- tempNumberList = {}
- for j = 1, #self.all_member_data do
- local number = self.all_member_data[j]
- if number.parentId == text then
- table.insert(tempNumberList, number)
- end
- end
- self.numberMap[1][text] = tempNumberList
- end
- self._view:GetChild('tex_id').text = ''
- self._view:GetController('search').selectedIndex = 1
-
- ViewUtil.CloseModalWait()
- table.insert(self.backTable, { 1, text })
- self.lst_member_find.numItems = #tempNumberList
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ self:RecursionGetSubNumber(fgCtr, 0, text, {})
end
)
obj:GetController('all').selectedIndex = 0
@@ -559,6 +543,33 @@ function M:FillItem(obj, member, refresh, index)
)
end
+function M:RecursionGetSubNumber(fgCtr, index, uid, tempTable)
+ fgCtr:FG_GroupSubMembers(self.group_id, index * 166, 166, uid,
+ function(res)
+ if res.ReturnCode ~= 0 then
+ ViewUtil.CloseModalWait()
+ ViewUtil.ErrorTip(res.ReturnCod, "获取下级成员失败")
+ return
+ else
+ local munbers = res.Data.members
+ if munbers and #munbers > 0 then
+ for i = 1, #munbers do
+ table.insert(tempTable, munbers[i])
+ end
+ self:RecursionGetSubNumber(fgCtr, index + 1, uid, tempTable)
+ else
+ ViewUtil.CloseModalWait()
+ self.numberMap[1][uid] = tempTable
+ self._view:GetChild('tex_id').text = ''
+ self._view:GetController('search').selectedIndex = 1
+
+ table.insert(self.backTable, { 1, uid })
+ self.lst_member_find.numItems = #tempTable
+ end
+ end
+ end)
+end
+
function M:OnRenderItem(index, obj)
--printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index)
local i = (self.start - 1) * self.pageNum + index + 1
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 d8041546..f728dabf 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
@@ -543,8 +543,8 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers12(
self.group_id,
- index * 10,
- 10,
+ index * 67,
+ 67,
1,
2,
function(res)
@@ -552,14 +552,13 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
else
local numbers = res.Data.members
-
+
if #numbers == 0 then
-
local one = {}
- if #tempTable>0 then
- one = table.remove(tempTable)
+ if #tempTable > 0 then
+ one = table.remove(tempTable)
end
- if one~=nil then
+ if one ~= nil then
self:RecursionGetNumberRecordByLev1(tempTable, one.uid, id)
else
ViewUtil.ShowModalWait("没有下级成员")
@@ -575,7 +574,6 @@ function M:RecursionGetNumberRecordForLev1(index, id, tempTable)
end
end
)
-
end
function M:RecursionGetNumberRecordByLev1(tempTable, id, root_id)
@@ -638,7 +636,7 @@ 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)
+ fgCtr:FG_GetPropLog(self.group_id, index * 67, 67, self.begin_time, self.end_time, function(res)
if res.ReturnCode ~= 0 then
ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败")
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 65a9962a..80ac3255 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -7,38 +7,29 @@
"/"
],
"libview.iconScale": 0,
- "doc.openedDocs": [],
+ "doc.openedDocs": [
+ "ui://2d9xdj6zfn7fao",
+ "ui://m7iejg46kwi0hma",
+ "ui://2d9xdj6zm16m7dqt",
+ "ui://ppu1wv76j4mf9j",
+ "ui://ppu1wv76j4mf9k",
+ "ui://ppu1wv7699wej",
+ "ui://ppu1wv76j4mf9d",
+ "ui://ppu1wv76j4mf9e",
+ "ui://2d9xdj6zoviicm0"
+ ],
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
+ "doc.activeDoc": "ui://m7iejg46kwi0hma",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "s63l0suw",
- "/",
- "ppu1wv76",
- "/",
- "ppu1wv76",
- "/component/",
- "ppu1wv76",
- "/component/Main/",
- "ppu1wv76",
- "/component/clearing/",
- "v6yvqp7w",
- "/",
- "v6yvqp7w",
- "/component/",
- "v6yvqp7w",
- "/component/Main/",
- "v6yvqp7w",
- "/component/Main/component/",
"m7iejg46",
"/",
"m7iejg46",
"/mgr/",
"m7iejg46",
- "/mgr/component/",
- "m7iejg46",
- "/mgr/component/play_set/"
+ "/mgr/component/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
index a75203c4..6476b63d 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml b/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml
index 3aa5cd17..87b50b3f 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml
@@ -5,34 +5,34 @@
-