Commit Graph

2013 Commits

Author SHA1 Message Date
sk 9490fa2cc6 fix statistics 2025-01-02 10:35:15 +08:00
sk 8174c8447d fix statistics 2025-01-02 10:22:58 +08:00
sk 23a7160332 fix statistics 2025-01-02 10:17:35 +08:00
sk c9bae9e147 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 09:59:36 +08:00
sk f85a6014fc add 红包活动 2025-01-02 09:58:43 +08:00
DESKTOP-45ANQ2C\unis 86ac616d2d 编译错误 2025-01-02 09:58:38 +08:00
sk c00b794dc3 add 红包活动 2025-01-02 09:51:44 +08:00
DESKTOP-45ANQ2C\unis c482f45e70 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/welfare/welfare.pb.go
2025-01-02 09:46:41 +08:00
DESKTOP-45ANQ2C\unis a9cb952e52 存钱罐道具奖励显示添加 2025-01-02 09:43:41 +08:00
sk a95c6b6c90 Merge branch 'develop' into sk 2025-01-02 09:22:36 +08:00
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
DESKTOP-45ANQ2C\unis 135f2f99b1 Merge branch 'dev_pigbank2' into develop 2024-12-31 17:16:09 +08:00
DESKTOP-45ANQ2C\unis 163509fa5e Revert "钻石存钱罐的额外奖励显示为金币的额外奖励"
This reverts commit f7f5fe263c.
2024-12-31 17:14:56 +08:00
DESKTOP-45ANQ2C\unis df74995590 钻石存钱罐的额外奖励显示为金币的额外奖励 2024-12-31 17:14:33 +08:00
DESKTOP-45ANQ2C\unis f7f5fe263c 钻石存钱罐的额外奖励显示为金币的额外奖励 2024-12-31 17:12:04 +08:00
sk 3e93085537 no message 2024-12-31 09:42:38 +08:00
sk 44acf8b5e7 fix 背包数据丢失恢复 2024-12-31 09:38:30 +08:00
DESKTOP-45ANQ2C\unis 71622caf8f Merge branch 'dev_pigbank2' into develop 2024-12-30 14:57:19 +08:00
DESKTOP-45ANQ2C\unis f0c215dc4a 存钱罐功能添加后台开关 2024-12-30 14:56:52 +08:00
sk 7066d7c441 fix 比赛配置 2024-12-30 14:02:45 +08:00
sk 2e16b0bd52 fix 比赛配置 2024-12-30 13:55:32 +08:00
sk d3d722c897 no message 2024-12-30 11:53:38 +08:00
sk c5132b2a91 no message 2024-12-30 11:53:16 +08:00
sk 4bccaac006 update gitlab-ci 2024-12-30 11:06:13 +08:00
sk 2209f516c7 modify 十三张选牌时长 2024-12-30 11:05:11 +08:00
sk 309fe3b944 modify 十三张选牌时长 2024-12-30 11:04:37 +08:00
sk adf2dc3c92 modify etcd key 2024-12-30 11:03:43 +08:00
sk b308f93cdf modify 修改十三张选牌时长 2024-12-30 09:36:10 +08:00
sk 341e481cf5 modify 修改十三张选牌时长 2024-12-30 09:33:27 +08:00
sk 855422de68 no message 2024-12-30 09:24:09 +08:00
sk 47be044d4a no message 2024-12-30 09:23:25 +08:00
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