wangyuan
|
48d3616061
|
魂印打开
|
2020-05-08 10:23:32 +08:00 |
zhangshanxue
|
21eeee56c8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-07 19:48:21 +08:00 |
zhangshanxue
|
4cbb76e4f7
|
祭祀
|
2020-05-07 19:47:58 +08:00 |
wangyuan
|
bf845f4fbf
|
车轮匹配
|
2020-05-07 18:06:28 +08:00 |
zhangshanxue
|
964729e36e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
|
2020-05-07 16:49:06 +08:00 |
zhangshanxue
|
9660e22f9c
|
祭祀
|
2020-05-07 16:46:21 +08:00 |
wangyuan
|
25392fd49f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-05-07 16:32:04 +08:00 |
wangyuan
|
a0d031e7d8
|
车轮
|
2020-05-07 16:31:28 +08:00 |
lvxinran
|
8abd2af09c
|
战斗逻辑
|
2020-05-07 15:53:26 +08:00 |
lvxinran
|
824c8239c5
|
战斗逻辑
|
2020-05-06 19:51:54 +08:00 |
lvxinran
|
754bdf965b
|
战斗逻辑
|
2020-05-06 16:49:24 +08:00 |
lvxinran
|
c7e7ef4f3d
|
技能重置
|
2020-05-06 15:54:22 +08:00 |
lvxinran
|
a871b0444a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-06 11:53:53 +08:00 |
wangyuan
|
3d0a278fd5
|
暂时删除地图校验
|
2020-05-10 11:21:08 +08:00 |
lvxinran
|
0d59731c5c
|
公会技能 代码提交
|
2020-05-06 11:53:48 +08:00 |
lvxinran
|
3e3219fe05
|
宝物修改
|
2020-05-06 09:58:15 +08:00 |
zhangshanxue
|
3dfe572bfd
|
BUG【ID1007351】【升级豪礼】显示剩余1,不能领取
|
2020-05-05 17:47:18 +08:00 |
wangyuan
|
3d90b3a15d
|
修复七日任务宝箱没有推状态问题
|
2020-05-05 10:38:30 +08:00 |
zhangshanxue
|
3918bdf0ce
|
注释魂印加成
|
2020-04-30 20:12:00 +08:00 |
zhangshanxue
|
ac98784ffb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-30 19:57:28 +08:00 |
zhangshanxue
|
5d1ff52c3d
|
活动提交
|
2020-04-30 19:57:17 +08:00 |
wangyuan
|
2e05d68e13
|
屏蔽魂印
|
2020-04-30 18:31:54 +08:00 |
wangyuan
|
3b6008fb4a
|
hero position
|
2020-05-01 15:06:57 +08:00 |
zhangshanxue
|
5c1946e7f7
|
异常打印
|
2020-04-29 18:17:13 +08:00 |
zhangshanxue
|
3540d350b9
|
日志
|
2020-04-29 14:19:59 +08:00 |
zhangshanxue
|
23334124a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-29 14:15:07 +08:00 |
zhangshanxue
|
8663faf38a
|
日志
|
2020-04-29 14:14:59 +08:00 |
wangyuan
|
ee2d0ddb69
|
七日任务由六天变成七天
|
2020-04-29 11:02:35 +08:00 |
lvxinran
|
8847964740
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-29 06:31:25 +08:00 |
lvxinran
|
ad92a9df33
|
特权修改接口添加
|
2020-04-29 06:31:20 +08:00 |
lvxinran
|
8c09de153d
|
战斗同步
|
2020-05-02 05:12:07 +08:00 |
lvxinran
|
3603493efa
|
宝器相关
|
2020-04-28 21:22:50 +08:00 |
wangyuan
|
4dc323ddc3
|
zero login
|
2020-04-28 17:37:01 +08:00 |
wangyuan
|
230e2dcaeb
|
fix login mission & open shop
|
2020-04-28 17:25:02 +08:00 |
zhangshanxue
|
ea09a2f3d3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-28 15:43:44 +08:00 |
zhangshanxue
|
92bc339987
|
战斗数据添加位置
|
2020-04-28 15:43:31 +08:00 |
wangyuan
|
3f6dadb2aa
|
寻宝刷新
|
2020-04-28 10:03:25 +08:00 |
wangyuan
|
62dca428e9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-04-27 17:18:29 +08:00 |
wangyuan
|
e7de571f02
|
fix jewl
|
2020-04-27 17:14:17 +08:00 |
zhangshanxue
|
109114dcef
|
活动bug
|
2020-04-27 16:48:22 +08:00 |
lvxinran
|
78f86421be
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-27 15:17:00 +08:00 |
lvxinran
|
d4a0550657
|
宝器 每日副本 代码提交
|
2020-04-27 15:15:58 +08:00 |
zhangshanxue
|
0df73d956e
|
gm添加角色
|
2020-04-27 10:41:55 +08:00 |
zhangshanxue
|
213ba2997e
|
配置移除 报错
|
2020-04-27 10:26:37 +08:00 |
zhangshanxue
|
913b1e780f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-27 10:07:49 +08:00 |
zhangshanxue
|
a011e862f2
|
配置移除 报错
|
2020-04-27 10:07:43 +08:00 |
wangyuan
|
d9d3baaa03
|
fix level activity
|
2020-04-27 09:39:48 +08:00 |
wangyuan
|
f20ce8ad39
|
升级达人
|
2020-04-26 16:12:28 +08:00 |
wangyuan
|
49ff1455f0
|
task
|
2020-04-27 18:32:58 +08:00 |
lvxinran
|
47d60b8588
|
itemType增加
|
2020-04-24 10:33:38 +08:00 |