zhangshanxue
|
10d97f1de4
|
成长基金报错
|
2020-09-30 13:25:38 +08:00 |
lvxinran
|
0e8b31c1a7
|
森罗环境修复
|
2020-09-27 20:54:41 +08:00 |
lvxinran
|
dee3658f2f
|
下一层校验
|
2020-09-27 20:05:11 +08:00 |
lvxinran
|
dc59c1f768
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-26 18:36:20 +08:00 |
zhangshanxue
|
935131223e
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-09-27 18:19:02 +08:00 |
zhangshanxue
|
9186cfc5dc
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-27 18:03:51 +08:00 |
zhangshanxue
|
c7e179ba55
|
网页支付过滤条件
|
2020-09-27 18:03:38 +08:00 |
lvxinran
|
1384cca3ee
|
云梦祈福修改
|
2020-09-26 18:36:08 +08:00 |
lvxinran
|
6fda647587
|
活动特权修复
|
2020-09-26 17:59:40 +08:00 |
lvxinran
|
742dfb5cbb
|
免费礼包修改
|
2020-09-26 15:00:05 +08:00 |
lvxinran
|
7c88b404c9
|
金额校验
|
2020-09-27 11:58:44 +08:00 |
lvxinran
|
dc9665c93a
|
特权时间修改
|
2020-09-27 10:01:52 +08:00 |
lvxinran
|
45d15fec1f
|
宝物bug修改
|
2020-09-27 10:01:35 +08:00 |
lvxinran
|
64ba0f5ac7
|
积天好礼发邮件修改
|
2020-09-25 16:19:53 +08:00 |
lvxinran
|
805ac98057
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-09-25 14:31:42 +08:00 |
lvxinran
|
5ec7abded1
|
森罗环境小怪重置刷新
|
2020-09-25 14:02:20 +08:00 |
lvxinran
|
647a31a16b
|
三界除魔提交,达人活动发奖异步
|
2020-09-25 13:57:09 +08:00 |
zhangshanxue
|
9ad1f39f5b
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-25 11:37:14 +08:00 |
lvxinran
|
716d2160de
|
天宫秘宝bug修改
|
2020-10-02 05:01:11 +08:00 |
zhangshanxue
|
02f957f54e
|
网页支付礼包限制
|
2020-09-25 11:37:04 +08:00 |
lvxinran
|
b958742c74
|
三界活动 修改
|
2020-09-24 18:28:04 +08:00 |
zhangshanxue
|
fc6c95fc22
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-23 16:58:11 +08:00 |
lvxinran
|
e73992d1d3
|
满级校验
|
2020-10-10 13:30:27 +08:00 |
zhangshanxue
|
fe44a27b41
|
大闹天宫节点刷新bug
|
2020-09-23 16:58:00 +08:00 |
lvxinran
|
5ea0547673
|
三界提交
|
2020-09-23 01:34:58 +08:00 |
lvxinran
|
749f0aa253
|
青龙秘宝修改
|
2020-09-28 05:06:42 +08:00 |
lvxinran
|
16c9e3deac
|
达人活动添加
|
2020-09-23 16:08:00 +08:00 |
lvxinran
|
0dc8d8c5b8
|
天宫达人
|
2020-09-23 14:17:39 +08:00 |
lvxinran
|
175b75a796
|
免费礼包、达人活动提交
|
2020-09-25 11:44:36 +08:00 |
zhangshanxue
|
c264817928
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-22 18:17:15 +08:00 |
zhangshanxue
|
8788dba24e
|
公会bug
|
2020-09-22 18:16:40 +08:00 |
zhangshanxue
|
65602bd986
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 21:00:46 +08:00 |
zhangshanxue
|
cba3a332a7
|
未入库
|
2020-09-21 21:00:38 +08:00 |
lvxinran
|
a339c6f8df
|
关卡战斗修改
|
2020-09-21 20:44:23 +08:00 |
zhangshanxue
|
0875daa209
|
未入库
|
2020-09-21 20:29:09 +08:00 |
zhangshanxue
|
949cc3cf50
|
数据上报错误
|
2020-09-21 20:06:34 +08:00 |
lvxinran
|
e347397922
|
关卡日志修改
|
2020-09-21 18:21:45 +08:00 |
zhangshanxue
|
c90d741866
|
数据上报错误
|
2020-09-21 17:41:48 +08:00 |
zhangshanxue
|
86724a73b7
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 16:19:12 +08:00 |
zhangshanxue
|
f3eea7067d
|
数据上报目录配置
|
2020-09-21 16:18:43 +08:00 |
lvxinran
|
cff0723c20
|
战力排行修复
|
2020-09-21 12:14:43 +08:00 |
lvxinran
|
d2c96bbe1a
|
战力排行信息修改
|
2020-09-21 11:58:20 +08:00 |
lvxinran
|
085e611beb
|
战力排行日志
|
2020-09-21 11:56:43 +08:00 |
lvxinran
|
0778e74ca8
|
战力排行日志
|
2020-09-21 11:18:30 +08:00 |
lvxinran
|
0d28f6fae5
|
0.99充值活动修改
|
2020-09-23 07:14:49 +08:00 |
lvxinran
|
e3027f1157
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 06:03:35 +08:00 |
lvxinran
|
c107d23934
|
累充0.99修改
|
2020-09-21 06:03:24 +08:00 |
zhangshanxue
|
0b3715aae1
|
大闹天宫刷新时间
|
2020-09-18 18:31:08 +08:00 |
lvxinran
|
c8913cb5ac
|
上报ip修改
|
2020-09-18 00:53:27 +08:00 |
lvxinran
|
991f789f6c
|
道具流水gm修改
|
2020-09-17 17:50:23 +08:00 |
DESKTOP-98AVA47\Administrator
|
1fa16cadd0
|
猎妖之路节点生成错误
|
2020-09-24 21:43:09 +08:00 |
lvxinran
|
22a5668ac2
|
在线奖励添加一键领取
|
2020-09-16 12:32:53 +08:00 |
lvxinran
|
28d2780c3b
|
车迟斗法排行日志
|
2020-09-16 05:16:02 +08:00 |
lvxinran
|
cb75ce8f9d
|
破阵诛仙活动 刷新修改
|
2020-09-16 05:03:09 +08:00 |
lvxinran
|
64e67ae8a1
|
大闹天宫打点
|
2020-09-15 20:52:46 +08:00 |
lvxinran
|
7b33db16df
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 18:49:27 +08:00 |
lvxinran
|
8bc3d089dd
|
大闹天宫埋点修改
|
2020-09-15 18:49:17 +08:00 |
jiahuiwen
|
ff1271b151
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:44:32 +08:00 |
jiahuiwen
|
a4d8819350
|
规范日志
|
2020-09-15 16:44:15 +08:00 |
lvxinran
|
a9c7040dc9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:19:35 +08:00 |
zhangshanxue
|
0a565bb025
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:16:07 +08:00 |
zhangshanxue
|
f4dc939fc2
|
网页支付玩家定制化商品列表
|
2020-09-15 16:15:59 +08:00 |
lvxinran
|
ff8772dd4f
|
工会副本buff修改
|
2020-09-15 16:15:56 +08:00 |
lvxinran
|
bb6a149f89
|
天宫秘宝修改
|
2020-09-15 14:43:13 +08:00 |
lvxinran
|
d0aebf10f3
|
数据上报字段修改,森罗环境层数排行修改
|
2020-09-15 13:47:04 +08:00 |
lvxinran
|
3328d48b41
|
重置最高层减1
|
2020-09-15 11:02:02 +08:00 |
jiahuiwen
|
33bd562ea6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-11 10:05:49 +08:00 |
lvxinran
|
a1b7bc9e68
|
tapdb货币类型
|
2020-09-17 16:12:13 +08:00 |
jiahuiwen
|
5c4d7e49e2
|
添加空判断
|
2020-09-11 10:05:43 +08:00 |
lvxinran
|
ccc1011023
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 15:17:12 +08:00 |
lvxinran
|
644632f740
|
心魔、日常打点修改
|
2020-09-10 15:17:04 +08:00 |
lvxinran
|
4b0083bea9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-25 10:32:14 +08:00 |
lvxinran
|
066de19115
|
天宫秘宝修改
|
2020-09-25 10:32:09 +08:00 |
zhangshanxue
|
d2c5509766
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-09 15:06:55 +08:00 |
zhangshanxue
|
7aad0e485b
|
商品id未赋值
|
2020-09-09 15:06:48 +08:00 |
zhangshanxue
|
70d170c341
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 18:13:05 +08:00 |
zhangshanxue
|
eb37e958f6
|
充值上报汇率
|
2020-09-07 18:12:26 +08:00 |
lvxinran
|
9e32a22e06
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-20 20:55:38 +08:00 |
lvxinran
|
d00c9f8c64
|
cdk 服务器id添加
|
2020-09-20 20:55:04 +08:00 |
lvxinran
|
834f6e303e
|
八日登录修改,公会副本边界,不发排行奖励修改
|
2020-09-09 08:13:51 +08:00 |
lvxinran
|
2d788828d5
|
0消耗判断
|
2020-09-07 17:31:46 +08:00 |
lvxinran
|
897563644f
|
魂印战力修改
|
2020-09-07 16:23:38 +08:00 |
lvxinran
|
324a93d144
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 15:51:49 +08:00 |
lvxinran
|
51ca7053a1
|
购买buff修改,魂印基础战力
|
2020-09-07 15:51:44 +08:00 |
lvxinran
|
748f792faa
|
工会副本修改
|
2020-09-17 19:18:08 +08:00 |
lvxinran
|
09a07cd559
|
修改副本
|
2020-09-17 19:06:11 +08:00 |
lvxinran
|
92ed17c747
|
保存编队修改
|
2020-09-17 02:40:36 +08:00 |
lvxinran
|
13ca97db1c
|
代码回滚
|
2020-09-17 01:41:58 +08:00 |
lvxinran
|
80bdaf491e
|
删除无用buff
|
2020-09-17 01:41:16 +08:00 |
lvxinran
|
99febadec7
|
清除无用buff点
|
2020-09-17 01:40:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
5cf95e7e09
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 10:28:48 +08:00 |
lvxinran
|
2b16cf567b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-19 08:15:03 +08:00 |
lvxinran
|
de8524d70a
|
暂时修改工会副本
|
2020-09-19 08:14:27 +08:00 |
lvxinran
|
fcc07cc679
|
森罗幻境埋点
|
2020-09-19 07:56:53 +08:00 |
lvxinran
|
e2ab570525
|
打点修改 工会副本5点刷新伤害
|
2020-09-19 06:59:17 +08:00 |
lvxinran
|
28d42eb762
|
破阵诛仙任务读表修改
|
2021-01-17 05:02:58 +08:00 |
lvxinran
|
ade62badfa
|
论数修改
|
2021-01-17 05:02:10 +08:00 |
zhangshanxue
|
6125cbcb65
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-14 17:52:49 +08:00 |
zhangshanxue
|
048d00080e
|
网页支付玩家商品信息获取
|
2020-09-14 17:52:00 +08:00 |
lvxinran
|
37735820ef
|
日常副本打点修改
|
2020-09-14 09:49:16 +08:00 |