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 |