lvxinran
|
30d56d2ad1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 11:08:59 +08:00 |
lvxinran
|
a1e0d88052
|
无尽本报错
|
2019-09-12 11:08:55 +08:00 |
zhangshanxue
|
91582654ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 10:21:38 +08:00 |
zhangshanxue
|
33d1cf6a03
|
魂印
|
2019-09-10 10:21:01 +08:00 |
wangyuan
|
2a286218e6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-09-10 10:07:55 +08:00 |
wangyuan
|
4f57f75d6d
|
增加赛季开启类型
|
2019-09-10 10:05:03 +08:00 |
zhangshanxue
|
a51abcbe92
|
魂印
|
2019-09-10 10:02:59 +08:00 |
zhangshanxue
|
f8ab3f7967
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 00:01:38 +08:00 |
lvxinran
|
46e7fd5c23
|
血量修改
|
2019-09-11 23:29:45 +08:00 |
lvxinran
|
acbbc8ee4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 22:21:06 +08:00 |
lvxinran
|
9eb7a469ff
|
法宝、公会战无尽副本修改
|
2019-09-11 22:21:02 +08:00 |
zhangshanxue
|
d04f6fe3bf
|
掉落
|
2019-09-10 00:01:17 +08:00 |
zhangshanxue
|
84104a5971
|
问卷调查优化
|
2019-09-09 20:35:00 +08:00 |
zhangshanxue
|
2aa64192a4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 16:35:15 +08:00 |
zhangshanxue
|
08d29d6cce
|
更新bug
|
2019-09-09 16:35:03 +08:00 |
wangyuan
|
f5ec857e24
|
自动发现服务器
|
2019-09-09 16:07:11 +08:00 |
zhangshanxue
|
5ff27b049c
|
token验证
|
2019-09-09 15:04:39 +08:00 |
zhangshanxue
|
1b61c88da1
|
token验证
|
2019-09-09 14:23:29 +08:00 |
zhangshanxue
|
d0728bae5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 14:16:28 +08:00 |
zhangshanxue
|
967a744a81
|
掉落
|
2019-09-09 14:16:23 +08:00 |
wangyuan
|
f85de0b94c
|
fix random
|
2019-09-09 12:38:21 +08:00 |
zhangshanxue
|
9e8cec3727
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 12:00:11 +08:00 |
zhangshanxue
|
88dc18da7b
|
问卷删除缓存
|
2019-09-09 11:59:34 +08:00 |
lvxinran
|
a533fd4c1a
|
无尽副本血量修改
|
2019-09-09 11:55:30 +08:00 |
lvxinran
|
8285f4363e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:31:57 +08:00 |
lvxinran
|
52a27ee882
|
法宝等级限制,46行为修改
|
2019-09-09 11:31:51 +08:00 |
zhangshanxue
|
8dc4700f13
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:28:52 +08:00 |
zhangshanxue
|
2e35ab977e
|
魂印临时背包掉落
|
2019-09-09 11:28:46 +08:00 |
wangyuan
|
cd38e82643
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-09 10:45:03 +08:00 |
wangyuan
|
fc2994c577
|
time
|
2019-09-09 10:42:13 +08:00 |
lvxinran
|
7be649a804
|
无尽副本修改,法宝修改
|
2019-09-09 10:39:59 +08:00 |
lvxinran
|
54ad281831
|
试炼精气值
|
2019-09-09 09:58:45 +08:00 |
wangyuan
|
2a5490a030
|
time
|
2019-09-07 21:40:45 +08:00 |
wangyuan
|
78154b6adc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
|
2019-09-07 20:05:37 +08:00 |
wangyuan
|
0db40f7fde
|
bloody
|
2019-09-07 20:03:06 +08:00 |
zhangshanxue
|
47ac97d2ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:45:34 +08:00 |
zhangshanxue
|
5a05c80ef3
|
魂印掉落
|
2019-09-07 19:45:30 +08:00 |
lvxinran
|
8bfa9dc498
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:26:31 +08:00 |
lvxinran
|
cb95002a8f
|
血战时间限制
|
2019-09-07 19:26:27 +08:00 |
zhangshanxue
|
4f9b3404dd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 17:20:46 +08:00 |
zhangshanxue
|
f5fb83d1b4
|
token验证
|
2019-09-07 17:20:41 +08:00 |
zhangshanxue
|
91c017cbd5
|
魂印掉落
|
2019-09-07 17:18:22 +08:00 |
lvxinran
|
3defe3d54c
|
法宝掉落
|
2019-09-07 16:31:19 +08:00 |
lvxinran
|
d88ed321c8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 15:03:56 +08:00 |
lvxinran
|
d6f2b203e0
|
公会修改、试炼修改
|
2019-09-07 15:03:33 +08:00 |
wangyuan
|
e1cbbac567
|
圣火令
|
2019-09-07 14:48:08 +08:00 |
wangyuan
|
69057cf41b
|
Merge branch 'split'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
|
2019-09-07 14:15:04 +08:00 |
wangyuan
|
a5a285f081
|
血战积分奖励
|
2019-09-07 14:13:25 +08:00 |
wangyuan
|
201f510e38
|
bloody
|
2019-09-07 14:12:09 +08:00 |
lvxinran
|
c7d61c098d
|
无尽本修改
|
2019-09-07 13:56:30 +08:00 |
zhangshanxue
|
5ef6a8debc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 13:34:41 +08:00 |
zhangshanxue
|
c8cbfcaa43
|
魂印掉落
|
2019-09-07 13:34:36 +08:00 |
lvxinran
|
d95f112bd0
|
法宝默认
|
2019-09-06 20:46:56 +08:00 |
lvxinran
|
50c2758b5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-06 20:41:38 +08:00 |
lvxinran
|
f16ee71a54
|
法宝
|
2019-09-06 20:41:34 +08:00 |
zhangshanxue
|
c118c195f4
|
排行榜显示
|
2019-09-06 14:54:00 +08:00 |
wangyuan
|
932a2bfe1b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
|
2019-09-06 11:09:05 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |
zhangshanxue
|
9406f2c28f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-09-06 11:01:43 +08:00 |
zhangshanxue
|
0bc5d8fb90
|
魂印
|
2019-09-06 10:59:49 +08:00 |
lvxinran
|
1423c2fb3b
|
多余代码删除
|
2019-09-05 20:39:12 +08:00 |
lvxinran
|
75dec9d9b8
|
无尽修改
|
2019-09-05 20:26:26 +08:00 |
lvxinran
|
1215fdafdc
|
无尽设置跳过战斗、科技树修改
|
2019-09-05 19:51:07 +08:00 |
lvxinran
|
0d93202a6c
|
血战排行榜
|
2019-09-05 17:34:46 +08:00 |
lvxinran
|
702c7c705e
|
无尽修改
|
2019-09-05 16:57:16 +08:00 |
lvxinran
|
b45af85013
|
GM修改
|
2019-09-05 14:47:08 +08:00 |
lvxinran
|
6030413d3f
|
血战邮件
|
2019-09-05 14:15:20 +08:00 |
lvxinran
|
8129e8cb2c
|
血战排行榜
|
2019-09-05 12:01:47 +08:00 |
lvxinran
|
f823388c75
|
无尽副本血量计算
|
2019-09-05 09:56:18 +08:00 |
lvxinran
|
a960ad504c
|
无尽修改血量
|
2019-09-04 20:50:06 +08:00 |
lvxinran
|
489f906a00
|
法宝升星
|
2019-09-04 19:08:14 +08:00 |
lvxinran
|
2c4a2f2218
|
48、49行为类型修改
|
2019-09-04 16:07:13 +08:00 |
lvxinran
|
234bddfed8
|
发货修改
|
2019-09-04 15:46:49 +08:00 |
wangyuan
|
bc1c252c02
|
delete check amount
|
2019-09-04 15:42:19 +08:00 |
lvxinran
|
509878f535
|
无尽刷小怪
|
2019-09-04 15:40:50 +08:00 |
wangyuan
|
aa316cc206
|
table
|
2019-09-04 15:01:44 +08:00 |
lvxinran
|
ea6a775a3b
|
法宝gm,无尽地图小怪刷新
|
2019-09-04 15:00:25 +08:00 |
zhangshanxue
|
aaf700ca6c
|
问卷
|
2019-09-04 14:25:12 +08:00 |
zhangshanxue
|
734f47cbdb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2019-09-04 11:54:13 +08:00 |
zhangshanxue
|
14ce0d866c
|
问卷调查
|
2019-09-04 11:53:35 +08:00 |
lvxinran
|
3f0bc58b51
|
无尽副本战力显示
|
2019-09-04 11:46:18 +08:00 |
lvxinran
|
4970f48e9d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-04 11:08:51 +08:00 |
lvxinran
|
6de5deaa40
|
我要变强等级限制
|
2019-09-04 11:08:47 +08:00 |
wangyuan
|
bf9bf974c6
|
fix buygood logic
|
2019-09-04 10:37:12 +08:00 |
lvxinran
|
a04ab6ee5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 20:49:18 +08:00 |
lvxinran
|
3caea6d9d2
|
我要变强
|
2019-09-03 20:49:14 +08:00 |
wangyuan
|
26ab22db56
|
activity
|
2019-09-03 20:16:44 +08:00 |
lvxinran
|
b782ee0a8a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 19:41:11 +08:00 |
lvxinran
|
463d63a7fb
|
法宝
|
2019-09-03 19:41:07 +08:00 |
wangyuan
|
3f16d2c1ca
|
scene
|
2019-09-03 19:30:40 +08:00 |
lvxinran
|
c770a95a09
|
修改提交
|
2019-09-03 11:18:39 +08:00 |
lvxinran
|
c5a704d494
|
法宝表对应
|
2019-09-03 11:17:52 +08:00 |
lvxinran
|
bfdfdef554
|
法宝加成
|
2019-09-03 10:47:52 +08:00 |
wangyuan
|
64afe28900
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-03 10:42:38 +08:00 |
wangyuan
|
def88c3daf
|
fix 法宝加成
|
2019-09-03 10:42:19 +08:00 |
zhangshanxue
|
ea47d19a4d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 10:39:21 +08:00 |
zhangshanxue
|
34d6559258
|
绑定手机号
|
2019-09-03 10:38:06 +08:00 |
lvxinran
|
6cd00f0f63
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismana.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismanaRankup.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2019-09-03 10:27:16 +08:00 |
lvxinran
|
61cfce258f
|
无尽副本、法宝
|
2019-09-03 10:24:04 +08:00 |
wangyuan
|
2ed3864e16
|
store
|
2019-09-03 10:23:51 +08:00 |