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 |
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 |
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 |
lvxinran
|
bf2cfc3bcf
|
战斗修改
|
2020-04-10 14:52:41 +08:00 |
wangyuan
|
2c937c623e
|
soul equip
|
2020-04-09 20:35:50 +08:00 |
lvxinran
|
fb3c445361
|
英雄属性公式修改
|
2020-04-09 19:54:33 +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
|
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 |
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
|
f1da1afbce
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-05-04 05:07:01 +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
|
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
|
f23d6924fd
|
删除无效代码
|
2020-03-24 10:57:06 +08:00 |
wangyuan
|
651c7697c8
|
道具直购
|
2020-03-20 11:00:59 +08:00 |
wangyuan
|
978bee312b
|
fix guildbossreward table bug
|
2020-03-11 17:15:57 +08:00 |
zhangshanxue
|
74ee4537ee
|
远征优化
|
2020-03-06 13:23:57 +08:00 |
lvxinran
|
0846bdfe2d
|
戒灵秘宝逻辑修改
|
2020-02-28 12:04:02 +08:00 |
zhangshanxue
|
c53b6056ed
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组
|
2020-02-26 16:54:12 +08:00 |
wangyuan
|
6a27656717
|
fix name
|
2020-02-21 18:04:10 +08:00 |
wangyuan
|
d9b592cc81
|
修复功能按类型开
|
2020-02-21 17:54:41 +08:00 |
wangyuan
|
d3a84ad2a8
|
商店刷新 & 工会行走
|
2020-03-26 00:02:26 +08:00 |
zhangshanxue
|
4e5542393c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-02-09 19:53:28 +08:00 |
zhangshanxue
|
4769cadda1
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-09 19:48:55 +08:00 |
wangyuan
|
0d64c47eb1
|
表时间修改
|
2020-01-16 17:53:38 +08:00 |
wangyuan
|
fe4f9c64e5
|
工会boss奖励
|
2020-01-15 10:23:18 +08:00 |
lvxinran
|
27a48fac95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 17:02:03 +08:00 |
lvxinran
|
50093c8c58
|
特权时间修改,点赞物品添加
|
2020-01-09 17:01:53 +08:00 |
wangyuan
|
2596295a30
|
商品购买和刷新
|
2020-01-09 16:43:47 +08:00 |
wangyuan
|
f16f86c7ee
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-08 17:58:46 +08:00 |
wangyuan
|
cb1954d8a2
|
vip权限
|
2020-01-08 17:58:36 +08:00 |
lvxinran
|
101d1bcdf3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 17:19:28 +08:00 |
lvxinran
|
403364b2fd
|
公会红包提交
|
2020-01-08 17:19:23 +08:00 |
wangyuan
|
a0fe74fa22
|
vip校验方法名称修改
|
2020-01-07 19:24:55 +08:00 |
wangyuan
|
e67f511a4b
|
表
|
2020-01-07 13:57:23 +08:00 |
lvxinran
|
2c6eccad1a
|
排行榜,特权修改
|
2020-01-03 15:02:54 +08:00 |