tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
791 Commits 9 Branches 0 Tags 86 MiB
Commit Graph

422 Commits

Author SHA1 Message Date
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
by 072c83c34c 广告任务 2024-07-02 09:02:59 +08:00
by b6aaf756e6 宠物技能 2024-07-01 11:47:42 +08:00
sk fde4187f5b Merge branch 'develop' into release 2024-06-29 18:58:24 +08:00
by 299c6502a6 解决钻石存钱罐发送数据自动补位问题 2024-06-29 18:56:51 +08:00
sk 74b868460b Merge branch 'develop' into release 2024-06-29 18:29:15 +08:00
by 6495a96f4e 钻石存钱罐需求更改只在tienlen中增加钻石 2024-06-29 18:28:33 +08:00
sk 7e80facc24 Merge branch 'develop' into release 2024-06-29 18:25:48 +08:00
by 8199231ac7 钻石存钱罐需求更改只在tienlen中增加钻石 2024-06-29 18:24:50 +08:00
by d11f7f75c2 钻石存钱罐 BUG修改只保留小数点后4位 2024-06-29 18:03:56 +08:00
sk 2805e4ca6c 通行证协议 2024-06-29 15:29:01 +08:00
sk 655fe2ff96 Merge branch 'develop' into release 2024-06-29 11:35:41 +08:00
sk 087bff7a13 邀请活动充值加积分 2024-06-29 11:33:03 +08:00
sk b4427a1459 Merge branch 'develop' into release 2024-06-28 18:58:09 +08:00
sk 1fcb3031ed 解决冲突 2024-06-28 18:57:13 +08:00
sk a67c747a46 解决冲突 2024-06-28 16:58:58 +08:00
sk 808a2458fe Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-01 18:43:26 +08:00
sk 9a6ced171b 跨周问题 2024-07-01 18:43:00 +08:00
by 5c9fec6e36 钻石存钱罐修改 2024-06-28 16:08:52 +08:00
sk b067f07b2c 新邀请活动 2024-06-28 15:33:09 +08:00
sk 303f0817ca mongodb事务 2024-06-28 15:07:57 +08:00
by 44ff58675d 钻石存储罐 领取次数达到上限 不增加钻石 2024-06-28 11:48:01 +08:00
by 7146df070c 增加背包兑换话费码操作返回结果 2024-06-28 10:53:55 +08:00
by 2b75df2e38 增加背包兑换话费码操作返回结果 2024-06-28 10:38:14 +08:00
by d4d8816a8b 钻石存钱罐修改 2024-06-28 09:52:47 +08:00
sk 70768089da 跨周根据所在时区计算日期 2024-06-28 09:14:11 +08:00
by d6a15311f7 钻石存钱罐修改 2024-06-27 18:55:51 +08:00
by 8d8031759d 钻石存储罐上线问题修改 2024-06-27 18:39:48 +08:00
sk bdbf908e36 任务系统赠送金币记录 2024-06-27 17:53:53 +08:00
by fa581628f3 七日签到修改 2024-08-16 16:27:37 +08:00
by ae0ac2dbaf 钻石存储罐修改 2024-06-27 10:57:57 +08:00
by c2a7fa3834 修改钻石存储罐计算保留后4位小数 2024-06-27 10:49:51 +08:00
by c845dcad4e 配置表修改 2024-06-26 17:28:24 +08:00
by 20ebed0347 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 16:59:00 +08:00
by 3a60afc0d0 金币存钱罐修改 2024-06-26 16:58:50 +08:00
sk 1edaac6773 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-26 16:55:07 +08:00
sk 523ed5b296 新版邀请活动离线积分计算 2024-06-26 16:50:47 +08:00
by 09aa018fec 钻石存钱罐 +获取运营商数据 2024-06-26 16:46:17 +08:00
sk e0f2f76322 新版邀请活动 2024-06-26 14:30:06 +08:00
sk 754f94abbd 添加日志 2024-06-26 11:50:55 +08:00
sk 96599507b8 添加日志 2024-06-26 11:46:16 +08:00
by ac76712485 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 11:21:59 +08:00
by fdd5e3889e 背包使用兑换功能实现 2024-06-26 11:21:54 +08:00
sk 0c846595eb 解决冲突 2024-06-26 11:14:00 +08:00
sk 7ae4392784 新版邀请活动 2024-06-26 11:04:51 +08:00
by 9ed4f708bc 备注信息修改 2024-06-26 09:38:59 +08:00
by 9ef37b0bce 备注信息修改 2024-06-26 09:29:12 +08:00
by 7d98b14f5b 钻石存钱罐更新 2024-06-25 18:42:42 +08:00
sk 8eb9a7c7a1 新版邀请活动 2024-06-25 18:06:32 +08:00
by f24d6c740b 删除测试代码 2024-06-25 17:52:12 +08:00
by 7e05717d2e 同步表 2024-06-25 17:48:10 +08:00
by da249ec436 同步表+钻石存储罐功能实现+七日签到进阶奖励修改 2024-06-25 17:31:41 +08:00
by 11d78d2386 累计签到进阶奖励修改增加google渠道区分 2024-06-30 18:10:52 +08:00
by c61c88266b 累计签到进阶奖励修改 2024-06-25 10:48:36 +08:00
by a6d76b3f94 累计签到进阶奖励更新 2024-06-24 09:42:37 +08:00
by 6985bc0437 累计签到进阶奖励实现 2024-06-24 09:29:56 +08:00
sk 56fb4612c7 比赛场开赛时间判断 2024-06-19 21:02:00 +08:00
sk 992ccb280e 比赛场开赛时间判断 2024-06-19 21:01:17 +08:00
sk 4f6222cdc5 比赛场开赛时间判断 2024-06-19 20:15:31 +08:00
sk 573a59045b Merge branch 'develop' into release 2024-06-19 19:43:35 +08:00
sk 168c2cc8c3 比赛场开赛时间判断 2024-06-19 19:04:51 +08:00
sk 2520ec2e7d 解决冲突 2024-06-19 15:26:25 +08:00
sk 9d246dcba3 排位赛赛季信息添加待领取奖励信息 2024-06-18 15:34:26 +08:00
sk a2584b22bc 钻石消耗记录 2024-06-15 18:24:39 +08:00
sk 2a7ada450a 增加钻石消耗记录类型 2024-06-14 18:35:52 +08:00
by 5e212ae658 周卡续费BUG修改 2024-06-14 13:29:58 +08:00
by d57909b05a 删除无用代码 2024-06-14 11:41:18 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk f1dee4a54a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-14 09:31:37 +08:00
by feda7fd5c1 删除无用代码 2024-06-24 17:11:56 +08:00
sk c429d41900 比赛添加比赛区分 2024-06-13 13:55:00 +08:00
by a8500da1a7 周卡续费BUG修改 2024-06-12 16:44:59 +08:00
sk 3526ef069f 解散空闲房间 
房间没有真人或观众，并且长时间没有真人进出房间就解散
 2024-06-12 14:39:27 +08:00
