Commit Graph

904 Commits (58e910f05a264845a07e4e2ccfa7ec7778c1d506)
 

Author SHA1 Message Date
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 ef2b6dc136 配置表提交 2019-04-23 09:47:24 +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 5e9f8a9520 队伍顺序 2019-04-20 17:21:45 +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
jiahuiwen 495c238a9e 战斗校验 2019-04-20 13:02:14 +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
jiahuiwen ecc3f992e3 登录时间 2019-04-19 17:48:54 +08:00
wangyuan 4ac7c99b2a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-19 17:13:03 +08:00
wangyuan 425b13e291 修改血量 2019-04-19 17:12:29 +08:00
jiahuiwen a12544232c 行为类型17 不推任务 2019-04-19 16:44:38 +08:00
jiahuiwen ea8fde820e 配置表提交 2019-04-19 15:21:59 +08:00
jiahuiwen 2bece3f31d 任务奖励改数组 2019-04-19 15:20:34 +08:00
jiahuiwen 7176513785 改名字 2019-04-19 14:43:35 +08:00
wangyuan ebbd6dfb8e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-19 14:24:40 +08:00