Commit Graph

3087 Commits (74ee4537eef2001333e3ef5b5b8a2fa8f998adce)
 

Author SHA1 Message Date
zhangshanxue 74ee4537ee 远征优化 2020-03-06 13:23:57 +08:00
lvxinran c5d8e67d2e 敏感词 2020-02-28 16:43:24 +08:00
lvxinran 9c82a394dd 戒灵秘宝升级修改 2020-02-29 00:03:07 +08:00
lvxinran 81eedff9df 戒灵秘宝升级修改 2020-02-28 12:29:53 +08:00
lvxinran 0846bdfe2d 戒灵秘宝逻辑修改 2020-02-28 12:04:02 +08:00
lvxinran 82c102391b 东海寻仙活动 2020-02-29 00:01:33 +08:00
zhangshanxue f132f859c4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-26 16:54:22 +08:00
zhangshanxue c53b6056ed Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组 2020-02-26 16:54:12 +08:00
lvxinran fb104288e5 限时抽卡 寻仙榜修改 2020-02-26 14:38:07 +08:00
lvxinran 13c8f3f685 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-25 20:09:30 +08:00
lvxinran d70ce6c1f2 战斗逻辑 2020-02-25 20:09:26 +08:00
wangyuan 66ea5b103f 修复设置异妖组件最大等级校验 2020-02-25 14:55:14 +08:00
wangyuan a3716c257f 巅峰赛编队有竞技场进攻变成竞技场防守 2020-02-25 11:47:10 +08:00
zhangshanxue b0ad311440 线上分支回退 改回来 2020-02-25 09:57:36 +08:00
zhangshanxue 1ce01c52e3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 21:45:51 +08:00
zhangshanxue 57fa2c6652 线上分支回退 稍后再改回来 2020-02-24 21:45:42 +08:00
wangyuan 4c327414b9 零点刷新 2020-02-24 18:26:28 +08:00
zhangshanxue 9ee9d9f2e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 18:06:02 +08:00
zhangshanxue 49140cc3d7 Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 2020-02-24 18:05:51 +08:00
lvxinran d005fbed44 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 17:14:08 +08:00
lvxinran 85a1947791 刷新充值礼包改为0点 2020-02-24 17:14:03 +08:00
wangyuan 257de4422f 修改工会战编队id可动态改 2020-02-24 16:21:10 +08:00
zhangshanxue f41cf48f3b Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力 2020-02-24 15:57:11 +08:00
zhangshanxue f3fca07cf2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 15:00:43 +08:00
zhangshanxue 267f621cc0 BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗 2020-02-24 15:00:35 +08:00
wangyuan 4e98fff425 fix 2020-02-21 18:30:36 +08:00
wangyuan 74213d4c0d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-02-21 18:04:24 +08:00
wangyuan 6a27656717 fix name 2020-02-21 18:04:10 +08:00
zhangshanxue a7ed154936 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-21 17:55:45 +08:00
zhangshanxue 441480aed0 Task【ID1005747】【猎妖之路优化】 猎妖之路优化内容 死亡猎妖师未下阵 2020-02-21 17:55:36 +08:00
wangyuan d9b592cc81 修复功能按类型开 2020-02-21 17:54:41 +08:00
zhangshanxue 0304f78695 Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 2020-02-21 11:09:57 +08:00
zhangshanxue ae01d515ec 前端gm指令 后期屏蔽 2020-02-20 17:46:26 +08:00
zhangshanxue d902f1d34e Task【ID1005460】【玩法需求】猎妖之路 2020-02-20 16:40:08 +08:00
wangyuan bd54aea85e fight 2020-02-20 16:06:48 +08:00
zhangshanxue 861c6a2ec5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-20 09:34:19 +08:00
wangyuan d1bd1ebade Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2020-03-26 00:03:27 +08:00
wangyuan d3a84ad2a8 商店刷新 & 工会行走 2020-03-26 00:02:26 +08:00
zhangshanxue 4afff38ff3 Task【ID1005460】【玩法需求】猎妖之路 2020-02-20 09:34:08 +08:00
zhangshanxue 44c00e9fcb Task【ID1005460】【玩法需求】猎妖之路 节点更新不对 2020-02-19 14:53:20 +08:00
zhangshanxue cbfee44510 Task【ID1005460】【玩法需求】猎妖之路 节点更新不对 2020-02-19 10:58:09 +08:00
zhangshanxue 95b9eb58d5 Task【ID1005460】【玩法需求】猎妖之路 2020-02-18 13:52:23 +08:00
zhangshanxue f3e27888ee Task【ID1005460】【玩法需求】猎妖之路 2020-02-17 18:19:29 +08:00
zhangshanxue 624282c742 Task【ID1005460】【玩法需求】猎妖之路 2020-02-17 15:51:37 +08:00
zhangshanxue b838d8b25b 五星成长礼注释 2020-02-17 13:55:01 +08:00
zhangshanxue 67b85decc5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-13 16:13:31 +08:00
zhangshanxue da2943dd9a Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-13 16:13:21 +08:00
zhangshanxue 38e9e4d5f9 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-13 10:24:11 +08:00
lvxinran 337e0ebeec Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-10 09:52:02 +08:00
lvxinran 8c06c9fed2 战力修改 2020-02-10 09:51:55 +08:00