Commit Graph

118 Commits

Author SHA1 Message Date
sk 88e548bf6a 解决冲突 2025-01-08 11:19:04 +08:00
sk 88f2bf7f7c add 推币机活动 2025-01-08 11:15:24 +08:00
sk a40b25d437 解决冲突 2025-01-07 16:10:33 +08:00
sk 97c826b5f8 add 推币机配置 2025-01-07 14:27:06 +08:00
by 7dd4df57fa Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	common/constant.go
#	worldsrv/taskmgr.go
2025-01-06 16:01:25 +08:00
by b512310a92 年兽排行榜统计 2025-01-06 16:00:07 +08:00
sk 527e3b1acb no message 2025-01-06 14:52:12 +08:00
sk 579c579118 add 累消活动账变类型 2025-01-06 14:46:36 +08:00
by de391699b8 年兽排行榜奖励走后台+帐变记录 2025-01-06 11:59:12 +08:00
sk 3ee3f677ce 解决冲突 2025-01-02 18:10:35 +08:00
sk 231cff3c4a add 累计消耗活动 2025-01-02 17:57:47 +08:00
by 8c9b279196 年兽任务 2025-01-02 16:59:59 +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
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 f0c215dc4a 存钱罐功能添加后台开关 2024-12-30 14:56:52 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk 08023bcdea fix:游戏分组统计数据 2024-12-19 17:50:49 +08:00
sk 442801fc9a 游戏记录添加游戏组首次游戏时间和游戏次数 2024-12-16 16:33:41 +08:00
tomas 126f9579c5 fix ox 营收 2024-12-02 10:26:47 +08:00
DESKTOP-45ANQ2C\unis 7b76389509 合成功能 2024-11-22 10:06:28 +08:00
sk 23ea951eb0 使用go module 2024-11-04 14:02:22 +08:00
sk 0cc4009858 引导奖励统计系统赠送 2024-11-01 15:25:27 +08:00
sk d8a6246f93 竞技馆中奖广播 2024-10-29 10:11:33 +08:00
sk 342d2fde1f 修复抽奖奖励邮件 2024-10-26 10:31:53 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk d1e380d9bb 客户端升级奖励记录系统赠送 2024-10-14 13:09:51 +08:00
sk 1f8f7b0f22 赛季积分重置修复 2024-10-08 14:51:45 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
by ecf47d9f55 后台撤销娃娃兑换订单类型 2024-09-23 14:25:04 +08:00
sk 0ff33ee6a4 恢复代码 2024-09-20 07:21:07 +08:00
kxdd 7d7f5804f1 Merge branch 'develop' into ma
# Conflicts:
#	common/constant.go
2024-09-19 18:27:45 +08:00
by 2925465b41 背包兑换娃娃 2024-09-19 13:35:34 +08:00
by d2a64cb8ae 娃娃卡积分40004 2024-09-18 11:19:14 +08:00
kxdd e7e08755a4 娃娃机道具消耗与获得 2024-09-13 18:18:01 +08:00
by 1b3b98e359 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-13 17:56:47 +08:00
by f1eccf335f 娃娃兑换商城 2024-09-13 17:56:06 +08:00
sk cfa2c003c2 游戏中玩家余额变化 2024-09-13 16:57:37 +08:00
kxdd b57c5b2e41 Merge branch 'ma' into develop 2024-09-10 15:00:35 +08:00
kxdd 418b16d2e9 娃娃机状态修改 2024-09-10 14:59:36 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +08:00
sk c4bea18f9f 道具交易市场 2024-09-05 18:31:04 +08:00
sk 0ba53df8ec 新增拉霸游戏 2024-08-30 17:29:11 +08:00
sk 9ab3da69a4 新增拉霸游戏 2024-08-30 17:18:06 +08:00
tomas 18a884da43 11 2024-08-30 15:59:55 +08:00
sk 33eab3f5bc 竞技馆房间列表变更通知 2024-08-29 16:35:57 +08:00
sk 3bff2c17f3 review 2024-08-29 14:28:54 +08:00