Commit Graph

3551 Commits (6ab7e8beee3c2b0a9959b71f5479e3fadfb337e2)
 

Author SHA1 Message Date
zhangshanxue 45521fdee5 热更新应该不会成功 2020-06-13 16:59:39 +08:00
zhangshanxue 5264ddcb83 猎妖之路招募节点bug 2020-06-13 16:58:08 +08:00
zhangshanxue 344501791f 道具掉落 类型判断和返回 2020-06-13 16:57:06 +08:00
lvxinran 4bcac2e1d8 点金排行提交 2020-06-12 18:16:15 +08:00
lvxinran f25e6a5980 冲突修改 2020-06-12 17:09:03 +08:00
lvxinran 724a3b0fb4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-06-12 17:08:42 +08:00
lvxinran 2670dcd04a 等级礼包暂时提交 2020-06-12 17:04:47 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
zhangshanxue 99a2b0f0c2 客户端新增了一个道具类型 2020-06-12 16:35:22 +08:00
zhangshanxue 0e6c65163e 客户端新增了一个道具类型 2020-06-12 16:19:01 +08:00
zhangshanxue 6ad732f6f2 去掉远征临时装备背包 2020-06-12 15:37:29 +08:00
zhangshanxue 5dd612ce1a 奖励组拼接bug 2020-06-12 10:46:32 +08:00
zhangshanxue ffee38af5b 内存检查工具 及内纯漏存 2020-06-11 15:42:18 +08:00
zhangshanxue fd7e47ff65 新增消耗道具任务类型 2020-06-11 11:23:07 +08:00
zhangshanxue c015b1ea18 属性计算 目标属性也是万分比计算 (bug多了万分比加成于同一个一级属性 只会有一个生效) 2020-06-11 10:55:25 +08:00
zhangshanxue 0f430e6a09 pvp加成没加上 因为表没配一级属性id 2020-06-10 18:11:30 +08:00
zhangshanxue 4fdf720e84 点将台任务类型更新失败 2020-06-10 17:50:10 +08:00
zhangshanxue 7d53e2c06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 17:38:57 +08:00
zhangshanxue 4c9f8e4965 pvp加成没加上 2020-06-10 17:38:49 +08:00
zhangshanxue df707a8d8e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 15:17:40 +08:00
zhangshanxue 484a6e9445 TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 15:17:30 +08:00
lvxinran 88ee5cb6ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 14:12:34 +08:00
lvxinran ea57ee2cf7 特权商城修改、点金排行榜添加 2020-06-10 14:12:28 +08:00
lvxinran 97782999d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 10:28:17 +08:00
lvxinran 3dafe6bbad 公会技能重置消耗修改 2020-06-17 10:28:13 +08:00
lvxinran 264df27d8a 宝器入库修改,判空处理 2020-06-17 10:28:00 +08:00
lvxinran 1e56edce3a 试炼buff提交 2020-06-17 10:27:20 +08:00
lvxinran f161ac1e08 车迟时间修改 2020-06-14 20:01:16 +08:00
zhangshanxue 5e550150ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 11:47:48 +08:00
zhangshanxue 3c5b576b0a TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 11:47:39 +08:00
lvxinran 0f21f209d4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:49:18 +08:00
lvxinran 3a1e16feb6 试炼本重置功能,任务提交 2020-06-10 05:49:14 +08:00
zhangshanxue 5e4368aa77 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:25:14 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
lvxinran 96a44a023f 十绝阵死循环修改 2020-06-10 01:49:22 +08:00
zhangshanxue 761fb9901d 【ID1007808】【ID1007804】【ID1007810】【公会援助】公会援助报错 和猎妖之路圣物不生效 2020-06-09 15:43:19 +08:00
zhangshanxue 4b2c5f5373 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:57:33 +08:00
zhangshanxue 7f0313a164 BUG【ID1007804】【公会援助】收到的援助不领取,重启服务器就没了 2020-06-08 16:51:38 +08:00
lvxinran 979348dde1 十绝阵时间判断修改 2020-06-08 15:41:23 +08:00
zhangshanxue 30c54bead0 被动技配置bug 2020-06-08 15:35:47 +08:00
zhangshanxue 019c9e9db2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:51:04 +08:00
zhangshanxue a71818e1b5 功能bug 2020-06-08 10:50:50 +08:00
lvxinran 50831bbee2 功能判空处理 2020-06-08 10:38:07 +08:00
zhangshanxue 0de940f9d0 功能bug 2020-06-08 10:30:58 +08:00
zhangshanxue 758817d5f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:27:23 +08:00
zhangshanxue d66bee14fc 时间屏蔽 被动技bug 2020-06-08 10:26:22 +08:00
lvxinran ce44abc594 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:12:37 +08:00
lvxinran b3d6343f95 公会添加条件提交 2020-06-08 10:12:33 +08:00
zhangshanxue 336ec10895 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:50:12 +08:00
zhangshanxue 27a29f771b 去掉注释 2020-06-05 20:49:15 +08:00