Commit Graph

871 Commits

Author SHA1 Message Date
sk c8df660c82 add rpc监控 2024-12-27 17:36:53 +08:00
sk a3a8c2ef83 add rpc监控 2024-12-27 17:36:22 +08:00
DESKTOP-45ANQ2C\unis 425424c68b Merge branch 'dev_pigbank2' into develop 2024-12-27 17:23:43 +08:00
DESKTOP-45ANQ2C\unis 5b28a10602 存钱罐数据使用后台配置数据 2024-12-27 17:23:28 +08:00
DESKTOP-45ANQ2C\unis f657773a5e Merge branch 'dev_pigbank2' into develop 2024-12-27 15:35:31 +08:00
DESKTOP-45ANQ2C\unis c12514e07d 金币存钱罐领取记录修改 2024-12-27 15:34:36 +08:00
DESKTOP-45ANQ2C\unis 32eb22f956 Merge branch 'dev_pigbank2' into develop 2024-12-27 14:37:10 +08:00
DESKTOP-45ANQ2C\unis 08be09284b 存钱罐道具显示添加 2024-12-27 14:36:51 +08:00
sk 4e08e75510 update excel 2024-12-27 10:35:07 +08:00
DESKTOP-45ANQ2C\unis 60a75f73ff Merge branch 'dev_pigbank2' into develop 2024-12-27 10:19:40 +08:00
DESKTOP-45ANQ2C\unis f1a580bce5 存钱罐取出调试信息 2024-12-27 10:19:31 +08:00
DESKTOP-45ANQ2C\unis 531df8e564 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/server/pbdata.pb.go
2024-12-27 10:05:12 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk 5368460ad3 add 各游戏破产金额 2024-12-26 11:01:17 +08:00
sk 70f8ef26e0 modify 允许游戏中顶号 2024-12-25 09:51:18 +08:00
sk 292a5ea563 解决冲突 2024-12-23 11:29:59 +08:00
sk daa13d58e1 modify 比赛日志 2024-12-23 09:14:49 +08:00
sk bbe6c99209 modify 在线玩家列表 2024-12-21 11:47:30 +08:00
sk e044a590d4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-20 09:21:40 +08:00
sk 39890efbfa add:破产记录添加游戏组id 2024-12-20 09:21:24 +08:00
by 09a609b1b3 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-12-19 18:03:03 +08:00
by e2095d6878 后台补单 2024-12-19 18:02:51 +08:00
sk 08023bcdea fix:游戏分组统计数据 2024-12-19 17:50:49 +08:00
sk 893bc4cbbb modify:房费扣除 2024-12-19 17:23:46 +08:00
by 9b59039d4b 后台补单 2024-12-18 09:31:49 +08:00
by 7d0d5e9509 后台补单log 2024-12-18 09:19:57 +08:00
sk ba1b4ae7c7 fix:空指针异常 2024-12-17 16:28:55 +08:00
sk 905ff11095 fix:邀请对局空指针异常 2024-12-17 16:05:17 +08:00
sk 0c65af22ea add:对局中玩家人数上报 2024-12-17 13:29:50 +08:00
sk 4e59c6600c 道具记录记录gamedif 2024-12-16 17:51:21 +08:00
by 59f772c519 解决冲突 2024-12-16 11:23:00 +08:00
sk bcbc162549 解决冲突 2024-12-16 11:17:11 +08:00
by 4d65851083 后台补单BUG修改 2024-12-16 10:16:55 +08:00
by 8b40eb3c49 后台补单BUG修改 2024-12-16 10:10:45 +08:00
by d791c4d02c 后台补单BUG修改 2024-12-16 10:03:36 +08:00
by db24cf0620 充值增加log 2024-12-13 17:53:13 +08:00
by 7d6ee4c3bd 充值增加log 2024-12-13 17:51:59 +08:00
by 5c64d97728 报错修改 2024-12-13 17:42:45 +08:00
sk 5ca1048b18 Merge branch 'release' into develop 2024-12-13 11:16:09 +08:00
sk 9c3f3ea191 fix:机器人服务房间管理器房间删除 2024-12-13 11:15:43 +08:00
sk bf636de73a fix:机器人离场金币 2024-12-12 09:34:13 +08:00
sk acd3f4f676 机器人添加状态日志 2024-12-11 17:17:23 +08:00
sk 13e03f7428 fix:金币存钱罐跨天重置 2024-12-11 16:10:39 +08:00
sk 53ebe7bbdc 系统赠送记录破产补助 2024-12-10 10:49:10 +08:00
sk b1d365e030 好友申请数据修复 2024-12-02 17:10:19 +08:00
sk 2d43a4153a fix同意好友申请申请记录没有删除 2024-12-02 15:53:42 +08:00
sk 8a9a4f0c2d fix同意好友申请申请记录没有删除 2024-12-02 14:58:23 +08:00
sk 794880b644 添加注释 2024-11-27 16:31:47 +08:00
sk 1d89c089c1 修改日志级别 2024-11-27 13:42:07 +08:00
sk f71ea6ca19 修改日志 2024-11-27 10:04:09 +08:00
sk 9629db34e6 修复玩家缓存释放 2024-11-26 20:19:12 +08:00
sk 5a9325a2ce no message 2024-11-26 14:41:09 +08:00
DESKTOP-45ANQ2C\unis 9b3d0aeb6e 道具合成修改活动日志 2024-11-26 14:40:57 +08:00
sk 343a7a7abb 抽奖活动通知获的抽奖码 2024-11-22 17:02:46 +08:00
DESKTOP-45ANQ2C\unis 72ffbf9da3 Merge branch 'dev_compose' into develop 2024-11-22 10:13:11 +08:00
DESKTOP-45ANQ2C\unis 7b76389509 合成功能 2024-11-22 10:06:28 +08:00
sk 9f6b5469fa 好友进房卡场房卡余额检测 2024-11-21 15:27:58 +08:00
sk 538a920a4d 竞技馆房卡扣除问题 2024-11-21 14:19:19 +08:00
sk 1e2eeebfda 竞技馆房间列表返回房主id 2024-11-21 13:22:45 +08:00
sk c737007e20 修改房卡扣除和招募 2024-11-21 11:38:06 +08:00
sk a9ffcb1c4a 修改竞技馆房间列表排序 2024-11-20 18:31:22 +08:00
sk eb265f69e8 在线人数过滤超管平台 2024-11-20 10:39:40 +08:00
sk 9906c0fb80 no message 2024-11-19 10:36:22 +08:00
sk 0f1f8a03c2 系统房奖品价值缺失 2024-11-15 16:43:37 +08:00
sk b52f84d182 statistics 2024-11-15 15:21:01 +08:00
sk b497bd103a 玩家缓存释放问题 2024-11-15 11:18:28 +08:00
sk d0072d40b4 抽奖活动房卡消耗统计问题 2024-11-14 17:39:35 +08:00
sk dfe093b03e no message 2024-11-14 15:23:40 +08:00
sk f989492019 tienlen房卡场不能中途离开 2024-11-14 15:07:51 +08:00
sk 1db15bd6f3 no message 2024-11-14 11:54:38 +08:00
sk d3f276f0bf 兑换优化 2024-11-14 11:13:47 +08:00
sk 0585fe236d 修复登出时间错误 2024-11-17 15:20:35 +08:00
sk 28b6cb6a85 抽奖活动机器人发奖调整 2024-11-13 11:17:07 +08:00
sk f0e18b16d0 删除测试代码 2024-11-13 09:22:01 +08:00
sk 3cc2aa1ac6 隐藏关闭的竞技馆房间 2024-11-12 18:03:39 +08:00
sk 1acfab2ac7 修复jwt超时设置 2024-11-12 16:47:37 +08:00
sk 3eb997c7c3 隐藏关闭的竞技馆配置房间 2024-11-12 16:13:13 +08:00
sk 310156dd35 兑换商城地址 2024-11-12 15:56:27 +08:00
sk 90e11a0dad 兑换商城地址 2024-11-12 15:08:16 +08:00
sk d1afed32c2 缓存优化 2024-11-12 10:51:04 +08:00
sk 8aaf1b40f3 rename 2024-11-11 11:44:20 +08:00
sk 71f6b0246b 竞技馆引导 2024-11-11 11:37:32 +08:00
sk a9d67662b3 gamedata空指针 2024-11-09 14:09:39 +08:00
sk 752ef5d6e0 no message 2024-11-08 14:50:21 +08:00
sk 970db216f4 兑换问题 2024-11-08 14:25:53 +08:00
sk 94ad9f9835 网页登录 2024-11-08 11:51:23 +08:00
sk c3ff0dc8ef 关闭等级排行榜 2024-11-08 10:40:36 +08:00
sk 45e1fd8a80 网页兑换 2024-11-07 17:48:22 +08:00
by af0e29fc1a 金币存钱罐 2024-11-06 09:23:51 +08:00
sk 8444db2e85 修改房间推荐算法每次推荐不同房间 2024-11-05 17:08:39 +08:00
sk 0176f59e76 删除测试代码 2024-11-05 16:42:08 +08:00
sk 904f30ee8c 招募房间推荐规则修改 2024-11-05 15:21:57 +08:00
sk 9e85b4a1a7 新手引导测试代码 2024-11-05 14:48:59 +08:00
sk 5fdd7fe91d 修复登录异常 2024-11-05 10:17:42 +08:00
sk 23ea951eb0 使用go module 2024-11-04 14:02:22 +08:00
sk 7d9477b53c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-04 10:28:18 +08:00
sk 4de80e3e74 修复新手引导 2024-11-04 10:25:52 +08:00
by 778de206ca 引導增加url 2024-11-04 09:38:25 +08:00
sk e77714fded 登录返回玩家id 2024-11-04 09:14:11 +08:00
sk 53c94f47fc 游戏中不允许接口扣道具 2024-11-01 18:03:11 +08:00
sk e9583d2886 网页登录接口 2024-11-01 17:50:04 +08:00
sk bd531df9a3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-01 15:25:34 +08:00
sk 0cc4009858 引导奖励统计系统赠送 2024-11-01 15:25:27 +08:00
by 7066908dfd 引导修改 2024-11-01 15:15:51 +08:00
sk fd2e1b3cad Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-01 14:47:22 +08:00
sk 848d7485a7 竞技馆招募功能 2024-11-01 14:44:17 +08:00
by 7ec2df8381 引导修改 2024-11-01 14:43:44 +08:00
by 6f6926dd9f 引导修改 2024-11-01 14:39:54 +08:00
by 01bc6bfd63 引导修改 2024-11-01 14:29:07 +08:00
by cbfb53a8f1 引导修改 2024-11-01 14:26:41 +08:00
by c724b12182 引导修改 2024-11-01 14:24:33 +08:00
by 0688dc550a 引导修改 2024-11-01 14:15:47 +08:00
by cdc51a2eba 引导功能实现 2024-11-01 13:59:06 +08:00
sk a279eaad4c 修复连续充值中断功能 2024-11-08 00:02:39 +08:00
sk 4082fc11f2 抽奖活动开奖剩余时间 2024-10-31 11:10:15 +08:00
sk 5747ad0380 抽奖活动开奖剩余时间 2024-10-31 09:12:09 +08:00
sk 3e02f7ba03 抽奖活动日志 2024-10-30 16:22:37 +08:00
sk 505b0f01ef 抽奖活动日志 2024-10-30 16:16:58 +08:00
sk 995a9e010a 官方房间标记 2024-10-30 11:38:05 +08:00
sk fc16304b20 官方房间标记 2024-10-30 11:14:30 +08:00
sk d5fcc0acfd 官方房间标记 2024-10-30 10:27:05 +08:00
sk 825c1ca667 抽奖活动上期中奖信息 2024-10-30 09:43:41 +08:00
sk 13040896b9 防止重复发奖 2024-10-29 14:14:59 +08:00
sk 5944345434 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-29 16:45:03 +08:00
by 294e9e6326 周卡购买记录修改 2024-10-29 16:35:25 +08:00
sk 75b178ba3c 竞技馆抽奖活动 2024-10-29 16:34:43 +08:00
sk f87ab997aa 邀请好友进房失败信息 2024-10-29 13:23:57 +08:00
sk ca8a8dfb7e 修复竞技馆抽奖必中玩家昵称错误 2024-10-29 11:17:50 +08:00
sk cc8df988bd 请求好友进房卡场 2024-10-29 11:03:28 +08:00
sk 27c4fc5bf9 竞技馆添加赢家信息 2024-10-29 10:44:17 +08:00
sk 11ce50e0df 邀请好友进房卡房返回需要房卡数量 2024-10-29 10:24:05 +08:00
sk d8a6246f93 竞技馆中奖广播 2024-10-29 10:11:33 +08:00
sk 0a67496d50 防止重复抽奖 2024-10-29 09:07:15 +08:00
sk 258fd69a9e 抽奖内定期数问题 2024-10-26 17:22:23 +08:00
sk 342d2fde1f 修复抽奖奖励邮件 2024-10-26 10:31:53 +08:00
sk 7e80a3d37b 隐藏未开奖的中奖信息 2024-10-25 17:20:28 +08:00
sk 721ff30fb8 抽奖活动中奖广播 2024-10-25 16:17:13 +08:00
sk 1e186dba66 抽奖活动随机开奖码 2024-10-25 13:47:50 +08:00
sk 9f511e35eb 抽奖活动中奖历史记录玩家头像 2024-10-25 10:47:44 +08:00
sk 3bfd8f30df 抽奖活动跨天重置 2024-10-25 10:35:53 +08:00
sk 9cc386b25f 抽奖活动跨天重置 2024-10-26 00:17:46 +08:00
sk 6b51e16c77 no message 2024-10-24 16:46:28 +08:00
sk dd7663b3c9 竞技馆抽奖活动 2024-10-24 14:16:05 +08:00
sk 6693bf7438 no message 2024-10-24 10:24:47 +08:00
sk 900a54d64d 修复竞技馆抽奖活动问题 2024-10-24 11:59:46 +08:00
sk 7e52629091 竞技馆抽奖活动图片视频资源设置 2024-10-23 18:04:14 +08:00
sk 8fff399bd9 竞技馆抽奖活动必中玩家开奖 2024-10-23 11:50:53 +08:00
sk 1171f06cfe 竞技馆抽奖活动必中玩家开奖 2024-10-23 11:41:33 +08:00
sk c8a39f2d1f 解决冲突 2024-10-23 10:56:07 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
by 046461d4ac 开启礼盒 2024-10-21 10:52:17 +08:00
by c6a6d9b08f log类型修改 2024-10-21 09:48:14 +08:00
by e476a7e74b 后台活动记录 2024-10-18 13:32:26 +08:00
by 8d9ef2a928 创建订单增加购买类型 2024-10-18 10:33:31 +08:00
sk c7cdb49a7b 修复游戏服同步道具问题 2024-10-17 17:07:41 +08:00
sk eff3cad970 竞技馆抽奖活动协议 2024-10-17 13:05:36 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk 5979797c01 no message 2024-10-15 17:02:19 +08:00
sk 4947685627 no message 2024-10-15 16:22:39 +08:00
sk db3f7bee67 添加调控开关 2024-10-15 16:15:04 +08:00
by 8ee0093ccf 后台弹窗配置 2024-10-15 14:18:16 +08:00
sk fd064ddb00 修复聊天 2024-10-15 10:00:39 +08:00
sk fc05bd3ee5 系统赠送统计重复 2024-10-15 08:57:04 +08:00
sk db8506f8b7 百人场房间删除 2024-10-14 17:44:05 +08:00
sk d1e380d9bb 客户端升级奖励记录系统赠送 2024-10-14 13:09:51 +08:00
sk 548681d435 客户端升级奖励 2024-10-12 17:02:39 +08:00
sk 98289116a3 抽奖活动协议 2024-10-12 13:33:40 +08:00
sk 9a376b06c0 客户端升级统计 2024-10-11 10:57:29 +08:00
sk e5378e46f9 首冲加赠是否翻倍 2024-10-10 17:50:19 +08:00
sk e32cd1a6bd 删除测试代码 2024-10-10 17:02:21 +08:00
sk f0f2831ba0 比赛场优化 2024-10-10 18:03:42 +08:00
sk 4c4af75a76 客户端升级奖励 2024-10-10 15:27:21 +08:00
sk e38523c745 no message 2024-10-09 17:51:38 +08:00
sk 948f90be29 客户端版本校验 2024-10-09 17:11:26 +08:00
sk 28982e018c 存钱罐空指针异常 2024-10-09 12:01:01 +08:00
sk d09d4a4284 大厅道具变更同步到游戏 2024-10-09 09:18:09 +08:00
sk d5332ddb34 no message 2024-10-08 16:05:47 +08:00
sk 7ac2bf59bd 道具变更记录 2024-10-08 15:39:12 +08:00
sk 1f8f7b0f22 赛季积分重置修复 2024-10-08 14:51:45 +08:00
sk ae3e9d8fd6 rabbitmq优化 2024-10-08 11:07:56 +08:00
sk a38f8fa366 rabbitmq优化 2024-09-29 17:01:36 +08:00
sk c628f8876f 比赛场优化 2024-09-29 13:52:25 +08:00
sk 622d622194 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-29 11:22:12 +08:00
sk e8c4f4489f no message 2024-09-29 10:16:57 +08:00
sk 025dbd8691 Merge branch 'release' into develop 2024-09-29 09:55:49 +08:00
sk bcdcc1cc47 修复比赛场id重复问题 2024-09-29 09:55:34 +08:00
sk f6804c4cd9 比赛场获奖记录 2024-09-28 15:36:31 +08:00
by f642c32631 删除无用log 2024-09-28 14:32:54 +08:00
by b5099d9c37 兑换记录BUG修改 2024-09-28 12:02:57 +08:00
sk 6f700f9ef6 no message 2024-09-28 10:03:29 +08:00
sk fd14654c59 竞技馆和比赛场关闭斗鸡技能效果 2024-09-27 18:02:00 +08:00
sk 81417088fd Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 15:34:02 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
DESKTOP-45ANQ2C\unis 74c36f4083 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:30:58 +08:00
DESKTOP-45ANQ2C\unis 6ac5d365d5 娃娃卡兑换积分记录修改 2024-09-27 14:30:52 +08:00
sk fcdb12669c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:09:35 +08:00
sk 3519bedc03 no message 2024-09-27 14:08:49 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
DESKTOP-45ANQ2C\unis 6ac1a91320 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 09:33:33 +08:00
DESKTOP-45ANQ2C\unis 41a7fcfe92 娃娃卡添加兑换积分记录 2024-09-27 09:33:26 +08:00