Commit Graph

94 Commits

Author SHA1 Message Date
sk 03ac53b7e8 fix 数据修复 2025-01-03 13:56:50 +08:00
sk d63043d3fc 解决冲突 2025-01-02 18:04:24 +08:00
sk 231cff3c4a add 累计消耗活动 2025-01-02 17:57:47 +08:00
sk 521b6e935e fix 红包活动 2025-01-02 16:46:23 +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 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
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 c9bae9e147 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 09:59:36 +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 7f6b4a86ae add 红包活动 2025-01-02 09:21:40 +08:00
DESKTOP-45ANQ2C\unis df74995590 钻石存钱罐的额外奖励显示为金币的额外奖励 2024-12-31 17:14:33 +08:00
DESKTOP-45ANQ2C\unis f0c215dc4a 存钱罐功能添加后台开关 2024-12-30 14:56:52 +08:00
DESKTOP-45ANQ2C\unis 5b28a10602 存钱罐数据使用后台配置数据 2024-12-27 17:23:28 +08:00
DESKTOP-45ANQ2C\unis c12514e07d 金币存钱罐领取记录修改 2024-12-27 15:34:36 +08:00
DESKTOP-45ANQ2C\unis 08be09284b 存钱罐道具显示添加 2024-12-27 14:36:51 +08:00
DESKTOP-45ANQ2C\unis f1a580bce5 存钱罐取出调试信息 2024-12-27 10:19:31 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk acd3f4f676 机器人添加状态日志 2024-12-11 17:17:23 +08:00
sk 53ebe7bbdc 系统赠送记录破产补助 2024-12-10 10:49:10 +08:00
by af0e29fc1a 金币存钱罐 2024-11-06 09:23:51 +08:00
sk a279eaad4c 修复连续充值中断功能 2024-11-08 00:02:39 +08:00
sk 4082fc11f2 抽奖活动开奖剩余时间 2024-10-31 11:10:15 +08:00
by e476a7e74b 后台活动记录 2024-10-18 13:32:26 +08:00
sk 28982e018c 存钱罐空指针异常 2024-10-09 12:01:01 +08:00
sk ae3e9d8fd6 rabbitmq优化 2024-10-08 11:07:56 +08:00
sk f28377dd05 no message 2024-09-25 18:27:55 +08:00
sk 72b8f927b0 登录后根据道具记录恢复道具数量 2024-09-23 11:29:36 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
sk 5ac106365e 道具修改优化 2024-09-12 18:29:47 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk 22cc427ea5 皮肤技能加成 2024-07-25 11:26:32 +08:00
by 34af2110e2 累计签到红点BUG修改 2024-07-14 17:22:29 +08:00
by c671da56e6 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	etcd/keyconf.go
#	model/config.go
#	protocol/player/player.pb.go
#	protocol/player/player.proto
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
2024-07-09 17:43:14 +08:00
by 0484f1f47b 钻石抽奖实现 2024-07-09 17:35:55 +08:00
sk 7a0500c5eb 道具记录增加消耗道具数量 2024-07-09 15:20:44 +08:00
by f68588eaa3 兑换修改 2024-07-02 15:26:54 +08:00
sk c75df5742e 赛季通行证活动 2024-07-02 14:30:49 +08:00