Commit Graph

143 Commits

Author SHA1 Message Date
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
sk adf2dc3c92 modify etcd key 2024-12-30 11:03:43 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk 51767e9c6a no message 2024-12-24 10:47:36 +08:00
sk 08023bcdea fix:游戏分组统计数据 2024-12-19 17:50:49 +08:00
sk 0c65af22ea add:对局中玩家人数上报 2024-12-17 13:29:50 +08:00
sk 442801fc9a 游戏记录添加游戏组首次游戏时间和游戏次数 2024-12-16 16:33:41 +08:00
sk 22dc0a767a 自定义配置参数不区分大小写 2024-12-04 16:35:50 +08:00
sk 801200f4bd add statistics 2024-12-03 13:14:43 +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 949e6f89e3 添加注释 2024-11-18 18:08:37 +08:00
sk 310156dd35 兑换商城地址 2024-11-12 15:56:27 +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 9cc386b25f 抽奖活动跨天重置 2024-10-26 00:17:46 +08:00
sk c8a39f2d1f 解决冲突 2024-10-23 10:56:07 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
DESKTOP-45ANQ2C\unis 1ad97c27a7 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-18 11:48:04 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk d1e380d9bb 客户端升级奖励记录系统赠送 2024-10-14 13:09:51 +08:00
sk d9f0c18658 mongodb库升级包 2024-10-12 13:39:52 +08:00
sk f918baed78 mongodb库升级包 2024-10-12 08:59:37 +08:00
sk 1f8f7b0f22 赛季积分重置修复 2024-10-08 14:51:45 +08:00
sk 025dbd8691 Merge branch 'release' into develop 2024-09-29 09:55:49 +08:00
sk bcdcc1cc47 修复比赛场id重复问题 2024-09-29 09:55:34 +08:00
sk 6f700f9ef6 no message 2024-09-28 10:03:29 +08:00
sk fd14654c59 竞技馆和比赛场关闭斗鸡技能效果 2024-09-27 18:02:00 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
sk 93134b7f57 no message 2024-09-27 14:31:16 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
by ecf47d9f55 后台撤销娃娃兑换订单类型 2024-09-23 14:25:04 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
sk 522b284dd6 no message 2024-09-20 08:28:01 +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
sk ecb9c17920 no message 2024-09-19 14:30:18 +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