lvxinran
|
7d40e3d2fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-16 15:09:03 +08:00 |
wangyuan
|
653579444f
|
fix
|
2020-04-22 15:07:02 +08:00 |
wangyuan
|
8f247ddff2
|
fix item drop
|
2020-04-22 15:06:24 +08:00 |
wangyuan
|
bbd9fe8271
|
team force
|
2020-04-16 11:52:20 +08:00 |
lvxinran
|
a2b94590ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2020-04-15 17:20:23 +08:00 |
lvxinran
|
7650ddf064
|
编队修改
|
2020-04-15 17:19:23 +08:00 |
wangyuan
|
322f1735b7
|
修改魂印计算属性
|
2020-04-15 14:51:11 +08:00 |
wangyuan
|
734b7cb055
|
fix force
|
2020-04-15 14:21:26 +08:00 |
zhangshanxue
|
606a9c10d6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-16 16:08:58 +08:00 |
zhangshanxue
|
c4471cb7f9
|
线程卡死玩家无法进入游戏
|
2020-05-16 16:08:26 +08:00 |
wangyuan
|
6eadad2496
|
fix soul equip check
|
2020-04-14 10:16:34 +08:00 |
wangyuan
|
0257faf2d7
|
fix hero passive
|
2020-04-13 20:02:56 +08:00 |
wangyuan
|
55019f706a
|
check
|
2020-04-13 11:26:32 +08:00 |
wangyuan
|
11b28fab35
|
fix gamesetting
|
2020-04-13 11:15:24 +08:00 |
wangyuan
|
6f05bae898
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-04-13 11:12:00 +08:00 |
wangyuan
|
8372da1907
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SEquipConfig.java
|
2020-04-13 11:10:52 +08:00 |
zhangshanxue
|
1d28d4e51d
|
测试服bug
|
2020-04-11 18:48:02 +08:00 |
lvxinran
|
331e8849ff
|
battlemain修改
|
2020-04-10 18:31:32 +08:00 |
lvxinran
|
4320ed3650
|
战斗修改
|
2020-04-10 18:04:21 +08:00 |
lvxinran
|
86f5c6a74d
|
删除日志
|
2020-04-10 15:29:47 +08:00 |
lvxinran
|
bf2cfc3bcf
|
战斗修改
|
2020-04-10 14:52:41 +08:00 |
lvxinran
|
870b745e05
|
删除法宝职业额外加成
|
2020-04-10 13:39:20 +08:00 |
wangyuan
|
2c937c623e
|
soul equip
|
2020-04-09 20:35:50 +08:00 |
lvxinran
|
fb3c445361
|
英雄属性公式修改
|
2020-04-09 19:54:33 +08:00 |
zhangshanxue
|
b1b01decdb
|
【ID1006916】
【月卡】只开普通月卡,到期后,金额不对
|
2020-05-07 20:00:46 +08:00 |
zhangshanxue
|
ca6ebe6940
|
【ID1006878】【签到】5点刷新后还是第一天的签到奖励
|
2020-04-14 05:10:57 +08:00 |
lvxinran
|
47dbe898dc
|
法宝技能添加
|
2020-04-03 16:59:22 +08:00 |
lvxinran
|
f08d202d70
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-01 16:15:09 +08:00 |
lvxinran
|
78b2823b14
|
法宝等级默认一级
|
2020-05-01 16:15:04 +08:00 |
lvxinran
|
586c38221d
|
特权时间是否可叠加修改,签到bug修改
|
2020-05-01 16:14:33 +08:00 |
zhangshanxue
|
64fabcd9d7
|
Task 【ID1006033】【新战斗版本】后端装备合成系统
|
2020-04-03 11:45:56 +08:00 |
zhangshanxue
|
8e8cc31b08
|
Task 【ID1006033】【新战斗版本】后端装备合成系统
|
2020-04-03 11:45:33 +08:00 |
wangyuan
|
071a6c8aa2
|
刪除魂印
|
2020-04-02 17:18:34 +08:00 |
lvxinran
|
790273b96f
|
删除无用方法
|
2020-04-02 15:23:28 +08:00 |
lvxinran
|
44f8aa82f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-02 15:14:34 +08:00 |
lvxinran
|
d1cf55e9ac
|
法宝重做
|
2020-04-02 15:14:30 +08:00 |
zhangshanxue
|
1794716b5e
|
window 虚拟机attack卡死 原因未知
|
2020-04-02 11:55:42 +08:00 |
zhangshanxue
|
91e20d3e4e
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-06-30 15:51:13 +08:00 |
zhangshanxue
|
252da3274f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-04 05:07:10 +08:00 |
zhangshanxue
|
f1da1afbce
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-05-04 05:07:01 +08:00 |
wangyuan
|
f0cb24a2e3
|
修复切换赛程没有竞猜信息
|
2020-03-30 18:38:41 +08:00 |
wangyuan
|
470a104809
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-30 17:48:05 +08:00 |
wangyuan
|
f409c43ab6
|
巅峰赛时间修改
|
2020-03-30 17:47:54 +08:00 |
wangyuan
|
b7fe433994
|
戒灵秘宝改成直购
|
2020-03-30 17:28:25 +08:00 |
lvxinran
|
eb2259ac92
|
献祭、回溯修改
|
2020-03-27 15:42:18 +08:00 |
lvxinran
|
6b9ac180e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-27 14:04:47 +08:00 |
lvxinran
|
1588a437b1
|
回溯、分解英雄
|
2020-03-27 14:04:42 +08:00 |
zhangshanxue
|
20a2a3c495
|
成就系统
|
2020-03-26 13:56:07 +08:00 |
zhangshanxue
|
ef3bc85d6e
|
充值后再次签到
|
2020-03-25 11:21:49 +08:00 |
zhangshanxue
|
9dde66d590
|
充值后再次签到
|
2020-03-25 10:14:56 +08:00 |