sk ceac412a25 比赛类型列表 2024-06-11 11:23:43 +08:00
sk 41361621ef 比赛日志用开始比赛时备份的配置不能用最新配置 2024-06-11 09:13:31 +08:00
sk 869a2c91d2 邀请积分排行榜 2024-06-06 16:09:14 +08:00
sk 604f7099ec 修改HOOK_AFTER_STOP 2024-06-06 16:04:03 +08:00
sk aee5f99d9d 重置个人水池调控数据 2024-06-06 14:22:18 +08:00
sk 776ba8a19c 进入好友房 2024-06-03 18:36:06 +08:00
sk 39b71ea93f 比赛时间 2024-06-03 14:23:46 +08:00
sk 35c0e07004 发送邮件添加渠道筛选 2024-06-03 14:23:46 +08:00
sk e1812b5ecf vip添加比赛场免费次数 2024-05-31 09:58:00 +08:00
sk ef59d75ac5 vip添加比赛场免费次数 2024-05-30 17:33:31 +08:00
sk 9177d20d5e 修复空指针异常 2024-05-29 09:17:14 +08:00
sk b9c1b85193 玩家信息接口道具列表 2024-05-28 14:51:21 +08:00
sk bfbe02be66 道具变化添加后台操作类型 2024-05-28 14:49:20 +08:00
sk 60255489d5 预创建房间 2024-05-28 09:58:18 +08:00
sk 8b478a9f33 解决冲突 2024-05-28 09:26:18 +08:00
sk 516ab3f811 修复预创建房间问题 2024-05-28 09:24:14 +08:00
sk 29745d23c2 渠道开关 2024-05-25 18:24:21 +08:00
sk d529ec2fed update 2024-05-25 17:56:03 +08:00
sk da5bb97469 review 2024-05-25 15:45:59 +08:00
sk 0d252cebc5 添加道具类型 2024-05-25 14:47:23 +08:00
sk 63efa84183 update 2024-05-24 16:46:41 +08:00
sk a0050bd44d 离线加币问题 2024-05-24 15:23:29 +08:00
sk d27c0270f8 no message 2024-05-24 12:00:32 +08:00
sk eddad2e788 解决冲突 2024-05-24 10:48:22 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk 27dfedab18 etcd 2024-05-24 09:37:34 +08:00
sk c8be1b9320 etcd,rabbitmq防止在init方法隐式调用 2024-05-22 17:57:42 +08:00
sk 489395ebb1 删除比赛场段位 2024-05-22 17:57:42 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
by 4254d08e38 兑换增加错误码返回 2024-05-20 14:50:11 +08:00
by e9c29f1442 背包修改 2024-05-20 10:36:48 +08:00
by 64bcbb896e 添加道具接口增加扣除道具检测 2024-05-20 10:09:48 +08:00
sk 8bdd4f09dc 绑定人数统计问题 2024-05-17 14:16:56 +08:00
sk fa34c9c8b2 绑定邀请人任务 2024-05-17 11:31:27 +08:00
sk 11af348377 比赛配置添加手机卡类型 2024-05-17 09:30:03 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 3828311520 邀请分享链接 2024-05-16 15:22:26 +08:00
sk d298ed97e8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-16 15:06:25 +08:00
sk 6dfe2301e0 修改游戏入口开关 2024-05-16 15:06:16 +08:00
by f1308bbb09 后台增加添加道具接口 2024-05-16 13:54:52 +08:00
by 5eb29259c1 后台增加添加道具接口 2024-05-16 11:59:52 +08:00
by 2ecbc2b1cb 后台增加添加道具接口 2024-05-16 09:59:18 +08:00
by 478ab9ea0a 兑换自提 添加道具走后台 2024-05-15 18:04:39 +08:00
by e58eb4d672 兑换创建订单增加telcharge字段 2024-05-15 10:12:41 +08:00
by b0ba8e31ff 商城兑换修改 2024-05-14 17:49:18 +08:00
by 756ed06016 比赛log保存数据库修改 2024-05-14 11:44:31 +08:00
by 06695defa6 比赛log保存数据库修改 2024-05-14 11:38:44 +08:00
sk 0059b6d0c5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-13 18:49:19 +08:00
sk edd992aecd 兑换商城自提，优化道具使用日志 2024-05-13 18:48:44 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop 
# Conflicts:
#	model/player.go
 2024-05-13 16:07:25 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
