Commit Graph

1804 Commits (3defe3d54cc41a8c458d3885ef25968b6d582a31)

Author SHA1 Message Date
lvxinran 3defe3d54c 法宝掉落 2019-09-07 16:31:19 +08:00
lvxinran d88ed321c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 15:03:56 +08:00
lvxinran d6f2b203e0 公会修改、试炼修改 2019-09-07 15:03:33 +08:00
wangyuan e1cbbac567 圣火令 2019-09-07 14:48:08 +08:00
wangyuan 69057cf41b Merge branch 'split'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
2019-09-07 14:15:04 +08:00
wangyuan a5a285f081 血战积分奖励 2019-09-07 14:13:25 +08:00
wangyuan 201f510e38 bloody 2019-09-07 14:12:09 +08:00
lvxinran c7d61c098d 无尽本修改 2019-09-07 13:56:30 +08:00
lvxinran d95f112bd0 法宝默认 2019-09-06 20:46:56 +08:00
lvxinran 50c2758b5f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-06 20:41:38 +08:00
lvxinran f16ee71a54 法宝 2019-09-06 20:41:34 +08:00
zhangshanxue c118c195f4 排行榜显示 2019-09-06 14:54:00 +08:00
wangyuan 932a2bfe1b Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
2019-09-06 11:09:05 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00
zhangshanxue 9406f2c28f Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-09-06 11:01:43 +08:00
zhangshanxue 0bc5d8fb90 魂印 2019-09-06 10:59:49 +08:00
lvxinran 1423c2fb3b 多余代码删除 2019-09-05 20:39:12 +08:00
lvxinran 75dec9d9b8 无尽修改 2019-09-05 20:26:26 +08:00
lvxinran 1215fdafdc 无尽设置跳过战斗、科技树修改 2019-09-05 19:51:07 +08:00
lvxinran 0d93202a6c 血战排行榜 2019-09-05 17:34:46 +08:00
lvxinran 702c7c705e 无尽修改 2019-09-05 16:57:16 +08:00
lvxinran b45af85013 GM修改 2019-09-05 14:47:08 +08:00
lvxinran 6030413d3f 血战邮件 2019-09-05 14:15:20 +08:00
lvxinran 8129e8cb2c 血战排行榜 2019-09-05 12:01:47 +08:00
lvxinran f823388c75 无尽副本血量计算 2019-09-05 09:56:18 +08:00
lvxinran a960ad504c 无尽修改血量 2019-09-04 20:50:06 +08:00
lvxinran 489f906a00 法宝升星 2019-09-04 19:08:14 +08:00
lvxinran 2c4a2f2218 48、49行为类型修改 2019-09-04 16:07:13 +08:00
lvxinran 234bddfed8 发货修改 2019-09-04 15:46:49 +08:00
wangyuan bc1c252c02 delete check amount 2019-09-04 15:42:19 +08:00
lvxinran 509878f535 无尽刷小怪 2019-09-04 15:40:50 +08:00
wangyuan aa316cc206 table 2019-09-04 15:01:44 +08:00
lvxinran ea6a775a3b 法宝gm,无尽地图小怪刷新 2019-09-04 15:00:25 +08:00
zhangshanxue aaf700ca6c 问卷 2019-09-04 14:25:12 +08:00
zhangshanxue 734f47cbdb Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2019-09-04 11:54:13 +08:00
zhangshanxue 14ce0d866c 问卷调查 2019-09-04 11:53:35 +08:00
lvxinran 3f0bc58b51 无尽副本战力显示 2019-09-04 11:46:18 +08:00
lvxinran 4970f48e9d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-04 11:08:51 +08:00
lvxinran 6de5deaa40 我要变强等级限制 2019-09-04 11:08:47 +08:00
wangyuan bf9bf974c6 fix buygood logic 2019-09-04 10:37:12 +08:00
lvxinran a04ab6ee5a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-03 20:49:18 +08:00
lvxinran 3caea6d9d2 我要变强 2019-09-03 20:49:14 +08:00
wangyuan 26ab22db56 activity 2019-09-03 20:16:44 +08:00
lvxinran b782ee0a8a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-03 19:41:11 +08:00
lvxinran 463d63a7fb 法宝 2019-09-03 19:41:07 +08:00
wangyuan 3f16d2c1ca scene 2019-09-03 19:30:40 +08:00
lvxinran c770a95a09 修改提交 2019-09-03 11:18:39 +08:00
lvxinran c5a704d494 法宝表对应 2019-09-03 11:17:52 +08:00
lvxinran bfdfdef554 法宝加成 2019-09-03 10:47:52 +08:00
wangyuan 64afe28900 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-03 10:42:38 +08:00