Commit Graph

513 Commits

Author SHA1 Message Date
sk 1123fe94ab 赛季挑战任务 2024-07-11 17:23:56 +08:00
sk 7504a2dcdf Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 11:57:04 +08:00
sk 06343ab6fc 通行证活动统计数据 2024-07-11 11:56:34 +08:00
by e326ccdf81 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-11 10:20:25 +08:00
by 240711a0bd 兑换商城修改 2024-07-11 10:20:21 +08:00
sk a28d9163d8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 09:59:05 +08:00
sk b83be4028e update gameitem 2024-07-11 09:58:30 +08:00
by 8f55c7cb3d 删除测试代码 2024-07-10 17:53:15 +08:00
by f299b5ca13 钻石抽奖白名单权限 2024-07-10 17:49:46 +08:00
by 351d5979ba Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-10 16:34:40 +08:00
by 9636dccb99 钻石抽奖 2024-07-10 16:34:10 +08:00
sk d0f388e46b 充值金额统计 2024-07-10 16:23:23 +08:00
sk c21dd8e565 v卡兑换消耗统计 2024-07-10 16:17:51 +08:00
sk b5aba457a0 解决冲突 2024-07-10 15:58:45 +08:00
sk b3d95e3512 玩家信息添加v卡消耗和充值金额 2024-07-10 15:53:06 +08:00
by 1c6706d014 钻石抽奖 2024-07-10 15:26:03 +08:00
sk 3c910a4ad7 初始化充值金额 2024-07-10 15:16:09 +08:00
sk 8c843ecf0b 后台道具配置 2024-07-10 14:16:27 +08:00
sk 68ca6af923 增加日志 2024-07-10 14:05:30 +08:00
by 55e6142f60 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-10 11:41:47 +08:00
by 9481b8d1ab 兑换商城修改 2024-07-10 11:41:33 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
sk bc679f529e 解决冲突 2024-07-09 19:05:29 +08:00
sk 463117de96 修改protocol导入路径 2024-07-09 19:00:30 +08:00
by e19d9e29fe config还原 2024-07-09 17:48:17 +08:00
by e4f993fb8e proto编译文件 2024-07-09 17:46:04 +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 d29c485c87 记录注册ip和登录id 2024-07-09 15:49:51 +08:00
sk 7a0500c5eb 道具记录增加消耗道具数量 2024-07-09 15:20:44 +08:00
sk e9b80f805e 增加赠送奖励记录 2024-07-09 11:35:15 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk 3d96c347d1 消耗钻石比赛开始再统计 2024-07-08 16:52:32 +08:00
sk b9fbedee9e update develop 2024-07-08 11:55:00 +08:00
sk 432de00d12 update deploy.bat 2024-07-08 11:54:23 +08:00
sk 1fcf9aa6d2 update develop 2024-07-08 11:51:13 +08:00
sk 4cf89236a8 update deploy.bat 2024-07-08 11:48:46 +08:00
sk 0bf6976352 任务变更通知 2024-07-08 11:46:19 +08:00
sk cdd855bfb2 修改构建脚本 2024-07-08 11:34:19 +08:00
sk 0f2404bf12 修改构建脚本 2024-07-05 18:42:51 +08:00
sk ea80d6e89c update game_item 2024-07-05 16:31:06 +08:00
sk d785e80622 update game_item 2024-07-05 16:27:00 +08:00
sk a9b8b5af02 update task 2024-07-05 15:51:07 +08:00
by fb3d73f61f 比赛场每日库存BUG修改 2024-07-05 15:43:12 +08:00
sk bc4c7c11aa update public 2024-07-05 15:03:13 +08:00
sk 78feeb2595 玩家信息初始化 2024-07-05 11:37:14 +08:00
sk ce2c857ff3 角色红点 2024-07-05 10:49:28 +08:00
sk 0ccfff81de 邮件红点问题 2024-07-05 10:05:55 +08:00
sk 42c1f5d79f 解决冲突 2024-07-05 09:29:03 +08:00
sk 7010f6215e 解决冲突 2024-07-05 09:28:41 +08:00