kxdd 075900766d Merge branch 'dev_newTimeitem' into dev_timeitem_n1 2024-05-13 11:39:21 +08:00
kxdd 052cfc1fe1 Merge branch 'dev_newTimeitem' into develop 2024-05-13 11:02:40 +08:00
kxdd a017518652 记牌器时间计算bug 2024-05-13 11:01:02 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
by 384f8b5b9c 删除打印log 2024-05-11 17:59:23 +08:00
by 355c6aae93 比赛场数据统计 2024-05-11 17:10:30 +08:00
sk 5ac5c633a2 no message 2024-05-11 17:06:49 +08:00
sk 7c02471d2c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 16:54:25 +08:00
sk f2d9d51dd6 好友申请列表 2024-05-11 15:17:02 +08:00
kxdd 579e27e17f --story=1000625 --user=李海亮 存钱罐购买限制补充 https://www.tapd.cn/31044302/s/1011001 2024-05-11 11:59:22 +08:00
sk ff78edf56b update 2024-05-11 11:02:24 +08:00
sk 267c0492f6 解决冲突 2024-05-10 16:53:42 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
by 62bacfb0d2 兑换商城 自提功能实现 2024-05-10 16:24:09 +08:00
by 16a41fff24 兑换商城 自提功能实现 2024-05-10 16:01:39 +08:00
by 4553558144 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 15:13:31 +08:00
by 8c432f6f4e 好友申请记录 2024-05-10 15:13:25 +08:00
sk 22dbae7f80 被邀请人充值任务 2024-05-10 11:44:58 +08:00
sk a943492d80 开启兑换渠道控制 2024-05-10 09:17:58 +08:00
sk 7dcd78d3ef 邀请分享链接简化 
公告增加渠道参数
 2024-05-09 17:18:16 +08:00
sk 4753b4a71a 在线统计接口 2024-05-08 18:17:35 +08:00
sk 64a1df39c5 代码优化 2024-05-08 16:36:07 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00