Commit Graph

568 Commits

Author SHA1 Message Date
sk 9f490a7aca 竞技馆 2024-09-02 11:44:12 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
sk 74efab000e 新增拉霸游戏 2024-08-30 17:19:03 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
sk 33eab3f5bc 竞技馆房间列表变更通知 2024-08-29 16:35:57 +08:00
sk 94ca1562e5 解决冲突 2024-08-29 14:51:32 +08:00
sk 3bff2c17f3 review 2024-08-29 14:28:54 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 94a4737609 比赛场房间排名 2024-08-28 09:14:02 +08:00
sk cae5536ed3 房卡消耗记录 2024-08-28 09:12:01 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 466eafe1bc 房间信息添加比赛配置id 2024-08-26 18:13:15 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk 4e6b92cd33 review 2024-08-24 18:26:31 +08:00
sk 7222426469 竞技馆后台配置 2024-08-24 18:25:03 +08:00
sk a040d30354 道具出售金额用int64 2024-08-24 15:49:07 +08:00
sk 4c0c6f7c2b 竞技馆后台协议 2024-08-23 18:11:54 +08:00
sk a13ed034d7 比赛观战错误码 2024-08-23 09:43:51 +08:00
sk 8736f54fe1 现金购买后vip经验获得调整 2024-08-22 16:07:17 +08:00
sk 919129d70f Merge branch 'custom' into develop 2024-08-22 14:49:19 +08:00
sk 7ebe12c3de review 2024-08-22 14:48:06 +08:00
sk 18e3e5cd7d 比赛观战开关 2024-08-22 13:54:22 +08:00
sk 71655d8126 比赛观战 2024-08-22 09:43:10 +08:00
sk 00b0e01000 比赛观战 2024-08-21 11:31:38 +08:00
sk 6153903f31 比赛场比赛中列表 2024-08-20 10:44:42 +08:00
sk fc29fcddd8 比赛列表返回图标信息 2024-08-20 09:54:57 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
sk 96bbac8533 no message 2024-08-19 13:52:09 +08:00
sk 0f7da88dab 新手引导开启时注册的账号才有引导 2024-08-19 10:18:08 +08:00
sk 07150c660d review 2024-08-19 09:56:08 +08:00
sk 159e69094f 小精灵配置 2024-08-16 15:08:44 +08:00
sk e5b80fda16 小精灵功能 2024-08-16 11:28:01 +08:00
sk eba92ed00b 修改ChannelId 2024-08-16 09:51:35 +08:00
sk b1c936fae8 Merge branch 'look' into develop 2024-08-15 16:28:50 +08:00
sk e93616dcc9 比赛观战 2024-08-15 16:18:22 +08:00
sk 514d6fdf37 优化比赛场奖励领取次数限制 2024-08-15 15:54:38 +08:00
sk 28921649c5 删除冗余代码 2024-08-15 15:54:30 +08:00
sk cb907ae642 删除测试代码 2024-08-14 09:25:59 +08:00
sk 42099b3d59 兑换商品返回商品id 2024-08-13 16:56:32 +08:00
sk a2a70a130b 比赛场排名不在有并列的情况积 2024-08-12 17:36:04 +08:00
sk 5b399100e1 vip等级礼包获得奖励 2024-08-12 16:45:12 +08:00
sk ff086c3de3 兑换信息补充 2024-08-12 16:37:08 +08:00
sk dc631f4334 比赛场记录机器人皮肤 2024-08-12 16:30:03 +08:00
sk fd510661b7 兑换商品支持道具数量信息 2024-08-12 14:53:04 +08:00
sk 28826622c8 兑换商品支持道具数量信息 2024-08-12 14:25:26 +08:00
sk 53022f51d9 vip免费比赛次数 2024-08-12 11:52:31 +08:00
sk e4a43ee469 vip每日奖励 2024-08-12 10:36:45 +08:00
sk 7f75f9a0a4 比赛场轮次淘汰允许不淘汰人员 2024-08-10 19:13:02 +08:00
sk 28622d6ffc vip等级礼包原价参数 2024-08-09 17:14:59 +08:00
sk 951b23f99d vip礼包领取 2024-08-09 16:43:48 +08:00
sk 16bcd9a858 支付返回参数扩展 2024-08-09 16:37:57 +08:00
sk 9dd4496b55 no message 2024-08-09 14:27:59 +08:00
sk 427098ee00 兑换礼包领取记录 2024-08-09 14:25:19 +08:00
sk e49ecbc1a1 vip等级礼包 2024-08-09 11:37:44 +08:00
sk c8ba3b74ee vip特权1数据结构调整 2024-08-08 18:25:18 +08:00
sk 61523b30d5 兑换礼包记录 2024-08-08 17:26:30 +08:00
sk a51037b1e7 新手引导 2024-08-08 14:59:42 +08:00
sk c988804222 皮肤红点通知 2024-08-06 16:24:07 +08:00
sk 95fcaa5977 vip升级检查皮肤红点 2024-08-10 01:05:28 +08:00
sk f0c42316f7 vip升级检查皮肤红点 2024-08-10 00:21:12 +08:00
sk 29c71a6efc fix:比赛场积分错误
周卡每日金币不能添加到比赛场
2024-08-10 00:20:47 +08:00
sk 7ceef9878c update excel 2024-08-06 10:27:08 +08:00
sk d6111cc733 update develop 2024-08-06 08:59:50 +08:00
sk fe1e66fec2 皮肤加成 2024-08-05 17:05:03 +08:00
sk 88e34954ad Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-08-05 14:17:05 +08:00
sk 3bc1019fd5 vip每日礼包加成 2024-08-05 14:16:53 +08:00
sk 378b4cc681 update skin 2024-08-05 10:09:10 +08:00
sk c2a5d9b3b9 no message 2024-08-02 17:47:59 +08:00
by fa28e3233c 获奖记录修改 2024-08-02 15:26:36 +08:00
sk 8a56eb5776 道具分解 2024-08-01 18:34:17 +08:00
by 45a5dd6852 获奖记录 删除测试代码 2024-07-31 11:18:39 +08:00
by db01ddcb0d 获奖记录修改 2024-07-31 11:16:36 +08:00
by 36cce9df01 获奖记录修改 2024-07-31 11:15:08 +08:00
by 4d2a136eca 获奖记录修改 2024-07-31 10:09:49 +08:00
by 1136da298c 获奖记录修改 2024-07-31 09:42:41 +08:00
by 195ce9ff69 获奖记录修改 2024-07-31 09:36:57 +08:00
by ac1ee02c4d 获奖记录 2024-07-30 18:44:44 +08:00
sk a7a25ef028 解决冲突 2024-07-30 18:19:13 +08:00
sk 7b05295d67 获奖记录 2024-07-30 17:58:56 +08:00
by e318c85c26 获奖记录 2024-07-30 17:53:37 +08:00
by 107ac98d81 获奖记录 2024-07-30 17:04:41 +08:00
by 805c82bdd5 弹窗配置 2024-07-30 16:21:05 +08:00
by a5cd7beeeb 获奖记录 2024-07-30 15:47:35 +08:00
by 7d5085bf11 获奖记录 2024-07-30 15:16:44 +08:00
by eb3fefb9b8 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-30 14:40:11 +08:00
by fa3e48cd26 获奖记录 2024-07-30 14:40:06 +08:00
sk 86ba780a40 增加道具 2024-07-30 09:25:50 +08:00
sk b6796cd8f6 解决冲突 2024-07-29 10:03:18 +08:00
sk 158aea0bf7 皮肤解锁类型新增vip等级解锁 2024-07-27 18:15:48 +08:00
by 7e04ceecee 获奖记录 2024-07-27 11:51:53 +08:00
by 6ef6bbe2cd 获奖记录 2024-07-27 11:44:37 +08:00
by a2501eefa4 排行榜代码(已屏蔽) + 获奖记录 2024-07-27 10:48:04 +08:00
sk 33c3e14e8b 随机机器人皮肤 2024-07-27 09:27:07 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 25c7f68dac 道具空指针异常 2024-07-25 15:11:07 +08:00
by 60709a140f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.proto
2024-07-25 14:39:03 +08:00
by b15fadfcc4 轮播图增加URL 2024-07-25 14:32:55 +08:00
sk ca9827db16 首充支持道具 2024-07-25 14:03:44 +08:00
sk 22cc427ea5 皮肤技能加成 2024-07-25 11:26:32 +08:00
sk f1a6cd7389 Merge branch 'skin' into develop 2024-07-25 10:19:35 +08:00
sk 5eaa1e2016 皮肤技能加成 2024-07-25 09:57:31 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
by e60e272a9a 随机机器人宠物技能等级修改 2024-07-24 15:18:45 +08:00
by 77c2e5683c 随机机器人宠物技能等级 2024-07-23 15:11:49 +08:00
by 1322a09297 随机机器人宠物技能等级 2024-07-23 15:11:00 +08:00
by b6477c60ef 随机机器人宠物技能等级 2024-07-23 14:57:55 +08:00
by dcaf24653b Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-23 14:36:20 +08:00
by c024df9386 随机机器人宠物技能等级 2024-07-23 14:36:16 +08:00
sk e4afc80be9 修复赛季积分重置问题 2024-07-23 11:24:13 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 8e880d65b1 道具兑换撤单 2024-07-19 10:21:12 +08:00
sk f637724a61 道具兑换撤单 2024-07-19 09:30:19 +08:00
by 49b10d0a99 钻石抽奖信息渠道修改 2024-07-18 11:44:49 +08:00
sk 99b25fa635 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-18 11:27:37 +08:00
sk 3a881657a2 活动开关 2024-07-18 11:15:12 +08:00
by da8a0f1a45 钻石抽奖权重计算修改 2024-07-17 15:17:15 +08:00
by 116d521789 钻石抽奖权重计算修改 2024-07-17 14:56:43 +08:00
by 84ffbd61c9 钻石抽奖权重计算修改 2024-07-17 14:56:20 +08:00
sk 39e84031ae 邮件红点 2024-07-16 11:29:52 +08:00
sk bf08bbbfbd 获得道具记录消耗 2024-07-15 17:12:05 +08:00
sk ea7e0a29b5 update develop 2024-07-15 15:55:46 +08:00
sk ae2042bf4d 皮肤自动使用 2024-07-15 15:30:55 +08:00
by 3fc151e340 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-12 18:11:03 +08:00
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 56934264a3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 17:24:06 +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 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 240711a0bd 兑换商城修改 2024-07-11 10:20:21 +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
by 1c6706d014 钻石抽奖 2024-07-10 15:26:03 +08:00
sk 8c843ecf0b 后台道具配置 2024-07-10 14:16:27 +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
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 0bf6976352 任务变更通知 2024-07-08 11:46:19 +08:00
by fb3d73f61f 比赛场每日库存BUG修改 2024-07-05 15:43:12 +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 7010f6215e 解决冲突 2024-07-05 09:28:41 +08:00
by 538698be07 宠物技能红点提示 2024-07-04 17:10:31 +08:00
by 802f67cb7a Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-04 16:52:09 +08:00
sk 4f9e3b87ca Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-10 00:01:29 +08:00
sk c7992f9fc0 赛季通行证任务 2024-07-10 00:01:12 +08:00
by 1d99e5f794 宠物技能红点 补提 2024-07-04 16:51:57 +08:00
by b93901f765 宠物技能红点提示 2024-07-04 16:23:19 +08:00
sk 36d77da2fe 赛季通行证任务 2024-07-04 16:13:23 +08:00
sk 4d1e89cf91 赛季通行证兑换开关 2024-07-06 01:28:45 +08:00
sk 279b5b84cb Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-06 01:28:31 +08:00
sk aabf20da2c 赛季通行证兑换开关 2024-07-06 01:22:36 +08:00
by 76d95282ca Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-04 15:02:02 +08:00
by a5082f50e5 比赛场库存修改 2024-07-04 15:01:50 +08:00
sk 49bd65a05c 赛季通行证加成 2024-07-04 15:00:57 +08:00
sk cc656a5bbc 赛季通行证重置 2024-07-04 14:51:57 +08:00
sk 5eb468c7ff 邀请好友游戏任务 2024-07-04 11:20:00 +08:00
sk 9379613ae8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-04 11:12:23 +08:00
sk 938aa9d1dd 邀请好友游戏任务 2024-07-04 11:00:16 +08:00
by b28218b753 比赛场每日库存修改 2024-07-04 10:47:19 +08:00
sk 8de4b80458 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-04 10:24:01 +08:00
sk 2922689951 赛季通行证兑换记录 2024-07-04 10:23:41 +08:00
by bd3871aa10 比赛场数据 2024-07-04 10:22:00 +08:00
sk 0b2fb94e69 赛季通行证兑换记录 2024-07-04 10:21:31 +08:00
by ee16983eaf 更新配置表 2024-07-04 10:12:41 +08:00
sk f25adaf3e9 赛季通行证兑换记录 2024-07-04 10:07:23 +08:00
by a757b4bbf9 比赛场数据保存 2024-07-04 09:55:54 +08:00
by 0e372fea74 屏蔽测试代码 2024-07-03 19:20:33 +08:00
by 1c14d96060 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.pb.go
2024-07-03 19:12:22 +08:00
by 007b0c3a5b 比赛场库存 2024-07-03 19:11:49 +08:00
sk 182d4e9612 赛季通行证 2024-07-03 19:11:27 +08:00
sk 87a9186ae3 赛季通行证数据记录 2024-07-03 17:26:12 +08:00
sk e2d18f491b 赛季通行证排行榜 2024-07-03 15:25:33 +08:00
sk 1f8b7e1d70 打印rabbitmq日志 2024-07-03 14:47:07 +08:00
sk 8117f1af54 赛季通行证数据记录 2024-07-03 10:08:04 +08:00
sk 2e34c33768 赛季通行证账变记录 2024-07-02 20:51:10 +08:00
sk 83cfbe6381 赛季通行证排行榜奖励发放 2024-07-02 20:30:35 +08:00
sk aaf15d2b3d 龙币变化通知 2024-07-02 18:34:25 +08:00
sk 78d6a109fe 赛季通行证 2024-07-02 17:34:44 +08:00
by f68588eaa3 兑换修改 2024-07-02 15:26:54 +08:00
sk c75df5742e 赛季通行证活动 2024-07-02 14:30:49 +08:00
sk 4c7abf167e 赛季通行证 2024-07-02 14:21:24 +08:00
by 20b8fe91a0 兑换商城修改 2024-07-02 11:34:41 +08:00