Commit Graph

727 Commits

Author SHA1 Message Date
sk d5cedb814e Merge branch 'develop' into sk 2025-01-02 09:21:55 +08:00
sk 7f6b4a86ae add 红包活动 2025-01-02 09:21:40 +08:00
sk 2e16b0bd52 fix 比赛配置 2024-12-30 13:55:32 +08:00
sk adf2dc3c92 modify etcd key 2024-12-30 11:03:43 +08:00
sk ef964f7ec7 no message 2024-12-27 18:00:27 +08:00
sk a6b93bceb5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-27 17:37:45 +08:00
sk 500527f45e Merge branch 'dev_rpc' into develop 2024-12-27 17:37:15 +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