lvxinran
|
26b0aff262
|
特权到期时间修改
|
2020-05-13 03:49:02 +08:00 |
lvxinran
|
44d7fbbc52
|
十绝阵修改
|
2020-05-11 21:50:11 +08:00 |
lvxinran
|
233d52d1c8
|
BIReanson提交
|
2020-05-11 20:41:19 +08:00 |
zhangshanxue
|
f2e143ed45
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-11 19:31:34 +08:00 |
zhangshanxue
|
77a50f4e5e
|
Task【ID1006177】【新战斗版本】宝物合成
|
2020-05-11 19:31:26 +08:00 |
zhangshanxue
|
f75b7ad1cc
|
Task【ID1006177】【新战斗版本】宝物合成
|
2020-05-11 11:37:55 +08:00 |
lvxinran
|
dd799829db
|
十绝阵 奖励相关
|
2020-05-11 10:09:38 +08:00 |
lvxinran
|
632af72234
|
bug暂时修改
|
2020-05-11 10:08:36 +08:00 |
zhangshanxue
|
2e4da3600d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-11 09:54:42 +08:00 |
zhangshanxue
|
25467b247c
|
Task【ID1006177】【新战斗版本】宝物合成
|
2020-05-11 09:54:33 +08:00 |
wangyuan
|
d394985b52
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2020-05-09 17:08:14 +08:00 |
lvxinran
|
8e5916bfff
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2020-05-11 11:57:47 +08:00 |
lvxinran
|
3323110204
|
RedisKey提交
|
2020-05-11 11:56:18 +08:00 |
wangyuan
|
c0362839a7
|
fix car rank
|
2020-05-09 17:05:00 +08:00 |
wangyuan
|
8829b678d5
|
fix 法宝
|
2020-05-09 11:59:26 +08:00 |
wangyuan
|
930669b6b3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2020-05-09 11:41:08 +08:00 |
lvxinran
|
3526bb12fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-12 05:01:38 +08:00 |
lvxinran
|
e633bc3480
|
添加公会总次数
|
2020-05-12 05:01:34 +08:00 |
wangyuan
|
8ea7539cdf
|
fix car
|
2020-05-09 11:39:57 +08:00 |
wangyuan
|
d00b5f8499
|
fix
|
2020-05-09 10:06:24 +08:00 |
wangyuan
|
09731d81bc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
|
2020-05-09 10:05:39 +08:00 |
wangyuan
|
780c56d06e
|
car rank
|
2020-05-09 10:03:26 +08:00 |
lvxinran
|
6079cc96ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
|
2020-05-09 09:59:29 +08:00 |
lvxinran
|
d9696552ff
|
十绝阵提交
|
2020-05-09 09:53:45 +08:00 |
wangyuan
|
17751438fd
|
fix car
|
2020-05-08 14:16:46 +08:00 |
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
|
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
|
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 |
wangyuan
|
1a7e178016
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-04-24 09:58:00 +08:00 |
wangyuan
|
cd3d831b6b
|
删除七天日后才能领取宝箱
|
2020-04-24 09:57:54 +08:00 |
lvxinran
|
c0b4c7a02d
|
EquipManager存储类型修改
|
2020-04-23 20:55:19 +08:00 |
zhangshanxue
|
c6d30a11fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-23 19:53:03 +08:00 |
zhangshanxue
|
ab36222035
|
数据库对象添加深度复制
|
2020-04-23 19:52:54 +08:00 |
wangyuan
|
658a045270
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-04-22 11:28:49 +08:00 |
wangyuan
|
c8fdd5b47d
|
store
|
2020-04-22 11:28:35 +08:00 |
lvxinran
|
5b18de9941
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-21 17:37:48 +08:00 |
lvxinran
|
d3fbbd89e8
|
队伍存在要分解的妖灵师修改
|
2020-04-21 17:37:42 +08:00 |
zhangshanxue
|
c8534de2de
|
协议号映射
|
2020-04-21 17:07:44 +08:00 |
zhangshanxue
|
d33638ca65
|
协议号映射
|
2020-04-21 17:05:23 +08:00 |
zhangshanxue
|
1915b19735
|
协议号映射
|
2020-04-21 17:04:20 +08:00 |
zhangshanxue
|
07fc753eed
|
协议号映射
|
2020-04-21 16:52:22 +08:00 |
lvxinran
|
b0a9c5bed4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-21 14:16:59 +08:00 |
lvxinran
|
1a337241ea
|
已上阵英雄修改
|
2020-04-21 14:16:55 +08:00 |
wangyuan
|
12996dc439
|
装备套装
|
2020-04-21 11:09:54 +08:00 |
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
|
00f2e2ca03
|
活动系统db替换
|
2020-04-18 14:45:18 +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 |
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 |