Commit Graph

1229 Commits (becff88ad7ed25c50bec1d33206e47c7f788e5d4)
 

Author SHA1 Message Date
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 0a0aee11d3 fight 2019-06-13 15:57:55 +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
王永芳 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