Commit Graph

1981 Commits

Author SHA1 Message Date
sk e0629e3419 no message 2024-12-27 18:01:11 +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 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 726cdddbd0 update ci 2024-12-27 11:09:35 +08:00
sk d8bee4bd73 update excel 2024-12-27 11:03:39 +08:00
sk 1d0ce09952 update ci 2024-12-27 11:00:54 +08:00
skeleton 12e93f9750 更新.gitlab-ci.yml文件 2024-12-27 02:56:26 +00:00
skeleton 54c4e2f945 更新.gitlab-ci.yml文件 2024-12-27 02:53:39 +00:00
skeleton 70dd053179 更新.gitlab-ci.yml文件 2024-12-27 02:52:38 +00:00
sk 4e08e75510 update excel 2024-12-27 10:35:07 +08:00
sk f2163d29ac 解决冲突 2024-12-27 10:32:31 +08:00
sk 6647aa920b modify gitlab-ci 2024-12-27 10:31:48 +08:00
skeleton 91e5b732c1 更新.gitlab-ci.yml文件 2024-12-27 02:30:18 +00:00
DESKTOP-45ANQ2C\unis f3b7211913 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-27 10:19:57 +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
skeleton a5bed973a5 更新.gitlab-ci.yml文件 2024-12-27 02:18:47 +00:00
skeleton 6a0e1e5e90 更新.gitlab-ci.yml文件 2024-12-27 02:16:40 +00:00
skeleton b3a166c022 更新.gitlab-ci.yml文件 2024-12-27 02:14:57 +00: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 caee9f1aff Merge branch 'release' into develop 2024-12-27 09:01:42 +08:00
skeleton a430cc0421 更新.gitlab-ci.yml文件 2024-12-26 10:10:52 +00:00
skeleton ae3622c587 更新.gitlab-ci.yml文件 2024-12-26 10:06:27 +00:00
sk 5368460ad3 add 各游戏破产金额 2024-12-26 11:01:17 +08:00
sk 0cc66a8b28 statistics文件下载 2024-12-26 08:26:00 +08:00
sk 82887c39c1 update excel 2024-12-26 08:25:12 +08:00
sk 6d1fe0c89b add 数据统计到mysql 2024-12-25 13:57:19 +08:00
sk 70f8ef26e0 modify 允许游戏中顶号 2024-12-25 09:51:18 +08:00
sk fe3f0a185d fix tienlen过牌 2024-12-25 09:27:41 +08:00
tomas defdc4b829 up pe rabbit 2024-12-24 17:14:48 +08:00
sk 6804bf6641 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-24 17:12:35 +08:00
sk 51767e9c6a no message 2024-12-24 10:47:36 +08:00
tomas f15ce4ef8f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-12-23 13:23:41 +08:00
tomas 4b8093d09e Merge remote-tracking branch 'origin/develop' into dev_slots 2024-12-23 13:22:33 +08:00
tomas 9ef70ecc23 up pe rabbit 2024-12-23 13:12:58 +08:00
sk 292a5ea563 解决冲突 2024-12-23 11:29:59 +08:00
sk cb6ab1f686 modify tienlen代码优化 2024-12-23 11:26:47 +08:00
sk daa13d58e1 modify 比赛日志 2024-12-23 09:14:49 +08:00
sk 68f51d0c5d add 拉霸游戏时长 2024-12-21 16:45:25 +08:00
sk 142b2f0ba5 no message 2024-12-21 15:21:26 +08:00