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 |
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 |