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 |