Commit Graph

1196 Commits (57a9809a48ef85c57651ae5d6328e6e1442f0974)
 

Author SHA1 Message Date
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 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