Commit Graph

769 Commits (ac32c58249e1ee590922d2471061a368c2dc5860)
 

Author SHA1 Message Date
gaojie ac32c58249 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-30 11:41:30 +08:00
gaojie 62ab9068a5 装备背包达上限 邮件发送 2019-04-30 11:41:19 +08:00
wangyuan 5a55ad0030 fix 2019-04-30 11:03:41 +08:00
wangyuan 31a56a778a gm change 2019-04-30 11:00:58 +08:00
wangyuan 7d40c34067 fix item 2019-04-30 10:03:27 +08:00
wangyuan 5a0d87e4f3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-30 10:00:56 +08:00
gaojie b7a314b27d 获得道具数量增量返回前端 2019-04-30 09:59:39 +08:00
wangyuan 3d0e7cebc6 fix null 2019-04-30 09:49:40 +08:00
gaojie a00a5f4597 一次合成碎片上限处理 2019-04-29 20:45:41 +08:00
gaojie 37bb6046df fix 2019-04-29 20:31:12 +08:00
gaojie 0bae114cc9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/ItemConfig.txt
2019-04-29 20:23:43 +08:00
gaojie 22b68a1bf2 道具上限 2019-04-29 20:21:30 +08:00
jiahuiwen db03f026cd 异妖传到前端 2019-04-29 18:47:36 +08:00
jiahuiwen c0949548df 竞速 记录异妖 2019-04-29 18:46:08 +08:00
jiahuiwen 2d5fe1aa50 配置表 2019-04-29 18:39:47 +08:00
jiahuiwen ff7a87f8fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-29 18:38:58 +08:00
jiahuiwen 7637c763ad 少加个注解 2019-04-29 18:38:52 +08:00
wangyuan 1aaddcb350 fix地图排行数据 2019-04-29 18:17:04 +08:00
wangyuan 39734e733f 解决排行榜问题 2019-04-29 17:52:50 +08:00
wangyuan f2f08a0613 血量初始值修改 2019-04-29 16:57:24 +08:00
wangyuan ac20fac6d7 fix 2019-04-29 16:47:08 +08:00
wangyuan 4b86edcecb 打开校验开关 2019-04-29 16:46:40 +08:00
jiahuiwen 6e8b4b0b5d 配置表提交 2019-04-29 16:17:36 +08:00
jiahuiwen 519679a116 区分战斗行为 2019-04-29 16:15:26 +08:00
jiahuiwen 6992512d3b 优化地图行为,并增加三个新行为 2019-04-29 15:31:46 +08:00
wangyuan ac596f4612 redis key 2019-04-28 17:29:04 +08:00
wangyuan 9968986c49 areaID 赋值 2019-04-28 17:26:43 +08:00
jiahuiwen 61446dfd55 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-28 14:26:38 +08:00
jiahuiwen 503bf13c89 地图判断 3星 bug 2019-04-28 14:26:31 +08:00
wangyuan 0f4fe589a8 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-28 10:06:56 +08:00
wangyuan dae316fa3e check 2019-04-28 10:06:41 +08:00
gaojie 5ade3c345e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-28 10:06:20 +08:00
gaojie 41470ac7e2 邮件 2019-04-28 10:06:13 +08:00
jiahuiwen 1a67866d2f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-26 15:25:33 +08:00
wangyuan 05fd42448b 异妖进阶消耗数据读取问题 2019-04-26 16:56:52 +08:00
wangyuan 0132a2ff2c 修复挂机奖励和地图探索optionId问题 2019-04-26 16:31:09 +08:00
jiahuiwen c76e2278d1 通关星级替换 2019-04-26 15:25:21 +08:00
gaojie 9e5c23315c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-25 21:03:15 +08:00
gaojie 66d4f6279c 升级 2019-04-25 21:03:07 +08:00
wangyuan 8760187393 等级校验 2019-04-25 20:23:07 +08:00
gaojie 44f60a050e 关卡等级限制 2019-04-25 20:15:53 +08:00
gaojie 85636fdabf 名字合法性验证 2019-04-25 18:29:08 +08:00
gaojie 16ff5cc025 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-25 18:18:56 +08:00
gaojie d6b0063066 名字 2019-04-25 18:18:51 +08:00
jiahuiwen 064ddce83f 200 2019-04-25 17:39:47 +08:00
jiahuiwen e9da699d03 从1开始 2019-04-25 17:32:41 +08:00
jiahuiwen b05cb6edd6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-25 17:31:18 +08:00
jiahuiwen 30b39089c1 地图读200开始 2019-04-25 17:30:53 +08:00
wangyuan a699b4e4dd 挂机 2019-04-25 17:04:36 +08:00
jiahuiwen cfd59bebba Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-25 15:40:27 +08:00