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 |
王永芳
|
87d27731de
|
修改加密算法,减少临时数组的使用
|
2019-06-10 14:35:54 +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 |
wangyuan
|
f44f025313
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-06 17:28:25 +08:00 |
wangyuan
|
6c65856fde
|
test
|
2019-06-06 17:27:16 +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
|
eb6eb43611
|
test
|
2019-06-06 17:24:45 +08:00 |
wangyuan
|
dec631ed02
|
fight sync
|
2019-06-06 17:23:18 +08:00 |
wangyuan
|
7fcd9ec264
|
change git
|
2019-06-06 17:19:35 +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 |