Commit Graph

1681 Commits

Author SHA1 Message Date
by 152ad64263 兑换商城判断是否显示判断 2024-07-12 18:10:17 +08:00
sk 23c1d1eaab 皮肤功能 2024-07-12 18:05:03 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk 29a8319849 update excel 2024-07-11 18:35:30 +08:00
sk 1c502d603c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 18:34:48 +08:00
sk 4fc7e30647 update excel 2024-07-11 18:33:02 +08:00
by a9b6d1a020 更新配置表 2024-07-11 18:31:51 +08:00
sk db8388c7bc update excel 2024-07-11 18:31:43 +08:00
sk 17b2cd0a64 update excel 2024-07-11 18:30:43 +08:00
sk 7e4be48aff update excel 2024-07-11 18:29:04 +08:00
by 81340b3787 更新配置表 2024-07-11 18:08:50 +08:00
by a8f44cdf47 更新配置表 2024-07-11 18:08:03 +08:00
by e53e94eb4c Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	data/DB_GameItem.dat
#	data/DB_PropExchange.dat
#	data/DB_Task.dat
#	public
#	xlsx/DB_GameItem.xlsx
2024-07-11 18:04:54 +08:00
by e5a6ebfe76 更新配置表 2024-07-11 18:03:04 +08:00
by edf83e6e41 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-14 17:22:40 +08:00
by 34af2110e2 累计签到红点BUG修改 2024-07-14 17:22:29 +08:00
sk 56934264a3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 17:24:06 +08:00
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 515de3a987 消耗钻石比赛开始再统计 2024-07-09 09:10:33 +08:00