Commit Graph

3136 Commits (01f0d514c73a05c374eb6581bee9515af67fc9b5)
 

Author SHA1 Message Date
zhangshanxue 01f0d514c7 网络修改 2020-03-25 10:12:08 +08:00
zhangshanxue f8251f06cf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-24 10:59:20 +08:00
zhangshanxue 91593f8fa0 奖励优化 2020-03-24 10:58:52 +08:00
wangyuan ad24f4c7ed delete unuse code 2020-03-24 10:58:25 +08:00
wangyuan f23d6924fd 删除无效代码 2020-03-24 10:57:06 +08:00
wangyuan b119ff1ce9 fix get goods info way 2020-03-23 18:42:48 +08:00
wangyuan 23489baf4a 背包内和互动关联的道具,活动到期后道具的优化 2020-03-20 18:13:58 +08:00
wangyuan d23c8baeed fix 道具直购初始化时间 2020-03-20 18:09:05 +08:00
lvxinran bf8a3a59d7 戒灵秘宝时间剩余 2020-03-25 05:01:03 +08:00
wangyuan c208cc6bb7 fix 直购礼包结束时间计算 2020-03-20 14:53:52 +08:00
wangyuan b02f07e874 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-03-20 11:01:19 +08:00
wangyuan 651c7697c8 道具直购 2020-03-20 11:00:59 +08:00
lvxinran e26e4c617a 战斗逻辑 2020-03-19 14:09:18 +08:00
lvxinran 0034193cb4 Merge branch 'project0.95' 2020-03-19 11:11:17 +08:00
lvxinran 287720f7d4 Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95 2020-03-18 17:41:29 +08:00
lvxinran d41c1da745 系统消息修改,好友全部同意提示 2020-03-18 17:41:24 +08:00
wangyuan e7d2e52ea4 邮件提示 2020-03-18 14:40:00 +08:00
wangyuan fe37d4fb31 任务更新 2020-03-17 17:13:52 +08:00
zhangshanxue 6d4134f2b1 猎妖数据过大 2020-03-17 17:12:46 +08:00
zhangshanxue 9f8c1006e2 竞技场防御战力未更新 2020-03-17 17:10:52 +08:00
zhangshanxue abd7ba7804 线程重复 2020-03-16 11:41:58 +08:00
zhangshanxue 550ce57411 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-16 11:01:02 +08:00
zhangshanxue 3900141126 线程创建多个 2020-03-16 11:00:48 +08:00
wangyuan 85bf6d74dc Merge branch 'project0.95'
# Conflicts:
#	tablemanager/src/main/java/config/SRewardItem.java
2020-03-15 10:17:52 +08:00
lvxinran be83f871c0 关卡排行热更 2020-03-13 15:21:49 +08:00
lvxinran 288c4d627e 战力方法修改 2020-03-13 14:47:39 +08:00
wangyuan 2fa05aade5 fix mainrank 2020-03-13 14:42:35 +08:00
lvxinran 566fc26e6d 好友友情点修改 2020-03-13 14:26:45 +08:00
lvxinran 50110c8723 关卡排行榜修改 2020-03-13 11:11:29 +08:00
wangyuan 1a6b3fdd86 启动服务器加索引 2020-03-13 10:15:31 +08:00
lvxinran 521564b871 Merge branch 'project0.95' 2020-03-13 05:11:07 +08:00
lvxinran 082671a2d9 5点0点刷新修改 2020-03-13 05:10:37 +08:00
wangyuan 789730d3c7 view mem 2020-03-12 18:09:20 +08:00
lvxinran f268f19439 减少日志 2020-03-12 15:43:39 +08:00
lvxinran 4425bfd75b 排行榜修改 2020-03-12 14:14:36 +08:00
wangyuan b2ced29b8c fix rank 2020-03-15 21:19:05 +08:00
wangyuan 978bee312b fix guildbossreward table bug 2020-03-11 17:15:57 +08:00
wangyuan c7a280108d fix indication 2020-03-10 16:56:21 +08:00
wangyuan 13b83b1050 fix indication 2020-03-10 16:54:17 +08:00
lvxinran ae294080a6 东海寻仙bug修改 2020-03-12 10:40:25 +08:00
wangyuan 0601a3d746 '商品type改成id' 2020-03-09 17:07:53 +08:00
zhangshanxue 743e54ceb5 cdk全渠道需求 2020-03-09 12:39:30 +08:00
zhangshanxue 498dbbb80f cdk全渠道需求 2020-03-09 11:31:28 +08:00
zhangshanxue 674d88210e cdk全渠道需求 2020-03-09 11:02:06 +08:00
lvxinran 2b6c6496a7 战斗同步 2020-03-08 18:28:09 +08:00
zhangshanxue 1436f647ff 策划表提错分支 2020-03-06 23:16:13 +08:00
zhangshanxue fad68b0002 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-06 13:24:08 +08:00
lvxinran 4b09df7f4f 东海寻仙修改 2020-03-06 18:37:30 +08:00
zhangshanxue 74ee4537ee 远征优化 2020-03-06 13:23:57 +08:00
lvxinran 435ed56a0f 特权刷新先后顺序 2020-03-03 05:04:32 +08:00