Commit Graph

722 Commits (3fd33d0068693f534f7ff56ccbb1ec9e57e3535d)

Author SHA1 Message Date
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 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 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
jiahuiwen 4c47d1c36e 时间从小到大 2019-04-25 15:40:12 +08:00
gaojie aa89c05d4f Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
#	conf/server/RewardGroup.txt
2019-04-25 14:55:58 +08:00
gaojie b09ba9646e 随机名字 2019-04-25 14:55:06 +08:00
jiahuiwen 42ee3ccc12 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-25 14:47:52 +08:00
jiahuiwen fac16f9dfd 竞速排行bug 2019-04-25 14:47:38 +08:00
wangyuan 8a35e83c47 进地图要给最大血量 2019-04-25 14:40:13 +08:00
jiahuiwen aa3c588b87 配置表提交 2019-04-25 10:16:33 +08:00
jiahuiwen b9e4cc3626 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-24 18:31:18 +08:00
jiahuiwen f94b50b54c 时间判断 2019-04-24 18:31:11 +08:00
gaojie 7bd38e7bd4 fix 2019-04-24 18:18:03 +08:00
wangyuan 07018af62e 分解装备 2019-04-24 18:17:04 +08:00
jiahuiwen 9c035670ea Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-24 16:10:04 +08:00
wangyuan b0fe7b66e2 挂机 2019-04-25 15:15:35 +08:00
jiahuiwen 5cf78e6bc9 删除不要的字段 2019-04-24 16:09:53 +08:00
wangyuan c4e6b0252e 活动 &玩家默认名称 2019-04-25 14:36:41 +08:00
gaojie a5f6bf571d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-24 15:01:49 +08:00
gaojie badb33e936 玩家升级 以及通关关卡 2019-04-24 15:01:46 +08:00
gaojie 736e14eada Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-24 14:18:34 +08:00
wangyuan dcde6fae0a 删除装备 2019-04-25 13:53:03 +08:00
gaojie 888761b2f0 分解 2019-04-24 14:18:29 +08:00
gaojie a4815854e0 静态表数据 2019-04-24 13:45:46 +08:00
gaojie 2ad5e17afb 道具分解 2019-04-24 10:44:08 +08:00
wangyuan 88595a257a table 2019-04-23 18:30:39 +08:00
wangyuan b21808a080 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-04-23 18:22:59 +08:00
wangyuan 4289588f92 活动 2019-04-23 18:22:02 +08:00
gaojie ade79c00a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-23 17:28:27 +08:00
gaojie 891d6c0ece 功能开关 2019-04-23 17:28:23 +08:00
jiahuiwen a0a9ae3b8d 任务完成时间 2019-04-23 09:43:48 +08:00
wangyuan ae0e068b35 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-22 19:26:29 +08:00
wangyuan eaa1767284 活动 2019-04-22 19:25:03 +08:00
gaojie fbc7c719e2 英雄合成 2019-04-22 17:39:06 +08:00
gaojie f135001dac Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-22 16:12:50 +08:00
gaojie 5e3e632282 合成英雄 2019-04-22 16:09:24 +08:00
jiahuiwen 295bb4f70a 开地图点支持开多个 2019-04-22 15:11:10 +08:00
jiahuiwen fbafd3f227 购买挑战次数 2019-04-22 11:51:31 +08:00
jiahuiwen 7ba0084c23 血量负数 2019-04-20 17:56:19 +08:00
jiahuiwen 0d308bc58c team 顺序 2019-04-20 16:55:24 +08:00
jiahuiwen f4cdbdcf15 快速战斗阵亡 复活bug 2019-04-20 16:02:47 +08:00
jiahuiwen e175d7db38 购买挑战次数bug 2019-04-20 14:53:53 +08:00
wangyuan 39404df90d 修复随机道具数量为0 2019-04-19 20:05:58 +08:00
jiahuiwen dbb8413947 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-19 19:55:46 +08:00
jiahuiwen cacd625577 快速战斗bug 2019-04-19 19:55:40 +08:00
wangyuan 8c51272314 修复AdventureStateInfo 入库 2019-04-19 19:28:57 +08:00
jiahuiwen 6fef8b2297 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-19 19:18:19 +08:00
jiahuiwen a8cbb93ccb 快速战斗 2019-04-19 19:17:23 +08:00
wangyuan 8910551a51 地图吃buffer直接覆盖 2019-04-19 18:58:13 +08:00
wangyuan 587cacade2 地图探索度 2019-04-19 18:54:29 +08:00
gaojie ed17b87905 fix 2019-04-19 18:37:49 +08:00
gaojie 46ff11b41d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-19 18:21:22 +08:00
gaojie 9e00bc05f9 物品分解 2019-04-19 18:21:18 +08:00
jiahuiwen 0367c5fbcb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-19 18:16:16 +08:00
jiahuiwen 419c1b08c6 买挑战次数 2019-04-19 18:16:11 +08:00
wangyuan db6e3014ca 更新地图buffer消失机制 2019-04-19 18:00:40 +08:00