Commit Graph

2030 Commits

Author SHA1 Message Date
by 043f8d69ea 年兽活动 2025-01-02 16:38:43 +08:00
by a535261752 年兽活动 排行榜奖励配置 2025-01-02 16:35:38 +08:00
by 36708d2af6 年兽活动 排行榜奖励配置 2025-01-02 16:35:17 +08:00
by 8a320c1cf4 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2025-01-02 16:14:26 +08:00
by e4b85bf503 年兽兑换 2025-01-02 16:14:21 +08:00
sk 61d589df26 解决冲突 2025-01-02 15:19:29 +08:00
sk 2b8ef577f5 add 红包活动 2025-01-02 15:12:25 +08:00
by 799b7464ef 年兽修改 2025-01-02 13:42:01 +08:00
sk 7876fa34f9 add 红包活动测试代码 2025-01-02 11:47:25 +08:00
by d1c2e2437c 配置文件 2025-01-02 11:31:01 +08:00
sk b88ccb664d fix statistics 2025-01-02 11:30:09 +08:00
by 79e05883db Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	common/constant.go
#	etcd/keyconf.go
#	model/config.go
#	model/player.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
#	worldsrv/welfmgr.go
2025-01-02 11:29:47 +08:00
by 9fd80b867d 年兽活动 2025-01-02 11:18:58 +08:00
DESKTOP-45ANQ2C\unis a2acd36596 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	worldsrv/welfmgr.go
2025-01-02 11:14:46 +08:00
DESKTOP-45ANQ2C\unis 4c8273031b 存钱罐领取钻石显示修改 2025-01-02 11:10:47 +08:00
sk e97e531623 fix statistics 2025-01-02 10:45:05 +08:00
sk 280de58880 Merge branch 'sk' into develop 2025-01-02 10:42:25 +08:00
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