Commit Graph

2056 Commits

Author SHA1 Message Date
sk a14750dfb8 update excel 2025-01-04 09:44:38 +08:00
by 044cf9f863 年兽排行榜 2025-01-03 16:57:40 +08:00
sk 5db3c767e4 fix 红包活动 2025-01-03 15:50:06 +08:00
sk 2bcbfaec2f fix 红包活动 2025-01-03 15:02:33 +08:00
sk 2aff7b19fb Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-03 14:13:42 +08:00
sk e6baf7ef86 fix 红包活动 2025-01-03 14:12:23 +08:00
by 79abb14bd3 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2025-01-03 14:09:48 +08:00
by 8a0502302f 年兽排行榜 2025-01-03 14:09:43 +08:00
sk 03ac53b7e8 fix 数据修复 2025-01-03 13:56:50 +08:00
sk d671697496 add 添加日志 2025-01-03 13:39:25 +08:00
sk c1f33de1d5 add 添加日志 2025-01-03 11:45:45 +08:00
sk d47ee74e2c modify 删除红包测试代码 2025-01-03 10:46:05 +08:00
sk 756f52dd63 modify 红包活动 2025-01-03 09:31:34 +08:00
sk cd1b4978de fix go mod 2025-01-03 08:43:19 +08:00
sk 3ee3f677ce 解决冲突 2025-01-02 18:10:35 +08:00
sk d63043d3fc 解决冲突 2025-01-02 18:04:24 +08:00
sk 231cff3c4a add 累计消耗活动 2025-01-02 17:57:47 +08:00
by 8c9b279196 年兽任务 2025-01-02 16:59:59 +08:00
by 90fb71b3dc Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2025-01-02 16:47:13 +08:00
by 71c9b583af 更新配置表 2025-01-02 16:47:01 +08:00
sk 521b6e935e fix 红包活动 2025-01-02 16:46:23 +08:00
sk e72e3176a1 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 16:41:37 +08:00
by 20f511a840 年兽活动 2025-01-02 16:41:00 +08:00
sk 53889d6a80 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 16:40:23 +08:00
sk f845409979 add 红包活动 2025-01-02 16:39:56 +08:00
by 94e1effc63 年兽活动 2025-01-02 16:39:25 +08:00
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