zhangshanxue
|
74eb0a0aea
|
Task【新战斗版本】公会援助
|
2020-05-16 11:28:46 +08:00 |
zhangshanxue
|
903d5d2944
|
Task【新战斗版本】公会援助
|
2020-05-18 05:04:36 +08:00 |
zhangshanxue
|
783120f7eb
|
公会奖励补发 及 机器人编队位置添加
|
2020-05-16 15:35:32 +08:00 |
zhangshanxue
|
feaa5fb4f5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-16 10:33:02 +08:00 |
zhangshanxue
|
238e940beb
|
Task【新战斗版本】公会援助
|
2020-05-16 10:32:50 +08:00 |
lvxinran
|
c81995c849
|
十绝阵掉落修改
|
2020-05-16 08:36:20 +08:00 |
lvxinran
|
17f1f0a639
|
indication修改
|
2020-05-15 21:11:26 +08:00 |
lvxinran
|
94681e4b9d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-15 21:04:47 +08:00 |
lvxinran
|
297bb65445
|
十绝阵 跑马灯添加 领奖修改
|
2020-05-15 21:04:42 +08:00 |
lvxinran
|
48e362291c
|
排名奖励修改
|
2020-05-22 16:20:22 +08:00 |
lvxinran
|
886474443e
|
十绝阵奖励随机提交
|
2020-05-22 15:51:17 +08:00 |
lvxinran
|
bab6d9a004
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-18 22:39:22 +08:00 |
lvxinran
|
4408cd4a17
|
十绝阵奖励相关
|
2020-05-18 22:39:17 +08:00 |
lvxinran
|
1f9756dd59
|
合并
|
2020-05-14 13:43:46 +08:00 |
wangyuan
|
501f5e9d70
|
fix 车迟工会排行没有获取到我的工会排行
|
2020-05-13 15:29:11 +08:00 |
wangyuan
|
324b413a31
|
fix 【开服狂欢】寻宝次数任务,不能完成
|
2020-05-13 15:27:03 +08:00 |
wangyuan
|
e82caddb52
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-05-12 16:06:33 +08:00 |
wangyuan
|
73e7d662aa
|
开活动送充值购买权
|
2020-05-12 16:02:37 +08:00 |
lvxinran
|
89c8a68f3a
|
十绝阵数量级处理、开服3天限制添加
|
2020-05-12 14:55:10 +08:00 |
lvxinran
|
e60facdc36
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-15 00:08:14 +08:00 |
lvxinran
|
633cf81ee6
|
十绝阵 时间 阶段修改
|
2020-05-15 00:07:41 +08:00 |
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 |
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 |
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
|
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 |
zhangshanxue
|
8f981bc846
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-25 10:12:47 +08:00 |
wangyuan
|
52117ad434
|
fix recharge vip
|
2020-03-24 16:21:52 +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
|
b119ff1ce9
|
fix get goods info way
|
2020-03-23 18:42:48 +08:00 |
wangyuan
|
23489baf4a
|
背包内和互动关联的道具,活动到期后道具的优化
|
2020-03-20 18:13:58 +08:00 |
wangyuan
|
d23c8baeed
|
fix 道具直购初始化时间
|
2020-03-20 18:09:05 +08:00 |
lvxinran
|
bf8a3a59d7
|
戒灵秘宝时间剩余
|
2020-03-25 05:01:03 +08:00 |
wangyuan
|
c208cc6bb7
|
fix 直购礼包结束时间计算
|
2020-03-20 14:53:52 +08:00 |
wangyuan
|
b02f07e874
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-20 11:01:19 +08:00 |
wangyuan
|
651c7697c8
|
道具直购
|
2020-03-20 11:00:59 +08:00 |
lvxinran
|
0034193cb4
|
Merge branch 'project0.95'
|
2020-03-19 11:11:17 +08:00 |
lvxinran
|
287720f7d4
|
Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95
|
2020-03-18 17:41:29 +08:00 |
lvxinran
|
d41c1da745
|
系统消息修改,好友全部同意提示
|
2020-03-18 17:41:24 +08:00 |
wangyuan
|
e7d2e52ea4
|
邮件提示
|
2020-03-18 14:40:00 +08:00 |
wangyuan
|
fe37d4fb31
|
任务更新
|
2020-03-17 17:13:52 +08:00 |
zhangshanxue
|
6d4134f2b1
|
猎妖数据过大
|
2020-03-17 17:12:46 +08:00 |
zhangshanxue
|
9f8c1006e2
|
竞技场防御战力未更新
|
2020-03-17 17:10:52 +08:00 |
zhangshanxue
|
abd7ba7804
|
线程重复
|
2020-03-16 11:41:58 +08:00 |
zhangshanxue
|
550ce57411
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-16 11:01:02 +08:00 |
zhangshanxue
|
3900141126
|
线程创建多个
|
2020-03-16 11:00:48 +08:00 |
lvxinran
|
be83f871c0
|
关卡排行热更
|
2020-03-13 15:21:49 +08:00 |
lvxinran
|
288c4d627e
|
战力方法修改
|
2020-03-13 14:47:39 +08:00 |
wangyuan
|
2fa05aade5
|
fix mainrank
|
2020-03-13 14:42:35 +08:00 |
lvxinran
|
566fc26e6d
|
好友友情点修改
|
2020-03-13 14:26:45 +08:00 |
lvxinran
|
50110c8723
|
关卡排行榜修改
|
2020-03-13 11:11:29 +08:00 |
wangyuan
|
1a6b3fdd86
|
启动服务器加索引
|
2020-03-13 10:15:31 +08:00 |
lvxinran
|
082671a2d9
|
5点0点刷新修改
|
2020-03-13 05:10:37 +08:00 |
wangyuan
|
789730d3c7
|
view mem
|
2020-03-12 18:09:20 +08:00 |
lvxinran
|
f268f19439
|
减少日志
|
2020-03-12 15:43:39 +08:00 |
lvxinran
|
4425bfd75b
|
排行榜修改
|
2020-03-12 14:14:36 +08:00 |
wangyuan
|
b2ced29b8c
|
fix rank
|
2020-03-15 21:19:05 +08:00 |
wangyuan
|
c7a280108d
|
fix indication
|
2020-03-10 16:56:21 +08:00 |
wangyuan
|
13b83b1050
|
fix indication
|
2020-03-10 16:54:17 +08:00 |
lvxinran
|
ae294080a6
|
东海寻仙bug修改
|
2020-03-12 10:40:25 +08:00 |
wangyuan
|
0601a3d746
|
'商品type改成id'
|
2020-03-09 17:07:53 +08:00 |
zhangshanxue
|
743e54ceb5
|
cdk全渠道需求
|
2020-03-09 12:39:30 +08:00 |
zhangshanxue
|
498dbbb80f
|
cdk全渠道需求
|
2020-03-09 11:31:28 +08:00 |
zhangshanxue
|
674d88210e
|
cdk全渠道需求
|
2020-03-09 11:02:06 +08:00 |
lvxinran
|
435ed56a0f
|
特权刷新先后顺序
|
2020-03-03 05:04:32 +08:00 |
lvxinran
|
c5d8e67d2e
|
敏感词
|
2020-02-28 16:43:24 +08:00 |
lvxinran
|
9c82a394dd
|
戒灵秘宝升级修改
|
2020-02-29 00:03:07 +08:00 |
lvxinran
|
81eedff9df
|
戒灵秘宝升级修改
|
2020-02-28 12:29:53 +08:00 |
lvxinran
|
0846bdfe2d
|
戒灵秘宝逻辑修改
|
2020-02-28 12:04:02 +08:00 |
lvxinran
|
82c102391b
|
东海寻仙活动
|
2020-02-29 00:01:33 +08:00 |
zhangshanxue
|
f132f859c4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-26 16:54:22 +08:00 |
zhangshanxue
|
c53b6056ed
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组
|
2020-02-26 16:54:12 +08:00 |
lvxinran
|
fb104288e5
|
限时抽卡 寻仙榜修改
|
2020-02-26 14:38:07 +08:00 |
wangyuan
|
66ea5b103f
|
修复设置异妖组件最大等级校验
|
2020-02-25 14:55:14 +08:00 |
wangyuan
|
a3716c257f
|
巅峰赛编队有竞技场进攻变成竞技场防守
|
2020-02-25 11:47:10 +08:00 |
zhangshanxue
|
b0ad311440
|
线上分支回退 改回来
|
2020-02-25 09:57:36 +08:00 |
zhangshanxue
|
1ce01c52e3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 21:45:51 +08:00 |
zhangshanxue
|
57fa2c6652
|
线上分支回退 稍后再改回来
|
2020-02-24 21:45:42 +08:00 |
wangyuan
|
4c327414b9
|
零点刷新
|
2020-02-24 18:26:28 +08:00 |
zhangshanxue
|
9ee9d9f2e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 18:06:02 +08:00 |
zhangshanxue
|
49140cc3d7
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-24 18:05:51 +08:00 |
lvxinran
|
d005fbed44
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 17:14:08 +08:00 |
lvxinran
|
85a1947791
|
刷新充值礼包改为0点
|
2020-02-24 17:14:03 +08:00 |
wangyuan
|
257de4422f
|
修改工会战编队id可动态改
|
2020-02-24 16:21:10 +08:00 |
zhangshanxue
|
f41cf48f3b
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力
|
2020-02-24 15:57:11 +08:00 |
zhangshanxue
|
f3fca07cf2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 15:00:43 +08:00 |
zhangshanxue
|
267f621cc0
|
BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗
|
2020-02-24 15:00:35 +08:00 |
wangyuan
|
4e98fff425
|
fix
|
2020-02-21 18:30:36 +08:00 |
zhangshanxue
|
a7ed154936
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-21 17:55:45 +08:00 |
zhangshanxue
|
441480aed0
|
Task【ID1005747】【猎妖之路优化】 猎妖之路优化内容 死亡猎妖师未下阵
|
2020-02-21 17:55:36 +08:00 |
wangyuan
|
d9b592cc81
|
修复功能按类型开
|
2020-02-21 17:54:41 +08:00 |
zhangshanxue
|
0304f78695
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-21 11:09:57 +08:00 |
zhangshanxue
|
ae01d515ec
|
前端gm指令 后期屏蔽
|
2020-02-20 17:46:26 +08:00 |
zhangshanxue
|
d902f1d34e
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 16:40:08 +08:00 |
zhangshanxue
|
861c6a2ec5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-20 09:34:19 +08:00 |
wangyuan
|
d1bd1ebade
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2020-03-26 00:03:27 +08:00 |
wangyuan
|
d3a84ad2a8
|
商店刷新 & 工会行走
|
2020-03-26 00:02:26 +08:00 |
zhangshanxue
|
4afff38ff3
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 09:34:08 +08:00 |
zhangshanxue
|
44c00e9fcb
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 14:53:20 +08:00 |
zhangshanxue
|
cbfee44510
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 10:58:09 +08:00 |
zhangshanxue
|
95b9eb58d5
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-18 13:52:23 +08:00 |
zhangshanxue
|
f3e27888ee
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 18:19:29 +08:00 |
zhangshanxue
|
624282c742
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 15:51:37 +08:00 |
zhangshanxue
|
b838d8b25b
|
五星成长礼注释
|
2020-02-17 13:55:01 +08:00 |
zhangshanxue
|
67b85decc5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-13 16:13:31 +08:00 |
zhangshanxue
|
da2943dd9a
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 16:13:21 +08:00 |
zhangshanxue
|
38e9e4d5f9
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 10:24:11 +08:00 |
lvxinran
|
337e0ebeec
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-10 09:52:02 +08:00 |
lvxinran
|
8c06c9fed2
|
战力修改
|
2020-02-10 09:51:55 +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 |
lvxinran
|
9331c2ce1f
|
红包过期提示
|
2020-01-16 18:24:26 +08:00 |
lvxinran
|
ed97e5b734
|
戒灵秘宝任务获取
|
2020-01-18 16:14:34 +08:00 |
wangyuan
|
8438d69f40
|
扫荡奖励
|
2020-01-16 15:28:55 +08:00 |
wangyuan
|
3e67fb76ec
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 14:29:30 +08:00 |
lvxinran
|
18ff74bef6
|
寻仙榜加入活动id修改
|
2020-01-18 11:52:04 +08:00 |
wangyuan
|
cf83bf24fb
|
礼包邮件时间
|
2020-01-16 14:28:44 +08:00 |
lvxinran
|
2ea5eddff3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-16 11:09:15 +08:00 |
lvxinran
|
6dc9f0370e
|
特权时间修改
|
2020-01-16 11:09:02 +08:00 |
wangyuan
|
40d339793c
|
活动修改&新手结束
|
2020-01-16 11:00:57 +08:00 |
lvxinran
|
0d5dd5811f
|
红包随机方法修改
|
2020-01-16 10:15:05 +08:00 |
wangyuan
|
f4cd55beb5
|
guildbossj邮件奖励
|
2020-01-15 18:30:01 +08:00 |
wangyuan
|
d02d25acc1
|
guildbossj邮件奖励
|
2020-01-15 18:14:50 +08:00 |
lvxinran
|
7de892ae24
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 17:20:10 +08:00 |
lvxinran
|
7d110d4220
|
五星成长礼修改
|
2020-01-15 17:20:05 +08:00 |
wangyuan
|
02288406d9
|
上次伤害
|
2020-01-15 15:26:03 +08:00 |
lvxinran
|
3721397aa0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:25:52 +08:00 |
lvxinran
|
5f181a4df7
|
发送抢到红包消息
|
2020-01-15 14:25:29 +08:00 |
wangyuan
|
fa7534ce86
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-15 10:02:27 +08:00 |
wangyuan
|
0999804d3c
|
工会boss奖励
|
2020-01-15 10:02:10 +08:00 |
wangyuan
|
4750308d69
|
活动修改发奖
|
2020-01-16 00:08:07 +08:00 |
lvxinran
|
58f1606268
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-14 18:01:28 +08:00 |
lvxinran
|
38e9b4ef3b
|
发送红包奖励改为邮件
|
2020-01-14 18:01:15 +08:00 |
wangyuan
|
6e7a116b72
|
特权、礼包过期邮件通知
|
2020-01-14 14:09:53 +08:00 |
lvxinran
|
4148f0d9ee
|
特权修改时发送挂机奖励
|
2020-01-14 13:41:22 +08:00 |
lvxinran
|
bedd39c0a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-17 17:48:41 +08:00 |
lvxinran
|
2b40c77e68
|
挂机邮件
|
2020-01-17 17:48:36 +08:00 |
lvxinran
|
6e5642857a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:41:10 +08:00 |
lvxinran
|
1e36eb0195
|
特权过期
|
2020-01-15 14:41:00 +08:00 |
wangyuan
|
9dd949808d
|
预告
|
2020-01-13 17:43:42 +08:00 |
wangyuan
|
9b45351ae2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 01:35:36 +08:00 |
wangyuan
|
831653bde4
|
修改到期时间
|
2020-01-16 01:35:21 +08:00 |
wangyuan
|
eda6fd40f4
|
基金
|
2020-01-13 11:10:51 +08:00 |
wangyuan
|
4ef3ca72c9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-13 10:48:11 +08:00 |
wangyuan
|
22262c4bb7
|
刷新商品
|
2020-01-13 10:45:48 +08:00 |
lvxinran
|
04b5b3e39e
|
工会红包 职位添加
|
2020-01-10 16:09:39 +08:00 |
lvxinran
|
9d70702214
|
东海寻仙邮件
|
2020-01-16 00:02:21 +08:00 |
lvxinran
|
7656c76f94
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-11 13:39:04 +08:00 |
lvxinran
|
1329c2b56b
|
抢红包校验
|
2020-01-11 13:38:58 +08:00 |
wangyuan
|
1ab634aeb6
|
商品购买
|
2020-01-09 18:06:45 +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
|
dfb50edaa0
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-09 16:43:56 +08:00 |
wangyuan
|
2596295a30
|
商品购买和刷新
|
2020-01-09 16:43:47 +08:00 |
lvxinran
|
0d2f9e9fe9
|
红包榜,点赞提交
|
2020-01-09 15:59:13 +08:00 |
zhangshanxue
|
8d640e290b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 15:21:10 +08:00 |
zhangshanxue
|
eab36c5f27
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-09 15:20:09 +08:00 |
lvxinran
|
6a7878b8e6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 18:35:42 +08:00 |
wangyuan
|
d9d46dc362
|
hurt value
|
2020-01-08 18:35:28 +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 |
zhangshanxue
|
465c18b000
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 16:18:47 +08:00 |
zhangshanxue
|
da646a7f5c
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-08 16:18:40 +08:00 |
lvxinran
|
7c0ac91a44
|
特权时间修改,红包时间修改
|
2020-01-08 02:36:36 +08:00 |
wangyuan
|
a0fe74fa22
|
vip校验方法名称修改
|
2020-01-07 19:24:55 +08:00 |
wangyuan
|
e67f511a4b
|
表
|
2020-01-07 13:57:23 +08:00 |
wangyuan
|
bd2ec67784
|
清除数据库
|
2020-01-07 11:17:08 +08:00 |
lvxinran
|
04f7ce2fb3
|
活动51
|
2020-01-07 09:51:45 +08:00 |
lvxinran
|
569ce11b46
|
多余更新特权 删除
|
2020-01-06 14:11:01 +08:00 |
lvxinran
|
bcde683628
|
特权修改推送修改
|
2020-01-06 13:41:36 +08:00 |
lvxinran
|
5bb8355fb6
|
东海寻仙结算
|
2020-01-03 17:46:24 +08:00 |
lvxinran
|
4bc5c1d99c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-05 00:15:30 +08:00 |
lvxinran
|
59cb27bbf3
|
特权持续时间
|
2020-01-05 00:15:25 +08:00 |
lvxinran
|
35531d21db
|
增益修改
|
2020-01-06 15:56:32 +08:00 |
zhangshanxue
|
cc4ecd78d2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-03 16:09:59 +08:00 |
zhangshanxue
|
130beba759
|
网络连接bug
|
2020-01-03 16:09:48 +08:00 |
lvxinran
|
2c6eccad1a
|
排行榜,特权修改
|
2020-01-03 15:02:54 +08:00 |
lvxinran
|
a89c0df8bd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:57:39 +08:00 |
lvxinran
|
99496504fb
|
权限修改
|
2020-01-02 16:57:25 +08:00 |
wangyuan
|
9c4ec8e048
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-02 16:57:19 +08:00 |
wangyuan
|
91ca5da378
|
活动检验是否开启
|
2020-01-02 16:57:09 +08:00 |
lvxinran
|
9e542cd1cb
|
监听事件
|
2020-01-02 16:20:07 +08:00 |
lvxinran
|
06fcc21636
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:12:46 +08:00 |
lvxinran
|
12dd7885ce
|
东海寻仙修改,排行榜加字段
|
2020-01-02 16:12:41 +08:00 |
lvxinran
|
39b48bf320
|
限时抽卡修改
|
2019-12-31 18:37:01 +08:00 |
wangyuan
|
b5976884de
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-30 11:07:03 +08:00 |
wangyuan
|
8bbf0233fa
|
抽卡
|
2019-12-30 11:06:47 +08:00 |
wangyuan
|
c4dceec25a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-26 17:21:10 +08:00 |
lvxinran
|
92ccef4f64
|
特权修改
|
2019-12-31 16:25:11 +08:00 |
lvxinran
|
b7a8b65530
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-31 17:48:19 +08:00 |
lvxinran
|
9b179b4e7a
|
次数推送
|
2019-12-31 17:48:12 +08:00 |
lvxinran
|
9664d9400b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 09:50:33 +08:00 |
lvxinran
|
874a7f550c
|
150积分修改
|
2020-01-02 09:50:29 +08:00 |
lvxinran
|
9da415744f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-31 17:32:12 +08:00 |
lvxinran
|
55091f4bae
|
特权修改
|
2019-12-31 17:32:07 +08:00 |
zhangshanxue
|
50e9aee159
|
Task 【ID1005360】 【达人活动】新增寻宝达人等4项达人活动
|
2019-12-29 17:24:30 +08:00 |
zhangshanxue
|
e002dff301
|
删除注释
|
2019-12-29 11:44:17 +08:00 |
zhangshanxue
|
3daf45e1d1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-29 10:43:15 +08:00 |
zhangshanxue
|
88636f881f
|
临时测试数据回退
|
2019-12-29 10:43:06 +08:00 |
wangyuan
|
8af9ad40d0
|
fix goods send time
|
2019-12-28 18:06:43 +08:00 |
wangyuan
|
ccb93a6623
|
修改跳过战斗
|
2019-12-28 15:41:12 +08:00 |
wangyuan
|
b9a4f03c7a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2019-12-28 15:34:58 +08:00 |
wangyuan
|
cee3884bdc
|
指定英雄进行升星
|
2019-12-31 15:26:54 +08:00 |
wangyuan
|
f1cbb7b63e
|
战力排名
|
2019-12-27 15:17:20 +08:00 |
lvxinran
|
176827eec6
|
迷宫派遣事件
|
2019-12-27 15:03:37 +08:00 |
lvxinran
|
0039930f98
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-27 14:57:19 +08:00 |
lvxinran
|
fdc2215c72
|
迷宫抛事件
|
2019-12-27 14:56:52 +08:00 |
wangyuan
|
2608b1009a
|
性别
|
2019-12-27 14:51:42 +08:00 |
wangyuan
|
2e18953817
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-30 13:34:58 +08:00 |
wangyuan
|
edcb0dbff8
|
send fund mail
|
2019-12-30 13:34:50 +08:00 |
lvxinran
|
6a456e7643
|
排行公会图腾
|
2019-12-27 11:45:16 +08:00 |
wangyuan
|
c1a89d6c58
|
pokemon drop hint
|
2019-12-27 10:27:58 +08:00 |
zhangshanxue
|
4302c8df42
|
临时测试数据
|
2019-12-28 17:57:54 +08:00 |
zhangshanxue
|
1957bd54da
|
临时测试数据
|
2019-12-28 17:48:57 +08:00 |
zhangshanxue
|
6f2a47c3ef
|
每分钟事件
|
2019-12-28 16:48:55 +08:00 |
zhangshanxue
|
e248d77b3c
|
【ID1005331】【星级成长礼】
|
2019-12-28 15:41:23 +08:00 |
zhangshanxue
|
2c72864fa5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-28 15:38:55 +08:00 |
zhangshanxue
|
0bc42cbe76
|
【ID1005331】【星级成长礼】
|
2019-12-28 15:38:49 +08:00 |
wangyuan
|
dd062d09c1
|
db clear
|
2019-12-26 17:20:32 +08:00 |
wangyuan
|
dc80e9b288
|
format champion mail content
|
2019-12-26 10:19:20 +08:00 |
zhangshanxue
|
069da0c108
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-26 10:09:12 +08:00 |
zhangshanxue
|
bb75dfbcfa
|
【ID1005331】【星级成长礼】
|
2019-12-26 10:09:06 +08:00 |
lvxinran
|
d775ae739d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-27 00:01:42 +08:00 |
lvxinran
|
69ddecc329
|
限时抽卡校验修改
|
2019-12-27 00:01:37 +08:00 |
wangyuan
|
5e3980c94d
|
异妖颜色
|
2019-12-25 17:49:12 +08:00 |
wangyuan
|
bcb2d8411e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-31 00:05:19 +08:00 |
wangyuan
|
d79d7bf28c
|
log
|
2019-12-31 00:05:16 +08:00 |
lvxinran
|
111a6bd222
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-25 14:07:53 +08:00 |
lvxinran
|
42d27f48cd
|
限时抽卡免费次数
|
2019-12-25 14:07:48 +08:00 |
wangyuan
|
3e453d600c
|
双方信息
|
2019-12-24 16:36:10 +08:00 |
lvxinran
|
dbd1ce04a6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-24 16:01:03 +08:00 |
lvxinran
|
f0863ffbb8
|
建号迷宫寻宝任务
|
2019-12-24 16:00:58 +08:00 |
wangyuan
|
0ed34330e7
|
rank-
|
2019-12-24 15:28:04 +08:00 |
wangyuan
|
eaf1ca45dc
|
rank
|
2019-12-24 15:25:05 +08:00 |
wangyuan
|
e0d67cd3f4
|
FIX WRONG
|
2019-12-24 14:26:28 +08:00 |
wangyuan
|
8b81a3b77a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-24 14:23:28 +08:00 |
wangyuan
|
6b38f4f77e
|
修改战斗计算结果
|
2019-12-24 14:23:23 +08:00 |
lvxinran
|
f777bd44d4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-23 18:04:24 +08:00 |
lvxinran
|
5e817c87ff
|
异妖上阵修改
|
2019-12-23 18:04:13 +08:00 |
wangyuan
|
8811db9292
|
竞猜币兑换
|
2019-12-23 16:51:58 +08:00 |
wangyuan
|
4893430814
|
历史最高排名
|
2019-12-23 15:56:12 +08:00 |
wangyuan
|
6b197aa92e
|
积分显示
|
2019-12-23 15:42:36 +08:00 |
wangyuan
|
8391417bd5
|
修复积分问题
|
2019-12-23 15:06:52 +08:00 |
wangyuan
|
ab6382715f
|
fix结束时间
|
2019-12-23 11:16:02 +08:00 |
wangyuan
|
0501db4714
|
修复更改战斗不生效问题
|
2019-12-23 10:43:15 +08:00 |
lvxinran
|
e823180834
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-21 10:19:24 +08:00 |
lvxinran
|
46a12c155c
|
抽卡修改
|
2019-12-21 10:19:18 +08:00 |
wangyuan
|
1b99d00270
|
coins position
|
2019-12-20 19:31:17 +08:00 |
wangyuan
|
8b249ba977
|
fix data
|
2019-12-20 18:48:04 +08:00 |
zhangshanxue
|
ecd3695037
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-21 05:01:55 +08:00 |
zhangshanxue
|
9ab22c2b24
|
Task【累计充值改成常驻/按日刷新】
|
2019-12-21 05:01:44 +08:00 |
wangyuan
|
fcdba1a654
|
fix champion
|
2019-12-20 15:42:25 +08:00 |
wangyuan
|
c0d2d8d1d6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-20 14:12:06 +08:00 |
wangyuan
|
80fbfd6f7f
|
是否是当前竞猜信息,0
|
2019-12-20 14:12:02 +08:00 |
lvxinran
|
a2cd81dc37
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-20 11:14:36 +08:00 |
lvxinran
|
e266207332
|
寻龙诀上限修改
|
2019-12-20 11:14:30 +08:00 |
zhangshanxue
|
a6ab8bcdc0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-19 15:33:13 +08:00 |
zhangshanxue
|
17db265446
|
TASK【ID1005242】 【选人起名】
|
2019-12-19 15:33:05 +08:00 |
lvxinran
|
790a0916db
|
上限修改
|
2019-12-19 14:48:14 +08:00 |
lvxinran
|
f64e9e3be5
|
迷宫领奖修改
|
2019-12-19 11:55:00 +08:00 |
wangyuan
|
a84a8213d3
|
回收资源
|
2019-12-18 20:17:02 +08:00 |
wangyuan
|
4c47ac3d76
|
修复竞猜数据&回收巅峰赛资源(redis)
|
2019-12-18 20:00:14 +08:00 |
lvxinran
|
94b83a97dc
|
寻龙诀上限
|
2019-12-19 07:29:12 +08:00 |
lvxinran
|
bca69953e7
|
物品数量限制
|
2019-12-19 06:16:01 +08:00 |
lvxinran
|
dfea99d11c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-18 14:06:12 +08:00 |
lvxinran
|
628902282d
|
迷宫寻宝
|
2019-12-18 14:06:07 +08:00 |
wangyuan
|
06a1d9178a
|
删除我的队伍信息
|
2019-12-17 18:00:12 +08:00 |
lvxinran
|
23488394d9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 15:32:45 +08:00 |
lvxinran
|
3f40a3cedf
|
英雄限制,关卡排行榜修改
|
2019-12-17 15:32:41 +08:00 |
wangyuan
|
617c395096
|
fix send mutli goods info
|
2019-12-17 13:53:03 +08:00 |
wangyuan
|
8dc99083d5
|
fix round
|
2019-12-17 12:00:30 +08:00 |
lvxinran
|
295bb58b16
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 10:30:10 +08:00 |
lvxinran
|
39048ea87b
|
好友任务
|
2019-12-17 10:30:01 +08:00 |
zhangshanxue
|
647391a628
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 10:27:19 +08:00 |
zhangshanxue
|
113c7514c8
|
【ID1005229】【特权调整】月卡bugTask
|
2019-12-17 10:27:09 +08:00 |
lvxinran
|
3d6c621618
|
好友任务
|
2019-12-17 10:11:08 +08:00 |
lvxinran
|
73d07c8754
|
刷新必出
|
2019-12-17 09:54:32 +08:00 |
wangyuan
|
f0ae6a5c13
|
add arena id
|
2019-12-16 21:03:29 +08:00 |
wangyuan
|
6d950dc2b7
|
add fix schedule
|
2019-12-16 20:48:40 +08:00 |
wangyuan
|
00cf1b77da
|
add pokemon
|
2019-12-16 20:19:55 +08:00 |
wangyuan
|
1b6811a4be
|
巅峰赛32 4
|
2019-12-16 18:14:10 +08:00 |
lvxinran
|
c6e4fb21d4
|
迷宫寻宝、表格提交
|
2019-12-16 10:37:42 +08:00 |
wangyuan
|
c754c7b063
|
fix
|
2019-12-13 21:18:29 +08:00 |
wangyuan
|
456d88c346
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-13 21:13:54 +08:00 |
wangyuan
|
95b94c95f2
|
巅峰赛数据
|
2019-12-13 21:13:42 +08:00 |
lvxinran
|
19944b9009
|
无尽等级修改,迷宫寻宝派遣加速
|
2019-12-13 18:02:56 +08:00 |
zhangshanxue
|
8e38757d85
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-16 15:40:44 +08:00 |
zhangshanxue
|
678185037f
|
Task【ID1005229】【特权调整】
|
2019-12-16 15:39:44 +08:00 |
zhangshanxue
|
79363da8a6
|
TASK【ID1005286】【达人活动的排行榜优化】
|
2019-12-15 16:15:57 +08:00 |
lvxinran
|
462a035592
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-13 13:44:15 +08:00 |
lvxinran
|
2a62f39194
|
迷宫寻宝提交
|
2019-12-13 13:44:11 +08:00 |
wangyuan
|
f49bfe6f1f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-12 18:32:58 +08:00 |
wangyuan
|
f90796f702
|
推送巅峰赛进度信息
|
2019-12-12 18:32:54 +08:00 |
zhangshanxue
|
cc0f4c51c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 14:00:41 +08:00 |
wangyuan
|
2efcce2614
|
fix bet
|
2019-12-12 13:45:09 +08:00 |
zhangshanxue
|
ea5ec20b2f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 13:37:26 +08:00 |
zhangshanxue
|
926b00a691
|
Task【ID1005229】【特权调整】
|
2019-12-12 13:35:58 +08:00 |
wangyuan
|
4b2d619df6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-12 11:43:01 +08:00 |
wangyuan
|
3b52fbfa63
|
fix globaldata & champion in redis
|
2019-12-12 11:42:56 +08:00 |
zhangshanxue
|
efb20d445e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 11:04:10 +08:00 |
lvxinran
|
cb6702ac8e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-13 17:19:31 +08:00 |
lvxinran
|
aa56fb73b7
|
限时抽卡预告
|
2019-12-13 17:19:26 +08:00 |
zhangshanxue
|
de89214bb4
|
BUG【ID1005727】限时活动排行榜奖励邮件,部分玩家没有收到
|
2019-12-13 15:42:20 +08:00 |
zhangshanxue
|
530fc08267
|
Task【ID1005229】【特权调整】
|
2019-12-12 10:59:33 +08:00 |
zhangshanxue
|
ed7545aba3
|
控制台gm命令 netty关闭流程修改
|
2019-12-11 15:19:38 +08:00 |
lvxinran
|
a82d645499
|
活动预告
|
2019-12-11 15:06:49 +08:00 |
lvxinran
|
867f81836a
|
限时抽卡
|
2019-12-13 08:06:58 +08:00 |
lvxinran
|
0d19b9d141
|
限时抽卡
|
2019-12-09 17:10:23 +08:00 |
lvxinran
|
d9c2104c8c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-09 17:01:25 +08:00 |
lvxinran
|
e8512767c5
|
幸运榜
|
2019-12-09 01:23:10 +08:00 |
lvxinran
|
e268424768
|
幸运榜
|
2019-12-09 00:17:16 +08:00 |
lvxinran
|
4d4ccd4703
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-12-08 01:28:38 +08:00 |
zhangshanxue
|
7670285223
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-08 13:42:07 +08:00 |
zhangshanxue
|
9e9ef767b4
|
【ID1005236】【异妖配件属性修改】
|
2019-12-08 13:41:44 +08:00 |
lvxinran
|
d5bb15ce14
|
限时抽卡排行榜
|
2019-12-07 21:08:19 +08:00 |
zhangshanxue
|
e9833d8142
|
【ID1005236】
【异妖配件属性修改】
|
2019-12-07 17:25:11 +08:00 |
wangyuan
|
206aae7aa3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2019-12-06 20:26:50 +08:00 |
wangyuan
|
b28d31d8ae
|
巅峰赛
|
2019-12-06 20:25:52 +08:00 |
wangyuan
|
f35bd27201
|
fix adventure
|
2019-12-05 14:35:17 +08:00 |
lvxinran
|
f755892340
|
公会一键删除,怪物组为空,获取编队为空,地图id为空处理
|
2019-12-07 21:35:48 +08:00 |
zhangshanxue
|
dbc049a621
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-08 11:42:04 +08:00 |
zhangshanxue
|
217da21fb9
|
打印内存表数据
|
2019-12-08 11:41:23 +08:00 |
zhangshanxue
|
d3f2023ec8
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-08 11:31:19 +08:00 |
zhangshanxue
|
d207c33e28
|
充值接口屏蔽
|
2019-12-08 11:30:53 +08:00 |
wangyuan
|
b75301ba76
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-12-05 11:35:12 +08:00 |
wangyuan
|
954b30e598
|
fix friend
|
2019-12-05 11:35:02 +08:00 |
wangyuan
|
ce74ccb327
|
fix activity
|
2019-12-05 10:44:18 +08:00 |
zhangshanxue
|
8e959d450b
|
活动修改
|
2019-12-04 16:31:16 +08:00 |
lvxinran
|
fa36f01f5a
|
五星成长礼修改
|
2019-12-06 23:46:22 +08:00 |
lvxinran
|
ea908c0c8c
|
任务修改
|
2019-12-06 06:59:58 +08:00 |
lvxinran
|
ca99629f91
|
好友申请列表
|
2019-12-06 04:10:48 +08:00 |
lvxinran
|
83338c7510
|
全部同意好友申请修改
|
2019-12-03 16:36:10 +08:00 |
lvxinran
|
c4522db36a
|
关卡排行榜
|
2019-12-03 16:35:20 +08:00 |
lvxinran
|
c8ddf8c077
|
兽潮排行榜
|
2019-12-17 05:46:08 +08:00 |
wangyuan
|
0ccb33b366
|
fix guild & mail
|
2019-12-03 14:22:21 +08:00 |
wangyuan
|
35bc1e5322
|
fix gm
|
2019-12-03 12:30:34 +08:00 |
wangyuan
|
04d4e8b5e0
|
fix equip
|
2019-12-02 18:31:20 +08:00 |
lvxinran
|
f16a71e03f
|
云梦祈福多期
|
2019-12-17 00:09:13 +08:00 |
lvxinran
|
3c0f236e4d
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-02 10:42:04 +08:00 |
lvxinran
|
bb299e4a22
|
敏感字
|
2019-12-02 10:41:58 +08:00 |
wangyuan
|
bacf2fc3b3
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-12-02 10:36:11 +08:00 |
wangyuan
|
349d5a0145
|
fix init mission
|
2019-12-02 10:25:47 +08:00 |
lvxinran
|
340391ca4d
|
关卡排行榜
|
2019-12-02 10:18:54 +08:00 |
lvxinran
|
74fce2865d
|
排行榜修改
|
2019-12-02 10:17:44 +08:00 |
wangyuan
|
b9d9b69b5a
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-29 18:36:36 +08:00 |
wangyuan
|
824e845089
|
fix minggan
|
2019-11-29 18:36:13 +08:00 |
zhangshanxue
|
7f57df878a
|
redis string获取错误处理
|
2019-11-29 18:34:26 +08:00 |
wangyuan
|
b4995e599c
|
mingan
|
2019-11-29 18:24:10 +08:00 |
zhangshanxue
|
05a00c8187
|
redis string获取错误处理
|
2019-11-29 17:58:52 +08:00 |
zhangshanxue
|
77f1c94850
|
获取gid
|
2019-11-29 17:28:55 +08:00 |
zhangshanxue
|
1a9f356130
|
获取gid
|
2019-11-29 15:56:39 +08:00 |
zhangshanxue
|
513b0418d3
|
获取gid
|
2019-11-29 15:42:23 +08:00 |
zhangshanxue
|
b36d490f9d
|
获取gid
|
2019-11-29 15:40:21 +08:00 |
zhangshanxue
|
0a9c1f7e2a
|
获取gid
|
2019-11-29 15:12:40 +08:00 |
zhangshanxue
|
0d4e4ee5fd
|
获取gid
|
2019-11-29 12:54:10 +08:00 |
wangyuan
|
b1736e56bc
|
fix activity limit
|
2019-11-29 11:37:46 +08:00 |
lvxinran
|
07cfe90a46
|
logic提交
|
2019-11-29 11:20:36 +08:00 |
lvxinran
|
fea1806186
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-29 11:20:01 +08:00 |
lvxinran
|
262be7dde8
|
排行榜修改
|
2019-11-29 11:19:48 +08:00 |
wangyuan
|
87a14e3131
|
Merge branch 'online_1121'
|
2019-11-28 15:16:23 +08:00 |
wangyuan
|
d69db99784
|
rename
|
2019-11-28 15:14:52 +08:00 |
wangyuan
|
8e843c1195
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 14:57:17 +08:00 |
wangyuan
|
14678739f8
|
fix remove hero
|
2019-11-28 14:55:47 +08:00 |
wangyuan
|
7de4d9bc9e
|
set login time
|
2019-11-28 14:38:31 +08:00 |
wangyuan
|
99dc03a323
|
fix check token
|
2019-11-28 13:37:42 +08:00 |
wangyuan
|
d30972da3c
|
session
|
2019-11-28 12:14:15 +08:00 |
lvxinran
|
26016b3bf0
|
add redis key
|
2019-11-28 11:46:41 +08:00 |
wangyuan
|
1bc50cff0c
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 11:34:01 +08:00 |
wangyuan
|
bee222b3c1
|
save
|
2019-11-28 10:53:51 +08:00 |
wangyuan
|
a204fe82b1
|
fix equip
|
2019-11-28 10:48:47 +08:00 |
lvxinran
|
e89ed8c7f0
|
限时抽卡排行
|
2019-11-27 18:09:31 +08:00 |
wangyuan
|
83aac51969
|
reconnect send heart
|
2019-11-27 17:05:09 +08:00 |
lvxinran
|
2c5148e1ed
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-11-27 16:10:41 +08:00 |
lvxinran
|
3eddd7610c
|
战力排行榜
|
2019-11-27 15:43:24 +08:00 |
lvxinran
|
e19da91240
|
战力排行榜部分修改
|
2019-11-27 13:36:11 +08:00 |
lvxinran
|
0de4e4b58d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-27 10:49:11 +08:00 |
lvxinran
|
2e21d0f580
|
排行榜重构修改
|
2019-11-27 10:49:05 +08:00 |
wangyuan
|
b3834ed6ee
|
fix fight
|
2019-11-27 10:33:27 +08:00 |
wangyuan
|
f426a7599d
|
fix guild indicaiton
|
2019-11-27 10:07:40 +08:00 |
zhangshanxue
|
f09bb2b684
|
关卡限制活动
|
2019-11-27 09:52:04 +08:00 |
zhangshanxue
|
e1786b61f7
|
关卡限制活动
|
2019-11-27 09:30:02 +08:00 |
wangyuan
|
4f8bc6ba15
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-26 17:42:38 +08:00 |
wangyuan
|
ad4a55b2ce
|
fight opti
|
2019-11-26 17:41:38 +08:00 |
wangyuan
|
307768615b
|
fix activity
|
2019-11-26 17:22:31 +08:00 |
zhangshanxue
|
f1dc0fcb4c
|
网络模块优化
|
2019-11-26 16:45:29 +08:00 |
zhangshanxue
|
ff0279bddc
|
回退多注释的
|
2019-11-26 15:55:29 +08:00 |
lvxinran
|
7d26a0da25
|
公会宣言长度
|
2019-11-26 15:29:43 +08:00 |
zhangshanxue
|
aab51ba39c
|
五星成长礼按天刷新
|
2019-12-02 18:32:40 +08:00 |
zhangshanxue
|
8c16c9d9c5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-26 11:17:32 +08:00 |
zhangshanxue
|
ff37fa5d2c
|
网络模块优化
|
2019-11-26 11:17:06 +08:00 |
zhangshanxue
|
3cdb228594
|
五星英雄成长礼
|
2019-11-25 23:13:52 +08:00 |
zhangshanxue
|
ba1cb23fb2
|
五星英雄成长礼
|
2019-11-25 22:12:44 +08:00 |
zhangshanxue
|
26f06a54ae
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 21:53:50 +08:00 |
zhangshanxue
|
3cf23b39ff
|
recharge协议合并策略
|
2019-11-25 21:17:29 +08:00 |
zhangshanxue
|
27d7504a0e
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 20:19:12 +08:00 |
zhangshanxue
|
28cb6035d4
|
五星英雄成长礼
|
2019-11-25 20:17:30 +08:00 |
wangyuan
|
f4f4b87dc7
|
fix map mission cal
|
2019-11-25 17:29:11 +08:00 |
lvxinran
|
2c35bf1b38
|
部分表字段初始化代码修改
|
2019-11-25 17:11:21 +08:00 |
wangyuan
|
26309eb920
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-25 16:13:57 +08:00 |
wangyuan
|
df7b1345b6
|
change fight
|
2019-11-25 16:13:24 +08:00 |
lvxinran
|
9c68ef183a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
|
2019-12-10 03:38:00 +08:00 |
lvxinran
|
55549574e4
|
一键异妖GM,一键科技树GM
|
2019-12-10 03:34:16 +08:00 |
wangyuan
|
3785d4c2f1
|
fix
|
2019-11-25 15:36:45 +08:00 |