wukang
|
a47395fcea
|
add log
|
2019-06-25 15:37:09 +08:00 |
wukang
|
1e6044b691
|
fix
|
2019-06-25 15:29:49 +08:00 |
jiahuiwen
|
ee1234ad2c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 15:29:36 +08:00 |
jiahuiwen
|
505547fa66
|
爬塔副本信息(试炼副本)
|
2019-06-25 15:28:07 +08:00 |
wangyuan
|
24e9d35228
|
fix 取mission问题
|
2019-06-25 14:21:26 +08:00 |
wangyuan
|
65f9592f68
|
2-->3
|
2019-06-25 13:58:13 +08:00 |
jiahuiwen
|
9eeabfdbe7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 12:08:06 +08:00 |
jiahuiwen
|
f4e77f9ada
|
爬塔副本初版
|
2019-06-25 12:06:41 +08:00 |
wangyuan
|
1116f2de9c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 12:02:48 +08:00 |
wangyuan
|
2b28e768fb
|
地图任务
|
2019-06-25 12:02:10 +08:00 |
wukang
|
7b51289291
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 10:14:55 +08:00 |
wukang
|
7b9eeb78f1
|
add log
|
2019-06-25 10:14:36 +08:00 |
wangyuan
|
c7fdef8058
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 10:12:51 +08:00 |
wangyuan
|
b99522734d
|
地图探索任务
|
2019-06-25 10:12:25 +08:00 |
wukang
|
7295109844
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 10:06:02 +08:00 |
wukang
|
4f5477e3c2
|
副本星级奖励
|
2019-06-25 10:05:49 +08:00 |
wangyuan
|
ba55893b1d
|
装备属性不进行合并
|
2019-06-24 19:36:34 +08:00 |
wangyuan
|
abff2b134e
|
优化地图探索度
|
2019-06-24 19:10:24 +08:00 |
wangyuan
|
8ad8890274
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-24 12:07:13 +08:00 |
wangyuan
|
b1e9d4040d
|
fix read s table
|
2019-06-24 12:06:48 +08:00 |
gaojie
|
71f98c4887
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-24 11:44:10 +08:00 |
gaojie
|
560b97590a
|
赠送体力状态刷新
|
2019-06-24 11:44:06 +08:00 |
wangyuan
|
30ceef6fb2
|
fix
|
2019-06-24 10:38:20 +08:00 |
jiahuiwen
|
3e0801d1ce
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-22 15:56:30 +08:00 |
jiahuiwen
|
c231cdda2f
|
删除多个点
|
2019-06-22 15:56:26 +08:00 |
wangyuan
|
ea9b1eacca
|
fix bug
|
2019-06-21 18:32:43 +08:00 |
wangyuan
|
c66f849854
|
copy mission
|
2019-06-21 18:24:40 +08:00 |
wangyuan
|
c65c4ecd75
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
|
2019-06-21 18:03:53 +08:00 |
wangyuan
|
0e8da41f9c
|
任务合并
|
2019-06-21 18:01:22 +08:00 |
jiahuiwen
|
1f9144ceef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-21 17:33:26 +08:00 |
jiahuiwen
|
fa7c397e5d
|
领取副本星级奖励
|
2019-06-21 17:33:19 +08:00 |
gaojie
|
4c6485abb8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-21 15:07:19 +08:00 |
gaojie
|
2aa329e4d6
|
聊天
|
2019-06-21 15:07:11 +08:00 |
jiahuiwen
|
02e2cff56b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-21 11:40:57 +08:00 |
jiahuiwen
|
11e377d066
|
行为39
|
2019-06-21 11:40:42 +08:00 |
wangyuan
|
d0aa5e79a5
|
lua fight
|
2019-06-21 11:22:35 +08:00 |
wangyuan
|
4fc3cd92c1
|
fix
|
2019-06-20 21:07:26 +08:00 |
wangyuan
|
f1ac732b56
|
conf
|
2019-06-20 21:03:59 +08:00 |
jiahuiwen
|
4ece82248c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-20 19:42:21 +08:00 |
jiahuiwen
|
3d6690ccab
|
二维数组赋值
|
2019-06-20 19:42:17 +08:00 |
wangyuan
|
32480ab936
|
room
|
2019-06-20 18:17:29 +08:00 |
gaojie
|
97241f0f5b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-20 18:12:24 +08:00 |
gaojie
|
17d072baa2
|
fix
|
2019-06-20 18:12:09 +08:00 |
wangyuan
|
97ce706ddf
|
精英怪奖励 & 充值通过邮件发送道具
|
2019-06-20 17:26:39 +08:00 |
wangyuan
|
02d683718c
|
s
|
2019-06-20 16:28:07 +08:00 |
wangyuan
|
ef76a6fff9
|
前置节点&修改精英怪战斗结束
|
2019-06-20 16:26:58 +08:00 |
wangyuan
|
1046bcfb85
|
消耗道具
|
2019-06-20 16:03:26 +08:00 |
wangyuan
|
9836927645
|
fight
|
2019-06-20 15:47:36 +08:00 |
jiahuiwen
|
6433dc032f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-20 15:28:28 +08:00 |
wangyuan
|
689d3ae255
|
精英怪
|
2019-06-20 19:11:00 +08:00 |
jiahuiwen
|
17fdfbd6e4
|
新行为 39 战斗,推任务,生成新的事件点。15 16修改
|
2019-06-20 15:28:21 +08:00 |
wangyuan
|
0983abb99c
|
fix fight key
|
2019-06-20 11:37:12 +08:00 |
wangyuan
|
5b1e55b61e
|
精英怪
|
2019-06-20 11:13:55 +08:00 |
wangyuan
|
eb2c08c614
|
修复VIP错误 & 精英怪
|
2019-06-20 10:21:11 +08:00 |
wangyuan
|
7b38c5206c
|
科技树重置
|
2019-06-19 17:27:55 +08:00 |
gaojie
|
d6c569bdf4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-19 16:49:34 +08:00 |
gaojie
|
178f56bbe5
|
fix
|
2019-06-19 16:49:16 +08:00 |
wangyuan
|
0913f47f9a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-19 16:43:27 +08:00 |
wangyuan
|
8ec551cfc4
|
battle
|
2019-06-19 16:43:02 +08:00 |
gaojie
|
da43de4742
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-19 15:47:23 +08:00 |
gaojie
|
b156df6fb0
|
聊天
|
2019-06-19 15:47:19 +08:00 |
wangyuan
|
72bbe0d046
|
跑马灯 & 工坊科技树
|
2019-06-19 14:48:51 +08:00 |
wangyuan
|
aeba5f5237
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-19 12:34:41 +08:00 |
wangyuan
|
04f439579e
|
工坊科技树升级
|
2019-06-19 12:34:19 +08:00 |
gaojie
|
2f2d597546
|
获得卡牌跑马灯
|
2019-06-18 20:24:57 +08:00 |
gaojie
|
58e335b60e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-18 20:06:40 +08:00 |
gaojie
|
359c250098
|
跑马灯
|
2019-06-18 20:06:37 +08:00 |
lvxinran
|
011d2dba36
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-18 15:45:53 +08:00 |
lvxinran
|
396c8be30c
|
工坊升级材料方式
|
2019-06-18 15:45:12 +08:00 |
gaojie
|
c1c3b15fc9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-18 14:44:58 +08:00 |
gaojie
|
b621f90eb9
|
系统消息
|
2019-06-18 14:44:53 +08:00 |
wangyuan
|
5f2d97cd7a
|
fix
|
2019-06-18 11:50:37 +08:00 |
wangyuan
|
aeb701dc14
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-18 11:33:42 +08:00 |
wangyuan
|
6513469c64
|
修复天赋 & match
|
2019-06-18 11:33:21 +08:00 |
gaojie
|
13c81629c6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java
|
2019-06-18 11:06:23 +08:00 |
gaojie
|
37442f8fab
|
好友
|
2019-06-18 11:04:50 +08:00 |
wangyuan
|
5a7a3f32c7
|
五点任务刷新 & 血战修改
|
2019-06-17 10:22:21 +08:00 |
wangyuan
|
5eb0b7d467
|
五点刷新机制
|
2019-06-15 17:05:50 +08:00 |
wangyuan
|
d4f86e3d0a
|
五点刷新
|
2019-06-15 17:02:34 +08:00 |
wangyuan
|
7a6490cf7c
|
fix
|
2019-06-15 14:50:32 +08:00 |
wangyuan
|
15e6c439af
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
|
2019-06-15 14:44:49 +08:00 |
wangyuan
|
6dcba33b6f
|
每日次数限制统一走vip配置
|
2019-06-15 14:41:47 +08:00 |
wangyuan
|
b4fe2a3916
|
fix
|
2019-06-14 20:45:51 +08:00 |
王永芳
|
9346c5e82b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-14 18:50:01 +08:00 |
王永芳
|
547c632e81
|
在匹配成功,创建房间后发送地图信息
|
2019-06-14 18:49:22 +08:00 |
wangyuan
|
c503817091
|
add
|
2019-06-14 15:27:26 +08:00 |
wangyuan
|
16434c21ce
|
校验地图操作合法性
|
2019-06-14 15:24:10 +08:00 |
wangyuan
|
b0d91d6e6a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-14 14:26:23 +08:00 |
wangyuan
|
0d66b7bcfc
|
修复探索度
|
2019-06-14 14:25:36 +08:00 |
王永芳
|
c62efe0565
|
实现血战到底的基本逻辑,有待调试
|
2019-06-14 13:39:46 +08:00 |
gaojie
|
e6b409644e
|
fix
|
2019-06-14 10:59:32 +08:00 |
gaojie
|
fb1ec3aa66
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2019-06-14 10:08:52 +08:00 |
gaojie
|
b4cdcb2c10
|
刷新好友状态
|
2019-06-14 10:07:29 +08:00 |
wangyuan
|
58e38789a9
|
fix
|
2019-06-13 20:55:56 +08:00 |
wangyuan
|
2348065005
|
fix
|
2019-06-13 20:46:12 +08:00 |
wangyuan
|
378eadb7c1
|
reason
|
2019-06-13 19:49:59 +08:00 |
wangyuan
|
2038e4704f
|
消耗道具原因
|
2019-06-13 19:29:17 +08:00 |
wangyuan
|
1f396ec9a0
|
事件行为38
|
2019-06-13 15:27:17 +08:00 |
wangyuan
|
10f745f37f
|
修复重启服务器自动清档
|
2019-06-13 14:27:55 +08:00 |
wangyuan
|
c92f6cda85
|
delete log
|
2019-06-12 20:59:51 +08:00 |
wangyuan
|
58e8180120
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-12 20:59:38 +08:00 |
wangyuan
|
3eacdc5e9f
|
uid string -> int & 增加天赋异妖
|
2019-06-12 20:59:00 +08:00 |
gaojie
|
9690a3f414
|
好友
|
2019-06-12 20:52:19 +08:00 |
wangyuan
|
88904dd030
|
fix 22
|
2019-06-12 17:19:58 +08:00 |
gaojie
|
40d69786a4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-12 15:09:19 +08:00 |
wangyuan
|
aac9c78a2a
|
fix time
|
2019-06-16 03:13:14 +08:00 |
gaojie
|
7b8adf7bac
|
修改名字GM
|
2019-06-12 15:09:15 +08:00 |
wangyuan
|
ef94bde052
|
fix
|
2019-06-12 10:46:57 +08:00 |
wangyuan
|
5f34470d60
|
maxforce
|
2019-06-12 10:05:14 +08:00 |
wangyuan
|
bb24e8fa25
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-11 20:57:05 +08:00 |
wangyuan
|
a5d006e619
|
indication回复
|
2019-06-11 20:56:31 +08:00 |
gaojie
|
ebb8c6341c
|
好友聊天在线好友推送
|
2019-06-11 18:02:07 +08:00 |
gaojie
|
da4b5a36d3
|
好友接口测试
|
2019-06-11 17:26:05 +08:00 |
gaojie
|
6d39b2db5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2019-06-11 14:22:10 +08:00 |
gaojie
|
bb80506568
|
删除好友,查找好友
|
2019-06-11 14:21:31 +08:00 |
wangyuan
|
5a4308ddb2
|
data
|
2019-06-11 14:17:46 +08:00 |
wangyuan
|
775a8a4763
|
券恢复时间
|
2019-06-11 10:54:27 +08:00 |
wangyuan
|
f6021d8ddc
|
finish eventtype 22
|
2019-06-11 10:44:57 +08:00 |
wangyuan
|
f2955f1e05
|
fix recharge
|
2019-06-11 10:21:26 +08:00 |
wangyuan
|
bc3cbcf40b
|
精英挑战券
|
2019-06-10 20:24:08 +08:00 |
wangyuan
|
6af0168411
|
暂时屏蔽
|
2019-06-10 18:23:20 +08:00 |
wangyuan
|
5f92d2f85a
|
删除无效事件点
|
2019-06-10 17:41:43 +08:00 |
gaojie
|
8c3b106e06
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-10 17:04:01 +08:00 |
gaojie
|
1d08720a5a
|
获取好友申请列表
|
2019-06-10 17:03:57 +08:00 |
wangyuan
|
eac6670f19
|
优化
|
2019-06-10 11:07:54 +08:00 |
gaojie
|
60bd86264b
|
好友
|
2019-06-10 10:37:08 +08:00 |
wangyuan
|
82aeab166e
|
记录历史已买礼包
|
2019-06-06 18:29:41 +08:00 |
wangyuan
|
d94a0ac92f
|
fix
|
2019-06-06 17:48:50 +08:00 |
gaojie
|
e031c72187
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-06 17:24:57 +08:00 |
gaojie
|
87c2649232
|
好友
|
2019-06-06 17:24:48 +08:00 |
wangyuan
|
385ecb048e
|
fix git change
|
2019-06-06 17:18:46 +08:00 |
wangyuan
|
9353c18322
|
购买商品
|
2019-06-06 16:53:49 +08:00 |
wangyuan
|
acdf29d390
|
data
|
2019-06-06 15:33:27 +08:00 |
wangyuan
|
62bb1ebb3c
|
data
|
2019-06-06 14:25:51 +08:00 |
wangyuan
|
0619b20448
|
kick
|
2019-06-05 20:53:05 +08:00 |
wangyuan
|
3600ce66db
|
fix
|
2019-06-05 20:23:56 +08:00 |
wangyuan
|
7cbe91a672
|
修复功能时间
|
2019-06-05 20:15:56 +08:00 |
wangyuan
|
0e8b6eda1d
|
每日任务
|
2019-06-05 19:46:31 +08:00 |
wangyuan
|
3cf9a1dd10
|
fix
|
2019-06-05 17:06:08 +08:00 |
wangyuan
|
f16ca67657
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-05 16:37:46 +08:00 |
wangyuan
|
9de7dac303
|
add
|
2019-06-05 16:34:03 +08:00 |
wangyuan
|
0b4ff12894
|
竞技场
|
2019-06-05 16:29:48 +08:00 |
wangyuan
|
3d32285959
|
fix抽卡次数限制
|
2019-06-05 15:29:15 +08:00 |
wangyuan
|
c3ba340c11
|
fix
|
2019-06-05 15:25:06 +08:00 |
gaojie
|
39a340d99a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-05 14:37:08 +08:00 |
gaojie
|
9b10c7705b
|
聊天
|
2019-06-05 14:37:03 +08:00 |
wangyuan
|
43103c2138
|
取消秘盒抽取次数
|
2019-06-05 11:56:33 +08:00 |
wangyuan
|
68ce55cd67
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-05 11:22:51 +08:00 |
wangyuan
|
0699b42f27
|
删除vip特权 秘盒
|
2019-06-05 11:22:33 +08:00 |
wangyuan
|
682d33f6cd
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-05 11:20:09 +08:00 |
wangyuan
|
36461a5521
|
fix equip
|
2019-06-05 11:19:56 +08:00 |
wangyuan
|
25af037afd
|
fix 离线时间
|
2019-06-05 11:18:45 +08:00 |
wangyuan
|
1367a2e731
|
fix gm
|
2019-06-04 18:27:26 +08:00 |
wangyuan
|
60916bfbf4
|
fix
|
2019-06-04 15:53:19 +08:00 |
wangyuan
|
80d5a64bbe
|
fix data
|
2019-06-04 15:27:07 +08:00 |
wangyuan
|
1d5a206c2c
|
fix
|
2019-06-04 14:40:33 +08:00 |
wangyuan
|
e354951bf7
|
充值活动
|
2019-06-04 10:12:11 +08:00 |
wangyuan
|
c70d69a187
|
fix
|
2019-06-04 10:07:06 +08:00 |
wangyuan
|
90de216e64
|
关卡数据
|
2019-06-03 17:26:20 +08:00 |
wangyuan
|
454ec22a61
|
容错
|
2019-06-03 17:19:31 +08:00 |
wangyuan
|
73dcc75efd
|
boss刷新时间
|
2019-06-03 14:43:43 +08:00 |
wangyuan
|
5429baf7a3
|
luafight打印日志
|
2019-06-03 13:43:32 +08:00 |
wangyuan
|
3069ff56e1
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-05 10:47:28 +08:00 |
wangyuan
|
453b0f58ad
|
修复扣除道具为0情况
|
2019-06-05 10:47:15 +08:00 |
wangyuan
|
41c2435f5f
|
fix item
|
2019-06-05 10:25:55 +08:00 |
wangyuan
|
7f0b05baec
|
force
|
2019-06-02 18:47:34 +08:00 |
jiahuiwen
|
f48f51cc61
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-31 18:24:22 +08:00 |
wangyuan
|
72d2caef50
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-02 17:35:35 +08:00 |
wangyuan
|
e7a38b5243
|
fix
|
2019-06-02 17:35:19 +08:00 |
wangyuan
|
dfa25dc50e
|
vip mission
|
2019-06-02 17:30:17 +08:00 |
wangyuan
|
3b6c11b70f
|
vip mission
|
2019-06-02 17:23:56 +08:00 |
jiahuiwen
|
2897ad08ba
|
类型10 特殊处理
|
2019-05-31 18:24:09 +08:00 |
jiahuiwen
|
93239139c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-31 17:30:55 +08:00 |
jiahuiwen
|
b229e02637
|
行为10 支持 快速战斗
|
2019-05-31 17:30:41 +08:00 |
jiahuiwen
|
e4c1867bae
|
参数
|
2019-05-31 17:01:05 +08:00 |
jiahuiwen
|
124272a244
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-31 16:58:46 +08:00 |
wangyuan
|
77f1968fba
|
function control
|
2019-06-02 16:39:14 +08:00 |
wangyuan
|
d9e33c228a
|
data
|
2019-06-02 16:19:12 +08:00 |
wangyuan
|
e0237b7a93
|
门票校验
|
2019-06-02 16:16:04 +08:00 |
wangyuan
|
6eee4f5688
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-02 15:23:42 +08:00 |
wangyuan
|
5d699a9770
|
fix bug
|
2019-06-02 15:23:25 +08:00 |
wangyuan
|
562ccc2913
|
item
|
2019-06-02 15:22:09 +08:00 |
jiahuiwen
|
d2107490de
|
增加新行为 10
|
2019-05-31 16:58:40 +08:00 |
wangyuan
|
1c479f4727
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-31 14:07:22 +08:00 |
wangyuan
|
9bfb2b61c8
|
fix
|
2019-05-31 14:06:18 +08:00 |
wangyuan
|
53aa7109e4
|
cost
|
2019-05-31 12:30:07 +08:00 |
wangyuan
|
17620657b1
|
fight
|
2019-05-30 20:39:53 +08:00 |
wangyuan
|
693515e205
|
vip gm
|
2019-05-30 20:28:33 +08:00 |
wangyuan
|
b23e76af3a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-30 17:49:24 +08:00 |
wangyuan
|
cab0113763
|
fix store
|
2019-05-30 17:48:01 +08:00 |
wangyuan
|
58e910f05a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-30 17:47:23 +08:00 |
wangyuan
|
7ef0ac846c
|
fix
|
2019-05-30 17:40:03 +08:00 |
gaojie
|
6c1eb57c88
|
失败加一点经验
|
2019-05-30 16:36:05 +08:00 |
gaojie
|
61abedd19c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-30 14:18:41 +08:00 |
gaojie
|
a538955e6a
|
刷新商店道具
|
2019-05-30 14:18:37 +08:00 |
wangyuan
|
56455fefbe
|
计算异妖战力问题
|
2019-05-30 12:58:11 +08:00 |
wangyuan
|
5b977ec2ae
|
fix vip mission
|
2019-05-30 12:01:33 +08:00 |
wangyuan
|
8dc2ac9f1c
|
fix gm
|
2019-05-30 11:03:45 +08:00 |
wangyuan
|
ae910bd0a9
|
mission reward
|
2019-05-30 10:42:44 +08:00 |
wangyuan
|
5117c93a3a
|
初始化战力
|
2019-05-30 10:25:33 +08:00 |
wangyuan
|
84bcbd902c
|
fix 血量
|
2019-05-30 10:21:32 +08:00 |
wangyuan
|
fe567310c5
|
分解妖灵师
|
2019-05-29 17:58:02 +08:00 |
wangyuan
|
7667d21b8f
|
云游商店
|
2019-05-29 17:55:32 +08:00 |
wangyuan
|
3d2bcae72f
|
fix
|
2019-05-29 15:33:11 +08:00 |
wangyuan
|
0c21ef4ad6
|
data
|
2019-05-29 14:36:50 +08:00 |
wangyuan
|
ca2386824b
|
vip
|
2019-05-29 13:55:41 +08:00 |
wangyuan
|
65747a5daf
|
突破返还
|
2019-05-29 13:31:41 +08:00 |
wangyuan
|
c3f08b1321
|
fix bossid
|
2019-05-28 18:26:14 +08:00 |
wangyuan
|
5888a398d7
|
fix
|
2019-05-28 18:18:04 +08:00 |
wangyuan
|
f768d3552f
|
fix
|
2019-05-28 17:58:59 +08:00 |
wangyuan
|
89716f3c90
|
mission
|
2019-05-28 17:56:59 +08:00 |
wangyuan
|
0b4b87a003
|
工坊
|
2019-05-28 16:30:43 +08:00 |
wangyuan
|
09608adc81
|
fix no in db
|
2019-05-28 13:49:08 +08:00 |
wangyuan
|
48251b75a8
|
data
|
2019-05-28 13:48:06 +08:00 |
wangyuan
|
3d86b7d034
|
任务
|
2019-05-28 10:01:23 +08:00 |
wangyuan
|
672121e598
|
任务初版
|
2019-05-27 15:30:56 +08:00 |
wangyuan
|
62d581bf59
|
暂时删除校验挑战次数
|
2019-05-27 11:07:00 +08:00 |
wangyuan
|
21b245ed82
|
暂时提交vip相关
|
2019-05-24 14:12:00 +08:00 |
wangyuan
|
5d0c9224b8
|
挂机
|
2019-05-24 13:39:04 +08:00 |
wangyuan
|
536a5e02f2
|
广播
|
2019-05-20 21:24:24 +08:00 |
jiahuiwen
|
bb7abbe506
|
@Component
|
2019-05-20 16:25:00 +08:00 |
jiahuiwen
|
03c4fc6e1e
|
行为类型 36 推任务,消耗道具,删除指定地图点
|
2019-05-20 16:18:41 +08:00 |
wangyuan
|
b36f434768
|
挂机奖励
|
2019-05-20 15:26:57 +08:00 |
gaojie
|
86858a8c25
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-20 14:07:39 +08:00 |
gaojie
|
ea594dfaa7
|
商店购买
|
2019-05-20 14:07:35 +08:00 |
wangyuan
|
204e2ef785
|
robotlevel
|
2019-05-20 12:00:16 +08:00 |
wangyuan
|
a33d66e0e7
|
异妖加载修改
|
2019-05-20 11:11:29 +08:00 |
wangyuan
|
7c537afd21
|
mail reward
|
2019-05-18 15:30:11 +08:00 |
wangyuan
|
a1c4640fcf
|
异妖
|
2019-05-18 13:07:25 +08:00 |
wangyuan
|
af3d862561
|
修改获取user方式
|
2019-05-17 13:41:07 +08:00 |
wangyuan
|
02f29bd9a0
|
todo vip fix
|
2019-05-17 10:36:44 +08:00 |
wangyuan
|
18c2b0fc21
|
秘盒跨赛季不需要重置次数
|
2019-05-17 10:29:01 +08:00 |
wangyuan
|
03468ddcfc
|
增加怪物是否被击杀
|
2019-05-16 20:35:04 +08:00 |
gaojie
|
cdaf854d55
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-16 20:21:11 +08:00 |
gaojie
|
0119d33b6b
|
商店刷新,分解卡牌
|
2019-05-16 20:21:06 +08:00 |
wangyuan
|
2a0368d75e
|
fix
|
2019-05-16 20:18:03 +08:00 |
wangyuan
|
1e46f4db2b
|
挂机推送
|
2019-05-16 20:16:46 +08:00 |
wangyuan
|
85cceace2b
|
挂机
|
2019-05-16 19:24:32 +08:00 |
wangyuan
|
544ba36938
|
挂机
|
2019-05-16 17:50:40 +08:00 |
gaojie
|
48375cd38f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-16 17:36:48 +08:00 |
gaojie
|
5a9249d29b
|
log
|
2019-05-16 17:36:43 +08:00 |
gaojie
|
115d68181f
|
商店刷新
|
2019-05-16 17:35:32 +08:00 |
wangyuan
|
b9a5cb43ff
|
delete
|
2019-05-16 14:52:58 +08:00 |
wangyuan
|
a9de0f5425
|
挂机初版
|
2019-05-16 14:51:05 +08:00 |
wangyuan
|
820ba8455b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-16 10:02:59 +08:00 |
wangyuan
|
068fa31db8
|
fix hero
|
2019-05-16 10:02:30 +08:00 |
jiahuiwen
|
8548c4f9c2
|
35 推任务,删除指定地图点,生成新的事件点。
|
2019-05-15 15:55:46 +08:00 |
wangyuan
|
9593836b3c
|
错误提示信息
|
2019-05-15 14:01:41 +08:00 |
wangyuan
|
d0cff52e89
|
对手分数
|
2019-05-15 13:54:56 +08:00 |
wangyuan
|
55301d2894
|
fix
|
2019-05-15 12:25:12 +08:00 |
wangyuan
|
8f5c282aaf
|
fix bug
|
2019-05-14 19:51:02 +08:00 |
wangyuan
|
052a589225
|
fix bug
|
2019-05-14 19:45:53 +08:00 |
wangyuan
|
5ba0990bb0
|
fix
|
2019-05-14 19:08:57 +08:00 |
wangyuan
|
85cbae09db
|
计算属性
|
2019-05-14 18:17:00 +08:00 |
wangyuan
|
b25d7067ba
|
time control
|
2019-05-14 16:41:21 +08:00 |
wangyuan
|
dba44383fe
|
数据互换
|
2019-05-14 15:17:51 +08:00 |
wangyuan
|
b39de8d120
|
积分变换
|
2019-05-14 14:50:52 +08:00 |
wangyuan
|
6b34c37eaa
|
时间控制功能
|
2019-05-14 14:28:47 +08:00 |
wangyuan
|
4d0bdf2920
|
fix
|
2019-05-14 13:51:15 +08:00 |
wangyuan
|
e68ea3591e
|
秘盒 增加今日抽取次数限制
|
2019-05-14 13:50:34 +08:00 |
wangyuan
|
329746439d
|
零点执行
|
2019-05-14 11:31:11 +08:00 |
wangyuan
|
0d5010107d
|
竞技场放回数据
|
2019-05-14 11:12:46 +08:00 |
wangyuan
|
27441582f6
|
score bug
|
2019-05-13 20:00:54 +08:00 |
wangyuan
|
deab593bc3
|
fix null
|
2019-05-13 18:35:55 +08:00 |
wangyuan
|
3fd33d0068
|
fix redis over times
|
2019-05-13 18:31:58 +08:00 |
wangyuan
|
36fbfa28e7
|
删除测试数据
|
2019-05-13 18:25:58 +08:00 |
wangyuan
|
f213e4cdd1
|
错误信息提示
|
2019-05-13 18:23:22 +08:00 |
wangyuan
|
4d08e5e0ce
|
修复装备
|
2019-05-13 18:16:06 +08:00 |
wangyuan
|
a0a23e4d7c
|
fix
|
2019-05-13 18:03:39 +08:00 |
wangyuan
|
e45fc9a2e8
|
fix
|
2019-05-13 17:59:22 +08:00 |
wangyuan
|
41ec525158
|
自动切赛季
|
2019-05-13 17:41:53 +08:00 |
wangyuan
|
b467cd23f2
|
fix
|
2019-05-13 16:10:41 +08:00 |
wangyuan
|
398b485c69
|
秘盒时间控制
|
2019-05-13 16:10:03 +08:00 |
wangyuan
|
69d2ba019d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-13 15:33:29 +08:00 |
wangyuan
|
1ebb90b31b
|
竞技场
|
2019-05-13 15:28:03 +08:00 |
gaojie
|
9870d36663
|
充值商店刷新次数
|
2019-05-13 15:26:38 +08:00 |
gaojie
|
be46197ed2
|
fix
|
2019-05-13 15:05:06 +08:00 |
gaojie
|
04de59ded6
|
商店刷新
|
2019-05-13 15:01:38 +08:00 |
wangyuan
|
c5b27e63d4
|
fix
|
2019-05-11 17:28:44 +08:00 |
wangyuan
|
ac3585efc3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java
|
2019-05-11 17:27:25 +08:00 |
wangyuan
|
16294cfe15
|
秘盒 & 英雄修改
|
2019-05-11 17:26:02 +08:00 |
gaojie
|
08935d2c7e
|
fix
|
2019-05-11 17:25:33 +08:00 |
gaojie
|
93beaecf89
|
获取商店信息
|
2019-05-11 17:23:31 +08:00 |
gaojie
|
9f25f8bd12
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-05-11 11:46:53 +08:00 |
gaojie
|
56e3a60a38
|
fix
|
2019-05-11 11:44:50 +08:00 |
wangyuan
|
ec99e122cd
|
arena
|
2019-05-11 11:41:02 +08:00 |
wangyuan
|
983d1d85ce
|
属性修改
|
2019-05-11 11:39:45 +08:00 |
wangyuan
|
0d473165c8
|
fight
|
2019-05-10 19:31:20 +08:00 |
wangyuan
|
4eb0121eef
|
竞技场初版
|
2019-05-10 17:44:44 +08:00 |
wangyuan
|
6282689e52
|
fixs
|
2019-05-10 09:51:23 +08:00 |
wangyuan
|
211c1d325d
|
战斗时间
|
2019-05-09 19:19:30 +08:00 |
wangyuan
|
d84b58ac5b
|
漏提交SGlobalSystemConfig;
|
2019-05-09 17:58:42 +08:00 |
wangyuan
|
56d87dbaf6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-09 17:49:42 +08:00 |
wangyuan
|
7aa786221b
|
fight
|
2019-05-09 17:49:23 +08:00 |
gaojie
|
d54335ed93
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-08 16:30:59 +08:00 |
gaojie
|
5a856fd5c8
|
掉落走邮件
|
2019-05-08 16:30:12 +08:00 |
wangyuan
|
aafb262d83
|
装备评分日志
|
2019-05-08 15:40:25 +08:00 |
wangyuan
|
fdef8df986
|
fix bug
|
2019-05-07 20:18:50 +08:00 |
wangyuan
|
51df1cd10e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-07 20:01:17 +08:00 |
wangyuan
|
1be3f7ce3e
|
fight check
|
2019-05-07 20:01:07 +08:00 |
gaojie
|
ef12ae1b20
|
fix
|
2019-05-07 16:47:02 +08:00 |
gaojie
|
174da1a2db
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-07 16:33:03 +08:00 |
gaojie
|
e2554fc583
|
英雄上限处理
|
2019-05-07 16:32:59 +08:00 |
wangyuan
|
954d3168a9
|
装备属性必出
|
2019-05-07 15:41:21 +08:00 |
wangyuan
|
e103042663
|
英雄属性加成计算规则
|
2019-05-07 14:33:36 +08:00 |
wangyuan
|
c2ab44a181
|
装备重铸确认
|
2019-05-07 11:21:45 +08:00 |
wangyuan
|
f85bdde48e
|
buffer
|
2019-05-05 20:41:48 +08:00 |
wangyuan
|
edddf28ffb
|
fix gm
|
2019-05-05 13:37:26 +08:00 |
wangyuan
|
d3180bfc5c
|
fix gm
|
2019-04-30 17:12:17 +08:00 |
wangyuan
|
8842924478
|
equip掉落属性数值修改
|
2019-04-30 14:30:56 +08:00 |
jiahuiwen
|
e600edbeb3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-30 13:54:29 +08:00 |
jiahuiwen
|
7b5f34ba4b
|
完成任务奖励 和 完成事件分开
|
2019-04-30 13:53:59 +08:00 |
wangyuan
|
936406315c
|
数据提交
|
2019-04-30 11:55:51 +08:00 |
gaojie
|
ac32c58249
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-30 11:41:30 +08:00 |
gaojie
|
62ab9068a5
|
装备背包达上限 邮件发送
|
2019-04-30 11:41:19 +08:00 |
wangyuan
|
5a55ad0030
|
fix
|
2019-04-30 11:03:41 +08:00 |
wangyuan
|
31a56a778a
|
gm change
|
2019-04-30 11:00:58 +08:00 |
wangyuan
|
7d40c34067
|
fix item
|
2019-04-30 10:03:27 +08:00 |
wangyuan
|
5a0d87e4f3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-30 10:00:56 +08:00 |
gaojie
|
b7a314b27d
|
获得道具数量增量返回前端
|
2019-04-30 09:59:39 +08:00 |
wangyuan
|
3d0e7cebc6
|
fix null
|
2019-04-30 09:49:40 +08:00 |
gaojie
|
a00a5f4597
|
一次合成碎片上限处理
|
2019-04-29 20:45:41 +08:00 |
gaojie
|
37bb6046df
|
fix
|
2019-04-29 20:31:12 +08:00 |
gaojie
|
0bae114cc9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/ItemConfig.txt
|
2019-04-29 20:23:43 +08:00 |
gaojie
|
22b68a1bf2
|
道具上限
|
2019-04-29 20:21:30 +08:00 |
jiahuiwen
|
db03f026cd
|
异妖传到前端
|
2019-04-29 18:47:36 +08:00 |
jiahuiwen
|
c0949548df
|
竞速 记录异妖
|
2019-04-29 18:46:08 +08:00 |
jiahuiwen
|
ff7a87f8fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-29 18:38:58 +08:00 |
jiahuiwen
|
7637c763ad
|
少加个注解
|
2019-04-29 18:38:52 +08:00 |
wangyuan
|
1aaddcb350
|
fix地图排行数据
|
2019-04-29 18:17:04 +08:00 |
wangyuan
|
39734e733f
|
解决排行榜问题
|
2019-04-29 17:52:50 +08:00 |
wangyuan
|
f2f08a0613
|
血量初始值修改
|
2019-04-29 16:57:24 +08:00 |
wangyuan
|
ac20fac6d7
|
fix
|
2019-04-29 16:47:08 +08:00 |
wangyuan
|
4b86edcecb
|
打开校验开关
|
2019-04-29 16:46:40 +08:00 |
jiahuiwen
|
519679a116
|
区分战斗行为
|
2019-04-29 16:15:26 +08:00 |
jiahuiwen
|
6992512d3b
|
优化地图行为,并增加三个新行为
|
2019-04-29 15:31:46 +08:00 |
wangyuan
|
ac596f4612
|
redis key
|
2019-04-28 17:29:04 +08:00 |
wangyuan
|
9968986c49
|
areaID 赋值
|
2019-04-28 17:26:43 +08:00 |
jiahuiwen
|
61446dfd55
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-28 14:26:38 +08:00 |
jiahuiwen
|
503bf13c89
|
地图判断 3星 bug
|
2019-04-28 14:26:31 +08:00 |
wangyuan
|
0f4fe589a8
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-28 10:06:56 +08:00 |
wangyuan
|
dae316fa3e
|
check
|
2019-04-28 10:06:41 +08:00 |
gaojie
|
5ade3c345e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-28 10:06:20 +08:00 |
gaojie
|
41470ac7e2
|
邮件
|
2019-04-28 10:06:13 +08:00 |
jiahuiwen
|
1a67866d2f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-26 15:25:33 +08:00 |
wangyuan
|
05fd42448b
|
异妖进阶消耗数据读取问题
|
2019-04-26 16:56:52 +08:00 |
wangyuan
|
0132a2ff2c
|
修复挂机奖励和地图探索optionId问题
|
2019-04-26 16:31:09 +08:00 |
jiahuiwen
|
c76e2278d1
|
通关星级替换
|
2019-04-26 15:25:21 +08:00 |
gaojie
|
9e5c23315c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 21:03:15 +08:00 |
gaojie
|
66d4f6279c
|
升级
|
2019-04-25 21:03:07 +08:00 |
wangyuan
|
8760187393
|
等级校验
|
2019-04-25 20:23:07 +08:00 |
gaojie
|
44f60a050e
|
关卡等级限制
|
2019-04-25 20:15:53 +08:00 |
gaojie
|
85636fdabf
|
名字合法性验证
|
2019-04-25 18:29:08 +08:00 |
gaojie
|
16ff5cc025
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 18:18:56 +08:00 |
gaojie
|
d6b0063066
|
名字
|
2019-04-25 18:18:51 +08:00 |
jiahuiwen
|
064ddce83f
|
200
|
2019-04-25 17:39:47 +08:00 |
jiahuiwen
|
e9da699d03
|
从1开始
|
2019-04-25 17:32:41 +08:00 |
jiahuiwen
|
b05cb6edd6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 17:31:18 +08:00 |
jiahuiwen
|
30b39089c1
|
地图读200开始
|
2019-04-25 17:30:53 +08:00 |
wangyuan
|
a699b4e4dd
|
挂机
|
2019-04-25 17:04:36 +08:00 |
jiahuiwen
|
cfd59bebba
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 15:40:27 +08:00 |
jiahuiwen
|
4c47d1c36e
|
时间从小到大
|
2019-04-25 15:40:12 +08:00 |
gaojie
|
aa89c05d4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
# conf/server/RewardGroup.txt
|
2019-04-25 14:55:58 +08:00 |
gaojie
|
b09ba9646e
|
随机名字
|
2019-04-25 14:55:06 +08:00 |
jiahuiwen
|
42ee3ccc12
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 14:47:52 +08:00 |
jiahuiwen
|
fac16f9dfd
|
竞速排行bug
|
2019-04-25 14:47:38 +08:00 |
wangyuan
|
8a35e83c47
|
进地图要给最大血量
|
2019-04-25 14:40:13 +08:00 |
jiahuiwen
|
aa3c588b87
|
配置表提交
|
2019-04-25 10:16:33 +08:00 |
jiahuiwen
|
b9e4cc3626
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 18:31:18 +08:00 |
jiahuiwen
|
f94b50b54c
|
时间判断
|
2019-04-24 18:31:11 +08:00 |
gaojie
|
7bd38e7bd4
|
fix
|
2019-04-24 18:18:03 +08:00 |
wangyuan
|
07018af62e
|
分解装备
|
2019-04-24 18:17:04 +08:00 |
jiahuiwen
|
9c035670ea
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 16:10:04 +08:00 |
wangyuan
|
b0fe7b66e2
|
挂机
|
2019-04-25 15:15:35 +08:00 |
jiahuiwen
|
5cf78e6bc9
|
删除不要的字段
|
2019-04-24 16:09:53 +08:00 |
wangyuan
|
c4e6b0252e
|
活动 &玩家默认名称
|
2019-04-25 14:36:41 +08:00 |
gaojie
|
a5f6bf571d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 15:01:49 +08:00 |
gaojie
|
badb33e936
|
玩家升级 以及通关关卡
|
2019-04-24 15:01:46 +08:00 |
gaojie
|
736e14eada
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 14:18:34 +08:00 |
wangyuan
|
dcde6fae0a
|
删除装备
|
2019-04-25 13:53:03 +08:00 |
gaojie
|
888761b2f0
|
分解
|
2019-04-24 14:18:29 +08:00 |
gaojie
|
a4815854e0
|
静态表数据
|
2019-04-24 13:45:46 +08:00 |
gaojie
|
2ad5e17afb
|
道具分解
|
2019-04-24 10:44:08 +08:00 |
wangyuan
|
88595a257a
|
table
|
2019-04-23 18:30:39 +08:00 |
wangyuan
|
b21808a080
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-04-23 18:22:59 +08:00 |
wangyuan
|
4289588f92
|
活动
|
2019-04-23 18:22:02 +08:00 |
gaojie
|
ade79c00a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-23 17:28:27 +08:00 |
gaojie
|
891d6c0ece
|
功能开关
|
2019-04-23 17:28:23 +08:00 |
jiahuiwen
|
a0a9ae3b8d
|
任务完成时间
|
2019-04-23 09:43:48 +08:00 |
wangyuan
|
ae0e068b35
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-22 19:26:29 +08:00 |
wangyuan
|
eaa1767284
|
活动
|
2019-04-22 19:25:03 +08:00 |
gaojie
|
fbc7c719e2
|
英雄合成
|
2019-04-22 17:39:06 +08:00 |
gaojie
|
f135001dac
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-22 16:12:50 +08:00 |
gaojie
|
5e3e632282
|
合成英雄
|
2019-04-22 16:09:24 +08:00 |
jiahuiwen
|
295bb4f70a
|
开地图点支持开多个
|
2019-04-22 15:11:10 +08:00 |
jiahuiwen
|
fbafd3f227
|
购买挑战次数
|
2019-04-22 11:51:31 +08:00 |
jiahuiwen
|
7ba0084c23
|
血量负数
|
2019-04-20 17:56:19 +08:00 |
jiahuiwen
|
0d308bc58c
|
team 顺序
|
2019-04-20 16:55:24 +08:00 |
jiahuiwen
|
f4cdbdcf15
|
快速战斗阵亡 复活bug
|
2019-04-20 16:02:47 +08:00 |
jiahuiwen
|
e175d7db38
|
购买挑战次数bug
|
2019-04-20 14:53:53 +08:00 |
wangyuan
|
39404df90d
|
修复随机道具数量为0
|
2019-04-19 20:05:58 +08:00 |
jiahuiwen
|
dbb8413947
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 19:55:46 +08:00 |
jiahuiwen
|
cacd625577
|
快速战斗bug
|
2019-04-19 19:55:40 +08:00 |
wangyuan
|
8c51272314
|
修复AdventureStateInfo 入库
|
2019-04-19 19:28:57 +08:00 |
jiahuiwen
|
6fef8b2297
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-19 19:18:19 +08:00 |
jiahuiwen
|
a8cbb93ccb
|
快速战斗
|
2019-04-19 19:17:23 +08:00 |
wangyuan
|
8910551a51
|
地图吃buffer直接覆盖
|
2019-04-19 18:58:13 +08:00 |
wangyuan
|
587cacade2
|
地图探索度
|
2019-04-19 18:54:29 +08:00 |
gaojie
|
ed17b87905
|
fix
|
2019-04-19 18:37:49 +08:00 |
gaojie
|
46ff11b41d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 18:21:22 +08:00 |
gaojie
|
9e00bc05f9
|
物品分解
|
2019-04-19 18:21:18 +08:00 |
jiahuiwen
|
0367c5fbcb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 18:16:16 +08:00 |
jiahuiwen
|
419c1b08c6
|
买挑战次数
|
2019-04-19 18:16:11 +08:00 |
wangyuan
|
db6e3014ca
|
更新地图buffer消失机制
|
2019-04-19 18:00:40 +08:00 |
jiahuiwen
|
ecc3f992e3
|
登录时间
|
2019-04-19 17:48:54 +08:00 |
wangyuan
|
4ac7c99b2a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-19 17:13:03 +08:00 |
wangyuan
|
425b13e291
|
修改血量
|
2019-04-19 17:12:29 +08:00 |
jiahuiwen
|
a12544232c
|
行为类型17 不推任务
|
2019-04-19 16:44:38 +08:00 |
jiahuiwen
|
2bece3f31d
|
任务奖励改数组
|
2019-04-19 15:20:34 +08:00 |
jiahuiwen
|
7176513785
|
改名字
|
2019-04-19 14:43:35 +08:00 |
wangyuan
|
ebbd6dfb8e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-19 14:24:40 +08:00 |
wangyuan
|
1b39896daf
|
血量 & 挂机显示离线时间
|
2019-04-19 14:24:28 +08:00 |
jiahuiwen
|
705fc6d7c4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 11:35:04 +08:00 |
jiahuiwen
|
bdb1de4a3f
|
地图修改
|
2019-04-19 11:34:59 +08:00 |
gaojie
|
986c064908
|
首通奖励
|
2019-04-19 10:32:27 +08:00 |
jiahuiwen
|
dd3ca2829c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-18 14:55:03 +08:00 |
jiahuiwen
|
3be70ed3e7
|
每天重置副本次数
|
2019-04-18 14:54:23 +08:00 |
mashiyu
|
ba1a376f9a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-18 13:25:12 +08:00 |
mashiyu
|
67e8ce4dc5
|
多拨怪异常处理
|
2019-04-18 13:25:01 +08:00 |
wangyuan
|
4c17e74472
|
出图英雄血量重置不计算食物buffer
|
2019-04-18 10:20:34 +08:00 |
mashiyu
|
a69680944a
|
提交
|
2019-04-18 09:56:18 +08:00 |
mashiyu
|
d302961cd3
|
图内给奖励
|
2019-04-17 22:42:36 +08:00 |
mashiyu
|
9e56ae7df6
|
出图不保存血量
|
2019-04-17 21:46:22 +08:00 |
mashiyu
|
4f2239f7c9
|
关卡不不记录血量
|
2019-04-17 21:32:58 +08:00 |
jiahuiwen
|
a8717a73a9
|
掉落改数组
|
2019-04-17 19:20:40 +08:00 |
jiahuiwen
|
29024fae3e
|
配置表提交
|
2019-04-17 19:06:44 +08:00 |
jiahuiwen
|
8a72ea0037
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 19:02:50 +08:00 |
jiahuiwen
|
d89b59021f
|
副本扫荡,购买挑战次数,获取排行榜
|
2019-04-17 19:02:33 +08:00 |
gaojie
|
93dd29348d
|
fix
|
2019-04-17 18:36:38 +08:00 |
gaojie
|
7e1bce2c83
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 18:02:55 +08:00 |
gaojie
|
87616377a1
|
升级加体力
|
2019-04-17 18:02:51 +08:00 |
wangyuan
|
e4def0f68b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# conf/server/GameSetting.txt
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-17 15:04:56 +08:00 |
wangyuan
|
36f85848af
|
探索度
|
2019-04-17 15:02:23 +08:00 |
jiahuiwen
|
af186980d4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-17 14:37:12 +08:00 |
jiahuiwen
|
42451d1c36
|
找回代码
|
2019-04-17 14:29:24 +08:00 |
gaojie
|
8466795034
|
等级升级,体力恢复
|
2019-04-17 12:11:15 +08:00 |
gaojie
|
2760830091
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 11:10:00 +08:00 |
gaojie
|
c465fd0dec
|
关卡掉落进背包
|
2019-04-17 11:09:55 +08:00 |
wangyuan
|
7307a444f4
|
修复挂机key
|
2019-04-17 09:47:16 +08:00 |
gaojie
|
1f7d626309
|
fix
|
2019-04-16 21:04:09 +08:00 |
gaojie
|
f11ca34c98
|
关卡状态
|
2019-04-16 21:00:14 +08:00 |
wangyuan
|
60026e5384
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-16 20:02:00 +08:00 |
wangyuan
|
1074c36d6f
|
地图探索度 删除无效协议
|
2019-04-16 20:01:48 +08:00 |
jiahuiwen
|
1169dffab5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-16 19:31:22 +08:00 |
jiahuiwen
|
e8b7f7d168
|
无用导入
|
2019-04-16 19:31:07 +08:00 |
wangyuan
|
3a9daeb6eb
|
探索度 删除不必要的协议
|
2019-04-16 17:59:52 +08:00 |
gaojie
|
fc76607c69
|
恢复体力
|
2019-04-16 17:34:32 +08:00 |
gaojie
|
befccd4e38
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-16 14:10:37 +08:00 |
gaojie
|
2a36654ab1
|
多波怪物
|
2019-04-16 14:10:29 +08:00 |
wangyuan
|
5e27f52711
|
''
|
2019-04-16 13:50:59 +08:00 |
wangyuan
|
226a50f33d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-16 10:26:17 +08:00 |
wangyuan
|
b07a7f5673
|
挂机
|
2019-04-16 10:26:03 +08:00 |
wangyuan
|
ae9a7bc1ee
|
挂机
|
2019-04-16 10:25:45 +08:00 |
jiahuiwen
|
8e39b783f1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/RewardGroup.txt
# conf/server/RewardItemConfig.txt
|
2019-04-15 20:36:06 +08:00 |
jiahuiwen
|
9a7f180663
|
配置表提交
|
2019-04-15 20:35:40 +08:00 |
gaojie
|
4a35cfa272
|
体力
|
2019-04-15 20:35:15 +08:00 |
gaojie
|
ac7ffe50ec
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-15 19:18:59 +08:00 |
gaojie
|
6a111ddfb9
|
fix
|
2019-04-15 19:18:56 +08:00 |
jiahuiwen
|
fdac21e724
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-15 18:04:49 +08:00 |
jiahuiwen
|
a35c93b6fb
|
地图修改
|
2019-04-15 18:03:48 +08:00 |
gaojie
|
761776f126
|
fix
|
2019-04-15 16:34:01 +08:00 |
gaojie
|
b3a9cfc288
|
阵容校验
|
2019-04-15 16:21:29 +08:00 |
gaojie
|
7a0690f520
|
扫荡
|
2019-04-15 16:07:48 +08:00 |
gaojie
|
d6a2b84015
|
fix
|
2019-04-13 15:53:02 +08:00 |
gaojie
|
06d665e02c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-13 15:10:24 +08:00 |
jiahuiwen
|
e65f633023
|
探索修改
|
2019-04-12 20:57:15 +08:00 |
jiahuiwen
|
4ba216f2e3
|
探索修改
|
2019-04-12 19:42:32 +08:00 |
gaojie
|
ce1cd08478
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
conf/server/MonsterGroup.txt
|
2019-04-12 18:28:09 +08:00 |
gaojie
|
0dce1d8ee4
|
关卡
|
2019-04-12 18:26:36 +08:00 |
jiahuiwen
|
ab96501d1c
|
剩余时间
|
2019-04-12 15:02:10 +08:00 |
jiahuiwen
|
9fdbc8b1da
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-04-12 14:52:45 +08:00 |
jiahuiwen
|
66b7367e4d
|
地图探索
|
2019-04-12 14:50:45 +08:00 |
gaojie
|
db3d53cc35
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-12 11:19:42 +08:00 |
gaojie
|
f7942c0c1e
|
关卡,角色升级
|
2019-04-12 11:19:31 +08:00 |
wangyuan
|
1b02fb5935
|
fix gm
|
2019-04-10 18:26:14 +08:00 |
wangyuan
|
5fd58a3472
|
整点执行
|
2019-04-10 15:59:05 +08:00 |
wangyuan
|
a17ef696d3
|
fix
|
2019-04-10 10:19:02 +08:00 |
gaojie
|
419a5c569e
|
fix
|
2019-04-09 23:59:56 +08:00 |
wangyuan
|
894c9e7267
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-09 20:28:49 +08:00 |
wangyuan
|
1b05903053
|
一键背包
|
2019-04-09 20:28:34 +08:00 |
gaojie
|
6165f20a6a
|
删除邮件
|
2019-04-09 20:16:10 +08:00 |
gaojie
|
f8662be876
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-09 16:03:54 +08:00 |
gaojie
|
e3b2c7897a
|
fix
|
2019-04-09 16:03:49 +08:00 |
wangyuan
|
af77563d11
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2019-04-09 15:05:01 +08:00 |
wangyuan
|
ff28574930
|
新手引导
|
2019-04-09 15:04:09 +08:00 |
gaojie
|
fc63077c19
|
删除邮件
|
2019-04-09 14:39:54 +08:00 |
jiahuiwen
|
ce2c268c6a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-09 11:59:22 +08:00 |
jiahuiwen
|
1cc21efa66
|
触发的点 统一保存
|
2019-04-09 11:59:18 +08:00 |
wangyuan
|
36f7eaf835
|
食物buffer消耗
|
2019-04-09 11:32:29 +08:00 |
wangyuan
|
5cdfe42b6b
|
'初始化指定星级hero'
|
2019-04-09 11:17:15 +08:00 |
jiahuiwen
|
baf73f9440
|
bug修改
|
2019-04-09 09:28:37 +08:00 |
jiahuiwen
|
225ebb443a
|
bug 修改
|
2019-04-08 20:52:54 +08:00 |
jiahuiwen
|
982a34d49e
|
bug
|
2019-04-08 20:41:34 +08:00 |
jiahuiwen
|
afd2df23c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-08 17:14:22 +08:00 |
wangyuan
|
6d328867a8
|
修复挂机删除时间
|
2019-04-08 17:57:01 +08:00 |
jiahuiwen
|
37f085b31c
|
保存信息
|
2019-04-08 17:14:10 +08:00 |
jiahuiwen
|
6bd50b34de
|
添加行为,可以开启其他地图点
|
2019-04-08 14:51:12 +08:00 |
wangyuan
|
b7d51deb04
|
红点
|
2019-04-04 14:00:49 +08:00 |
jiahuiwen
|
0be47a26fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-03 20:43:07 +08:00 |
jiahuiwen
|
c6a892ab23
|
迷雾
|
2019-04-03 20:43:03 +08:00 |
wangyuan
|
5495dab69a
|
fix
|
2019-04-03 19:20:25 +08:00 |
wangyuan
|
72760b449f
|
fix gm
|
2019-04-03 17:39:38 +08:00 |
wangyuan
|
eb7c619eb5
|
探索度支持多事件点
|
2019-04-03 16:28:43 +08:00 |
wangyuan
|
f59f3ab9d8
|
修改挂机奖励
|
2019-04-03 15:26:13 +08:00 |
wangyuan
|
27aebc60bb
|
gm 一键背包
|
2019-04-02 20:52:10 +08:00 |
jiahuiwen
|
b03071035d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 20:26:11 +08:00 |
jiahuiwen
|
251e724a2e
|
地图保存bug
|
2019-04-02 20:26:02 +08:00 |
wangyuan
|
747d2e4a53
|
修改英雄当前生命枚举值为6
|
2019-04-02 17:42:34 +08:00 |
wangyuan
|
80678b540f
|
fix
|
2019-04-02 17:21:54 +08:00 |
jiahuiwen
|
f3961d007f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 16:39:07 +08:00 |
jiahuiwen
|
b97039772d
|
事件点保存
|
2019-04-02 16:39:00 +08:00 |
wangyuan
|
c1ca5b3503
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
|
2019-04-02 16:29:30 +08:00 |
wangyuan
|
1a40372803
|
吃食物buffer一次性生效,做延缓处理
|
2019-04-02 16:28:39 +08:00 |
jiahuiwen
|
bf235d3fc9
|
buff赋值
|
2019-04-02 16:05:54 +08:00 |
jiahuiwen
|
319a31df60
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 15:51:58 +08:00 |
jiahuiwen
|
b04bce96a9
|
行为类型 吃buff
|
2019-04-02 15:51:45 +08:00 |
wangyuan
|
371d8af39d
|
穿多件装备
|
2019-04-02 14:51:17 +08:00 |
jiahuiwen
|
65cb996af4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:28:45 +08:00 |
wangyuan
|
b8907cded2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-02 14:28:26 +08:00 |
wangyuan
|
5f9f164320
|
修改食物buffer
|
2019-04-02 14:28:13 +08:00 |
jiahuiwen
|
17a5cddd82
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:27:55 +08:00 |
jiahuiwen
|
501ff8f221
|
地图增加两个行为类型,配置表
|
2019-04-02 14:27:47 +08:00 |
gaojie
|
ffdf1067fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:26:24 +08:00 |
gaojie
|
d1d06274da
|
初始化开服邮件
|
2019-04-02 14:26:20 +08:00 |
jiahuiwen
|
5de5a252ed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 20:33:21 +08:00 |
jiahuiwen
|
de37dcd698
|
地图 gm
|
2019-04-01 20:31:54 +08:00 |
wangyuan
|
221c102815
|
fightdata
|
2019-04-01 19:49:18 +08:00 |
gaojie
|
215fa27996
|
修改数据类型
|
2019-04-01 19:34:26 +08:00 |
gaojie
|
54d2172361
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 19:24:09 +08:00 |
wangyuan
|
77a480f955
|
map gm
|
2019-04-15 05:29:35 +08:00 |
gaojie
|
7fe39cdeac
|
怪物技能属性
|
2019-04-01 19:24:05 +08:00 |
jiahuiwen
|
741c60fccf
|
地图GM,跳转判断
|
2019-04-01 18:57:58 +08:00 |
jiahuiwen
|
d0077f94cc
|
触发顺序
|
2019-04-01 17:11:10 +08:00 |
jiahuiwen
|
3118cd9fd1
|
保存地图事件 bug
|
2019-04-01 14:16:27 +08:00 |
jiahuiwen
|
51da0e539f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 11:27:27 +08:00 |
jiahuiwen
|
126df5e58b
|
销毁事件点 需要保存事件信息
|
2019-04-01 11:27:03 +08:00 |
mashiyu
|
f9249bef01
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 09:52:38 +08:00 |
mashiyu
|
597b25e3ed
|
bug
|
2019-04-01 09:52:18 +08:00 |
wangyuan
|
d0e785b44a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-29 19:11:08 +08:00 |
wangyuan
|
c922681143
|
fix get map event id
|
2019-03-29 19:10:51 +08:00 |