Commit Graph

834 Commits (85cbae09dbf1ed903011694d692275c3ae018c9e)
 

Author SHA1 Message Date
gaojie 7e1bce2c83 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-17 18:02:55 +08:00
gaojie 87616377a1 升级加体力 2019-04-17 18:02:51 +08:00
wangyuan e4def0f68b Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	conf/server/GameSetting.txt
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-04-17 15:04:56 +08:00
wangyuan 36f85848af 探索度 2019-04-17 15:02:23 +08:00
jiahuiwen af186980d4 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-04-17 14:37:12 +08:00
jiahuiwen 42451d1c36 找回代码 2019-04-17 14:29:24 +08:00
gaojie 8466795034 等级升级,体力恢复 2019-04-17 12:11:15 +08:00
gaojie 2760830091 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-17 11:10:00 +08:00
gaojie c465fd0dec 关卡掉落进背包 2019-04-17 11:09:55 +08:00
wangyuan 7307a444f4 修复挂机key 2019-04-17 09:47:16 +08:00
gaojie 1f7d626309 fix 2019-04-16 21:04:09 +08:00
gaojie f11ca34c98 关卡状态 2019-04-16 21:00:14 +08:00
wangyuan 60026e5384 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-16 20:02:00 +08:00
wangyuan 1074c36d6f 地图探索度 删除无效协议 2019-04-16 20:01:48 +08:00
jiahuiwen 1169dffab5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-16 19:31:22 +08:00
jiahuiwen e8b7f7d168 无用导入 2019-04-16 19:31:07 +08:00
wangyuan 3a9daeb6eb 探索度 删除不必要的协议 2019-04-16 17:59:52 +08:00
gaojie 39bff04d03 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-16 17:34:41 +08:00
gaojie fc76607c69 恢复体力 2019-04-16 17:34:32 +08:00
mashiyu 4709953917 同步战斗验证 2019-04-16 14:32:11 +08:00
gaojie befccd4e38 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-16 14:10:37 +08:00
gaojie 2a36654ab1 多波怪物 2019-04-16 14:10:29 +08:00
wangyuan 5e27f52711 '' 2019-04-16 13:50:59 +08:00
wangyuan 226a50f33d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-16 10:26:17 +08:00
wangyuan b07a7f5673 挂机 2019-04-16 10:26:03 +08:00
wangyuan ae9a7bc1ee 挂机 2019-04-16 10:25:45 +08:00
jiahuiwen 8e39b783f1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/RewardGroup.txt
#	conf/server/RewardItemConfig.txt
2019-04-15 20:36:06 +08:00
jiahuiwen 9a7f180663 配置表提交 2019-04-15 20:35:40 +08:00
gaojie 4a35cfa272 体力 2019-04-15 20:35:15 +08:00
gaojie ac7ffe50ec Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-15 19:18:59 +08:00
gaojie 6a111ddfb9 fix 2019-04-15 19:18:56 +08:00
jiahuiwen fdac21e724 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-04-15 18:04:49 +08:00
jiahuiwen a35c93b6fb 地图修改 2019-04-15 18:03:48 +08:00
gaojie 761776f126 fix 2019-04-15 16:34:01 +08:00
gaojie b3a9cfc288 阵容校验 2019-04-15 16:21:29 +08:00
gaojie 7a0690f520 扫荡 2019-04-15 16:07:48 +08:00
gaojie d6a2b84015 fix 2019-04-13 15:53:02 +08:00
gaojie 06d665e02c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-13 15:10:24 +08:00
jiahuiwen e65f633023 探索修改 2019-04-12 20:57:15 +08:00
jiahuiwen 4ba216f2e3 探索修改 2019-04-12 19:42:32 +08:00
gaojie ce1cd08478 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	conf/server/MonsterGroup.txt
2019-04-12 18:28:09 +08:00
gaojie 0dce1d8ee4 关卡 2019-04-12 18:26:36 +08:00
jiahuiwen ab96501d1c 剩余时间 2019-04-12 15:02:10 +08:00
jiahuiwen bea8a835a3 配置表 2019-04-12 14:53:24 +08:00
jiahuiwen 9fdbc8b1da Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
2019-04-12 14:52:45 +08:00
jiahuiwen 66b7367e4d 地图探索 2019-04-12 14:50:45 +08:00
gaojie db3d53cc35 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-12 11:19:42 +08:00
gaojie f7942c0c1e 关卡,角色升级 2019-04-12 11:19:31 +08:00
wangyuan 1b02fb5935 fix gm 2019-04-10 18:26:14 +08:00
wangyuan 5fd58a3472 整点执行 2019-04-10 15:59:05 +08:00