wangyuan
|
e66fef396d
|
force + fix month card mission
|
2020-04-20 18:22:39 +08:00 |
wangyuan
|
6ecd4fb2ff
|
fix
|
2020-04-20 11:44:03 +08:00 |
wangyuan
|
b50414e1d5
|
公式修改
|
2020-04-20 11:33:01 +08:00 |
zhangshanxue
|
83bd04b84b
|
活动系统db替换
|
2020-04-20 11:16:40 +08:00 |
zhangshanxue
|
04c7cc713d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-18 14:45:29 +08:00 |
zhangshanxue
|
00f2e2ca03
|
活动系统db替换
|
2020-04-18 14:45:18 +08:00 |
wangyuan
|
34789b6b5f
|
sync battle
|
2020-04-17 21:35:22 +08:00 |
wangyuan
|
5bfdf0486c
|
sync battle
|
2020-04-17 20:02:49 +08:00 |
zhangshanxue
|
747f844281
|
db对象
|
2020-04-17 16:38:38 +08:00 |
zhangshanxue
|
4590742ad8
|
db对象自动生成和落盘
|
2020-04-17 16:28:31 +08:00 |
wangyuan
|
8880f655a1
|
修复光环重复计算问题
|
2020-04-17 14:47:57 +08:00 |
wangyuan
|
9a7ff84db5
|
fix 法宝
|
2020-04-17 14:22:26 +08:00 |
lvxinran
|
387a64ec88
|
光环修改
|
2020-04-17 14:09:23 +08:00 |
wangyuan
|
400a23e82f
|
fix hero in team
|
2020-04-17 10:16:11 +08:00 |
lvxinran
|
7ab0a3642a
|
阵营光环修改
|
2020-04-16 19:59:12 +08:00 |
lvxinran
|
12d354559e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-16 16:27:47 +08:00 |
lvxinran
|
079f317dec
|
战斗 修改
|
2020-04-16 16:27:42 +08:00 |
zhangshanxue
|
6058b8140e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-16 16:21:47 +08:00 |
zhangshanxue
|
ab4d885994
|
合成bug
|
2020-04-16 16:15:27 +08:00 |
wangyuan
|
018cddf766
|
战斗数据修改
|
2020-04-16 15:43:55 +08:00 |
lvxinran
|
9fb69b69bf
|
战斗同步
|
2020-04-16 15:10:04 +08:00 |
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 |