Commit Graph

608 Commits (8e39b783f160cd0ee7360d28e4fe0bb83fbb3762)
 

Author SHA1 Message Date
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
wangyuan a17ef696d3 fix 2019-04-10 10:19:02 +08:00
gaojie 419a5c569e fix 2019-04-09 23:59:56 +08:00
wangyuan 894c9e7267 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-09 20:28:49 +08:00
wangyuan 1b05903053 一键背包 2019-04-09 20:28:34 +08:00
gaojie 6165f20a6a 删除邮件 2019-04-09 20:16:10 +08:00
gaojie f8662be876 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-09 16:03:54 +08:00
gaojie e3b2c7897a fix 2019-04-09 16:03:49 +08:00
wangyuan af77563d11 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2019-04-09 15:05:01 +08:00
wangyuan ff28574930 新手引导 2019-04-09 15:04:09 +08:00
gaojie fc63077c19 删除邮件 2019-04-09 14:39:54 +08:00
jiahuiwen ce2c268c6a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-09 11:59:22 +08:00
jiahuiwen 1cc21efa66 触发的点 统一保存 2019-04-09 11:59:18 +08:00
wangyuan 36f7eaf835 食物buffer消耗 2019-04-09 11:32:29 +08:00
wangyuan 5cdfe42b6b '初始化指定星级hero' 2019-04-09 11:17:15 +08:00
jiahuiwen baf73f9440 bug修改 2019-04-09 09:28:37 +08:00
jiahuiwen 225ebb443a bug 修改 2019-04-08 20:52:54 +08:00
jiahuiwen 982a34d49e bug 2019-04-08 20:41:34 +08:00
jiahuiwen afd2df23c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-08 17:14:22 +08:00
wangyuan 6d328867a8 修复挂机删除时间 2019-04-08 17:57:01 +08:00
jiahuiwen 37f085b31c 保存信息 2019-04-08 17:14:10 +08:00
jiahuiwen 6bd50b34de 添加行为,可以开启其他地图点 2019-04-08 14:51:12 +08:00
mashiyu c2f03f171c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-04 14:36:24 +08:00
mashiyu 98fe33d735 战斗校验服 2019-04-04 14:36:07 +08:00
jiahuiwen f15d513483 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-04 14:03:57 +08:00
jiahuiwen 1d7c0587d3 配置表提交 2019-04-04 14:02:50 +08:00
wangyuan b7d51deb04 红点 2019-04-04 14:00:49 +08:00