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 |