jiahuiwen
|
4e53e8e96c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-03-06 17:30:25 +08:00 |
jiahuiwen
|
f6e0d4b8bf
|
战斗结算
|
2019-03-06 17:29:34 +08:00 |
mashiyu
|
8d19f84382
|
合并代码
|
2019-03-06 16:19:10 +08:00 |
mashiyu
|
5d8c9d35ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-03-06 16:17:34 +08:00 |
mashiyu
|
9c71683e83
|
去掉大小key异常
|
2019-03-06 16:14:18 +08:00 |
jiahuiwen
|
738252ecd5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 16:05:07 +08:00 |
jiahuiwen
|
a80f078417
|
地图
|
2019-03-06 16:04:57 +08:00 |
mashiyu
|
9ddf90637f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 15:07:23 +08:00 |
mashiyu
|
13b8946115
|
数据存贮优化
|
2019-03-06 15:07:12 +08:00 |
wangyuan
|
93ab01facd
|
fix 解析英雄数据表
|
2019-03-06 11:08:42 +08:00 |
jiahuiwen
|
83ef010146
|
初始任务
|
2019-03-05 19:39:52 +08:00 |
mashiyu
|
bf43560c87
|
改数据库
|
2019-03-05 18:59:34 +08:00 |
mashiyu
|
04ebb8ba6f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-05 18:45:03 +08:00 |
mashiyu
|
8575bd5ba5
|
数据库修改
|
2019-03-05 18:44:34 +08:00 |
jiahuiwen
|
105d87f629
|
初始新手任务
|
2019-03-05 17:49:14 +08:00 |
wangyuan
|
78e67277b8
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-05 16:43:38 +08:00 |
wangyuan
|
0d7d9bc10d
|
初始编队
|
2019-03-05 16:43:00 +08:00 |
gaojie
|
ca5b16163b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-05 15:23:45 +08:00 |
gaojie
|
e0fd985a43
|
卡牌装备分页请求
|
2019-03-05 15:23:38 +08:00 |
jiahuiwen
|
03fcab6635
|
展示地图出生点
|
2019-03-05 14:27:25 +08:00 |
jiahuiwen
|
c18d7a6ca2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-04 19:42:54 +08:00 |
jiahuiwen
|
3021511e7e
|
地图
|
2019-03-04 19:42:48 +08:00 |
mashiyu
|
f8dc7f535c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-04 11:09:28 +08:00 |
mashiyu
|
8d031b2455
|
提交
|
2019-03-04 11:07:31 +08:00 |
wangyuan
|
22de4a9033
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-03-02 18:34:15 +08:00 |
wangyuan
|
fbb2e1c6f2
|
精力&行动力
|
2019-03-02 18:30:38 +08:00 |
jiahuiwen
|
6c9252f157
|
地图战斗开战
|
2019-03-02 18:27:56 +08:00 |
wangyuan
|
5ab788a789
|
解决死循环
|
2019-03-02 14:36:54 +08:00 |
gaojie
|
be75504fb8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-02 13:57:24 +08:00 |
gaojie
|
c20749d371
|
mongo 删除key
|
2019-03-02 13:57:20 +08:00 |
wangyuan
|
6e4eda7a53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-02 13:43:05 +08:00 |
wangyuan
|
9423ef2fb1
|
修改抽卡获取协议 & 提交工坊数据
|
2019-03-02 13:42:33 +08:00 |
jiahuiwen
|
0d7f123a01
|
判断道具
|
2019-03-01 18:31:29 +08:00 |
jiahuiwen
|
f7d3b64b61
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-01 17:34:55 +08:00 |
jiahuiwen
|
47051d6b69
|
地图表增加字段
|
2019-03-01 17:34:43 +08:00 |
gaojie
|
bba131d632
|
怪物数据
|
2019-03-01 16:07:03 +08:00 |
jiahuiwen
|
b06e783754
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-01 13:40:27 +08:00 |
jiahuiwen
|
9ff3046493
|
地图 8和9 全出现
|
2019-03-01 13:40:22 +08:00 |
wangyuan
|
0a45445c20
|
规范
|
2019-02-27 21:31:04 +08:00 |
wangyuan
|
291d8acbae
|
加经验
|
2019-02-27 16:22:06 +08:00 |
wangyuan
|
d6ab9a413d
|
修复队伍上阵同样卡牌
|
2019-02-26 21:07:45 +08:00 |
mashiyu
|
d5b2dab9b4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-26 19:43:19 +08:00 |
gaojie
|
c243df65ab
|
释放io流
|
2019-02-26 18:11:23 +08:00 |
mashiyu
|
ead69de1b7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-26 16:14:36 +08:00 |
mashiyu
|
07c189f09c
|
断线重连
|
2019-02-26 16:14:22 +08:00 |
wangyuan
|
7684ffe7e0
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-02-25 20:53:51 +08:00 |
wangyuan
|
cdcff252ab
|
校验
|
2019-02-25 20:53:38 +08:00 |
jiahuiwen
|
459ec2b0a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-25 20:43:01 +08:00 |
jiahuiwen
|
d0c8424ec3
|
增加两个行为类型 15销魂事件点 16消耗道具并销毁事件点
|
2019-02-25 20:42:47 +08:00 |
wangyuan
|
47e04c5d51
|
修复消息号
|
2019-02-25 18:08:59 +08:00 |