From f2fafa2cddeff03662f0b960687fe527d3bbd4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 20 May 2025 13:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=91=E9=80=81=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E6=88=98=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 12 + lua_probject/base_project/Game/Protocol.lua | 423 +++++++++--------- .../Game/View/Family/FamilyNumberRecord.lua | 143 ++++-- .../base_project/Game/View/FamilyView.lua | 60 +-- .../ART/base/Family/ui/Family_fui.bytes | Bin 55290 -> 55265 bytes 5 files changed, 363 insertions(+), 275 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index c011c224..060b1c6b 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -929,6 +929,18 @@ function M:FG_GetGroupRecord(group_id, platform, qid, limit, num, callback) end) end +---@param militarys table 战绩id列表 +---@param is_read number 0是将选中战绩设置为未读，1是将选中战绩选择为已读 +function M:FG_SetGroupRecordReadStatus(militarys, is_read, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.militarys = militarys + data.is_read = is_read + _client:send(Protocol.WEB_FG_SET_RECORD_READ, 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) diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 8349bbdb..1c416cf1 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/verifyVerificationCode", - -- ID密码 - WEB_ID_PASSWORD_LOGIN = "acc/id_login", + WEB_PHONE_LOGIN = "acc/verifyVerificationCode", + -- ID密码 + WEB_ID_PASSWORD_LOGIN = "acc/id_login", -- 获取手机验证码 - WEB_GET_VERIFCATION_CODE="acc/sendVerificationCode", + WEB_GET_VERIFCATION_CODE = "acc/sendVerificationCode", --绑定手机号码 - 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_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_SET_RECORD_READ = "group/log/read_records", -- 获取合伙人统计 - 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/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 3cd9b273..73dc3c64 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -1,4 +1,6 @@ -local FamilyNumberRecord = {} +local FamilyNumberRecord = { + military = { size = 0, list = {} } +} local M = FamilyNumberRecord @@ -17,11 +19,16 @@ function FamilyNumberRecord.New(root) -- end self.familyType.selectedIndex = 5 + local fgCtr = ControllerManager.GetController(NewGroupController) local comp_gameTypeList = self._view:GetChild('comp_gameTypeList'):GetChild('n0') + local input_IDSerach = self._view:GetChild('input_numberID') local ctr_numberRecordRank = self._view:GetController('numberRecordRank') + local text_recordGameType = self._view:GetChild('text_recordGameType') + local text_recordSortType = self._view:GetChild('text_recordSortType') - self._input_IDSerach = self._view:GetChild('input_numberID') - self._viewList_numberRank = self._view:GetChild('comp_numberRecordByGameType'):GetChild('n3') + + self._viewList_numberRankRead = self._view:GetChild('comp_numberRecordByGameTypelooked'):GetChild('n3') + self._viewList_numberRankUnRead = self._view:GetChild('comp_numberRecordByGameType'):GetChild('n3') self._viewList_numverRecord = self._view:GetChild('list_numverRecord') self._viewlist_numberRecordDetail = self._view:GetChild('list_numberRecordDetail') self._viewText_titleRecord = self._view:GetChild('text_titleRecord') @@ -39,9 +46,12 @@ function FamilyNumberRecord.New(root) self:NumverRankRenderer(self._group.id) self:GameTypeListRenderer(comp_gameTypeList) self:NumberRecordDetailRender() + comp_gameTypeList.onClickItem:Set(function(context) + input_IDSerach.text = "" self:OnClickSortType(self._group.id, context.data.data.id) ctr_numberRecordRank.selectedIndex = 0 + text_recordGameType.text = context.data.title end) self.btn_close.onClick:Set(function() if self.ctr_numberRecord.selectedIndex > 0 then @@ -64,10 +74,21 @@ function FamilyNumberRecord.New(root) end end) self._view:GetChild('btn_clearInput').onClick:Set(function() - self._input_IDSerach.text = "" + input_IDSerach.text = "" end) self._view:GetChild('btn_searchRecord').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + local tempRank = {} + for i = 1, #self.rank do + if self.rank[i].uid == tonumber(input_IDSerach.text) then + table.insert(tempRank, self.rank[i]) + end + end + if #tempRank == 0 then + ViewUtil.ShowOneChooose("没有该玩家排行榜") + else + self.showRank = tempRank + self._viewList_numverRecord.numItems = #self.showRank + end end) self._view:GetChild('btn_changeMJScore').onClick:Set(function() ViewUtil.ShowOneChooose("该功能还未开放") @@ -77,20 +98,32 @@ function FamilyNumberRecord.New(root) ViewUtil.ShowOneChooose("该功能还未开放") end) self._view:GetChild('btn_allChoose').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + self._flag_allChoose = self.records[self.gameTypeNum][self.readStatusNum].childNum + self._viewlist_numberRecordDetail:RefreshVirtualList() end) self._view:GetChild('btn_allChooseRead').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + fgCtr:FG_SetGroupRecordReadStatus(self.military.list, 2 - self.readStatusNum, function(res) + pt(res) + if res.ReturnCode ~= 0 then + ViewUtil.ShowOneChooose("获取排行榜失败" .. res.ReturnCode) + else + + end + end) end) self._view:GetChild('btn_allChooseReverse').onClick:Set(function() - ViewUtil.ShowOneChooose("该功能还未开放") + self._flag_allChooseReverse = self.records[self.gameTypeNum][self.readStatusNum].childNum + self._viewlist_numberRecordDetail:RefreshVirtualList() end) self._view:GetChild('comp_sortTypeList'):GetChild('n0').onClickItem:Set(function(context) - self:OnClickSortType(context) + input_IDSerach.text = "" + local sortType = tonumber(context.data.text) + self:OnClickSortType(self._group.id, 0, sortType) ctr_numberRecordRank.selectedIndex = 0 + text_recordSortType.text = sortType == 1 and "正数榜" or "负数榜" end) - + self:OnClickSortType(self._group.id) return self end @@ -121,10 +154,10 @@ end function M:NumverRecordRenderer() self:ResetRecords() - local numberRankList = self._viewList_numberRank - numberRankList:SetVirtual() - numberRankList.itemRenderer = function(index, obj) - local info = self.records[index + 1] + local numberRankListRead = self._viewList_numberRankRead + numberRankListRead:SetVirtual() + numberRankListRead.itemRenderer = function(index, obj) + local info = self.records[index + 1][2] obj:GetChild('text_gameType').text = index == 0 and "麻将" or "扑克" obj:GetChild('text_round').text = info.childNum obj:GetChild('text_score').text = info.totalScore @@ -133,17 +166,35 @@ function M:NumverRecordRenderer() self._flag_unReadDetail = true self.ctr_numberRecord.selectedIndex = 2 self.gameTypeNum = index + 1 + self.readStatusNum = 2 self._viewlist_numberRecordDetail.numItems = info.childNum end) end - numberRankList.numItems = 2 + numberRankListRead.numItems = 2 + local numberRankListUnRead = self._viewList_numberRankUnRead + numberRankListUnRead:SetVirtual() + numberRankListUnRead.itemRenderer = function(index, obj) + local info = self.records[index + 1][1] + obj:GetChild('text_gameType').text = index == 0 and "麻将" or "扑克" + obj:GetChild('text_round').text = info.childNum + obj:GetChild('text_score').text = info.totalScore + obj:GetChild('text_winNum').text = info.winNum + obj:GetChild('btn_lookRecord').onClick:Set(function() + self._flag_unReadDetail = true + self.ctr_numberRecord.selectedIndex = 2 + self.gameTypeNum = index + 1 + self.readStatusNum = 1 + self._viewlist_numberRecordDetail.numItems = info.childNum + end) + end + numberRankListUnRead.numItems = 2 end function M:NumberRecordDetailRender() local list_numberRecordDetail = self._viewlist_numberRecordDetail list_numberRecordDetail:SetVirtual() list_numberRecordDetail.itemRenderer = function(index, obj) - local info = self.records[self.gameTypeNum][index + 1] + local info = self.records[self.gameTypeNum][self.readStatusNum][index + 1] obj:GetChild('text_gameName').text = info.game_info.name obj:GetChild('text_time').text = os.date('%Y-%m-%d\n%H:%M', info.create_time) obj:GetChild('text_roomID').text = info.room_id @@ -151,6 +202,30 @@ function M:NumberRecordDetailRender() obj:GetChild('btn_lookRecord').onClick:Set(function() print("lingmeng查看") end) + obj:GetController('seleted').onChanged:Set(function(context) + pt(getmetatable(context.sender)) + if context.sender.selectedIndex == 1 then + if not self.military[info.military_id] then + self.military.size = self.military.size + 1 + self.military[info.military_id] = self.military.size + table.insert(self.military.list, info.military_id) + end + else + if self.military[info.military_id] then + self.military.size = self.military.size - 1 + table.remove(self.military.list, self.military[info.military_id]) + self.military[info.military_id] = nil + end + end + end) + if self._flag_allChoose and self._flag_allChoose > 0 then + obj:GetController('seleted').selectedIndex = 1 + self._flag_allChoose = self._flag_allChoose - 1 + end + if self._flag_allChooseReverse and self._flag_allChooseReverse > 0 then + obj:GetController('seleted').selectedIndex = 1 - obj:GetController('seleted').selectedIndex + self._flag_allChooseReverse = self._flag_allChooseReverse - 1 + end local resultDetailList = obj:GetChild('list') resultDetailList:SetVirtual() resultDetailList.itemRenderer = function(index, obj) @@ -168,7 +243,7 @@ function M:NumverRankRenderer(groupId) local numberRecordList = self._viewList_numverRecord numberRecordList:SetVirtual() numberRecordList.itemRenderer = function(index, obj) - local info = self.rank[index + 1] + local info = self.showRank[index + 1] ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject) obj:GetChild('text_ID').text = info.uid obj:GetChild('text_nick').text = info.nick @@ -183,17 +258,18 @@ function M:NumverRankRenderer(groupId) end end -function M:OnClickSortType(groupId, pid) +function M:OnClickSortType(groupId, pid, sortType) print("lingmengOnClickSortType") local fgCtr = ControllerManager.GetController(NewGroupController) local numberRecordList = self._viewList_numverRecord - fgCtr:FG_GetMemberRank(groupId, 0, 0, 10, os.time() - 3600 * 120, os.time(), 1, function(res) + fgCtr:FG_GetMemberRank(groupId, 0, 0, 10, os.time() - 3600 * 120, os.time(), sortType, function(res) pt(res) if res.ReturnCode ~= 0 then ViewUtil.ShowOneChooose("获取排行榜失败" .. res.ReturnCode) else self.rank = res.Data.ranks - numberRecordList.numItems = #self.rank + self.showRank = self.rank + numberRecordList.numItems = #self.showRank end end) end @@ -201,7 +277,8 @@ end function M:OnClickNumberRank(groupId, uid, round) print("lingmengOnClickNumberRank") local fgCtr = ControllerManager.GetController(NewGroupController) - local numberRankList = self._viewList_numberRank + local numberRankListRead = self._viewList_numberRankRead + local numberRankListUnRead = self._viewList_numberRankUnRead fgCtr:FG_GetGroupRecordSpe(groupId, GetPlatform(), uid, 0, 0, round, os.time() - 3600 * 120, os.time(), 3, function(res) pt(res) @@ -213,22 +290,23 @@ function M:OnClickNumberRank(groupId, uid, round) self:ResetRecords() for i = 1, #records do local info = records[i] - local tempTableChild = self.records[info.game_info.gameType] + local tempTableChild = self.records[info.game_info.gameType][tonumber(info.is_read) + 1] info.totalScore = json.decode(info.totalScore) - if info.round ~= 1 or info.totalScore.score ~= 0 then - table.insert(tempTableChild, info) - local totalScore - for i = 1, 2 do - if info.totalScore[i].accId == uid then - totalScore = info.totalScore[i].score - end + local totalScore + for i = 1, 2 do + if info.totalScore[i].accId == uid then + totalScore = info.totalScore[i].score end + end + if info.round ~= "1" or totalScore ~= 0 then + table.insert(tempTableChild, info) tempTableChild.totalScore = tempTableChild.totalScore + totalScore tempTableChild.childNum = tempTableChild.childNum + 1 tempTableChild.winNum = tempTableChild.winNum + (totalScore > 0 and 1 or 0) end end - numberRankList:RefreshVirtualList() + numberRankListRead:RefreshVirtualList() + numberRankListUnRead:RefreshVirtualList() end end) end @@ -236,10 +314,7 @@ end function M:ResetRecords() self.records = {} for i = 1, 2 do - self.records[i] = {} - self.records[i].totalScore = 0 - self.records[i].childNum = 0 - self.records[i].winNum = 0 + self.records[i] = { { totalScore = 0, childNum = 0, winNum = 0 }, { totalScore = 0, childNum = 0, winNum = 0 } } end end diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index f38d8b44..108f7444 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -382,36 +382,36 @@ end function M:OnUpdate() -- --12001事件 - if self._group.update_room then - local fgCtr = ControllerManager.GetController(NewGroupController) - if self._roomNum == self._group.room_num then - for i = 1, self._group.room_num do - if self._group.rooms[i] and #self._group.rooms[i].plist == 0 then - self._group.update_room = false - fgCtr:FG_RemoveRoom( - self._group.id, - self._group.rooms[i].id, - function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败！', self._group.rooms[i].id)) - else - self._roomNum = #self._group.rooms - end - end - ) - end - end - else - self._group.update_room = false - -- self._group.update_room = false - end - if self._fristRoom then - self._group.update_room = false - self._fristRoom = true - end - -- print("====================================UpdateFamilyRoom", fgCtr, self._group.id) - self:UpdateFamilyRoom(fgCtr, self._group.id) - end + -- if self._group.update_room then + -- local fgCtr = ControllerManager.GetController(NewGroupController) + -- if self._roomNum == self._group.room_num then + -- for i = 1, self._group.room_num do + -- if self._group.rooms[i] and #self._group.rooms[i].plist == 0 then + -- self._group.update_room = false + -- fgCtr:FG_RemoveRoom( + -- self._group.id, + -- self._group.rooms[i].id, + -- function(res) + -- if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, string.format('删除房间-%s失败！', self._group.rooms[i].id)) + -- else + -- self._roomNum = #self._group.rooms + -- end + -- end + -- ) + -- end + -- end + -- else + -- self._group.update_room = false + -- -- self._group.update_room = false + -- end + -- if self._fristRoom then + -- self._group.update_room = false + -- self._fristRoom = true + -- end + -- -- print("====================================UpdateFamilyRoom", fgCtr, self._group.id) + -- self:UpdateFamilyRoom(fgCtr, self._group.id) + -- end end local IDENTITY_LIST = { diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 0ac152886f97bc1da8df5611abee53576b2c8e3e..25f8ac761050bf4299ba90185dd284b7032aa64b 100644 GIT binary patch delta 46 zcmV+}0MY;YuLI$)1F*io2LUkv17UMxlfTjy1U3KxFthK!D-#3et)r72(^LTlvwPEj E1j2F>zW@LL delta 64 zcmaF3p83~$<_-Jyb8$XfyZG7E4bPU%nS5ZsEEngCE%PDV&G+|f3o`?`lX)+PaPdFc SHRZ{URZrJW-<)*0o&^B13nY>N