Commit Graph

3869 Commits (31677bdff6862b243b952ff7254c637f87842627)
 

Author SHA1 Message Date
zhangshanxue 31677bdff6 任务累充金额 2020-08-28 18:02:16 +08:00
lvxinran 62fbd0f9b8 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-27 13:32:01 +08:00
zhangshanxue 3075948147 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-28 11:00:40 +08:00
lvxinran c8cc9af30e Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-04 10:38:01 +08:00
lvxinran 32aab7a641 竞技场排行榜 2020-09-04 10:37:36 +08:00
lvxinran fbb03e44f8 森罗修改 2020-10-05 02:11:20 +08:00
lvxinran 5f9b70ea80 天宫秘宝积分购买添加 公会副本击杀奖励修改 2020-10-01 00:40:30 +08:00
lvxinran e0e89d377e 公会副本排行奖励 2020-10-01 00:19:39 +08:00
lvxinran 78953021c6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-10 17:46:28 +08:00
lvxinran f0f28b8fa6 世界等级 物品掉落 宝物战力修改 2020-09-10 17:46:14 +08:00
lvxinran 77098ce6a1 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-10 16:25:09 +08:00
lvxinran ce9370be4a 基金修改 2020-09-10 16:25:00 +08:00
lvxinran 656e089d0f 公会副本修改 2020-09-10 15:10:04 +08:00
lvxinran d4ee477baa 云梦祈福刷新 2020-09-10 11:19:40 +08:00
zhangshanxue 9fd22f7623 巅峰赛名次任务 2020-08-28 11:00:12 +08:00
zhangshanxue 0417a4c728 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-27 21:09:08 +08:00
zhangshanxue 8b01414491 先后手 2020-08-27 21:08:56 +08:00
lvxinran 85c45138da 排行修改 2020-08-27 13:31:49 +08:00
zhangshanxue 7958bb7fa3 猎妖之路节点修改 2020-08-26 17:43:17 +08:00
zhangshanxue 8257fbe430 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-26 15:43:58 +08:00
zhangshanxue 7f55f8cbc4 浮点精度 2020-08-26 15:43:42 +08:00
zhangshanxue 6b036a1b54 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-25 18:29:29 +08:00
lvxinran f1d88626b6 森罗环境修改 2020-09-10 18:17:09 +08:00
lvxinran 330e7c105a 青龙秘宝修改 2020-09-10 17:59:38 +08:00
zhangshanxue bacd35c48e 测试充值 2020-08-25 18:29:17 +08:00
lvxinran bcf288b69f Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-25 15:11:31 +08:00
lvxinran 793be7aeb2 修改青龙礼包合公会副本经验 2020-08-25 15:11:20 +08:00
zhangshanxue 459ef26b50 测试充值 2020-08-25 14:50:19 +08:00
zhangshanxue 07595796fa 合分支 2020-08-24 23:36:16 +08:00
zhangshanxue 23ade886ae Merge branch 'master' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-08-24 23:16:18 +08:00
zhangshanxue e77644359d 充值价格 2020-08-24 23:14:03 +08:00
lvxinran a57bdbc37f 五星成长礼修改 2020-09-01 22:11:12 +08:00
lvxinran 10858c2606 剑影仙踪活动修改 2020-09-01 18:30:29 +08:00
lvxinran b586b0c502 时间5天改成30天 2020-09-01 14:55:09 +08:00
lvxinran cc3f0d662d 公会副本次数修改 2020-09-01 14:14:26 +08:00
lvxinran c98aa7f20d 公会副本次数修改 2020-09-01 22:30:59 +08:00
lvxinran 57057330aa 上报乘100修改 2020-08-22 16:57:01 +08:00
lvxinran d56aa73460 Merge branch 'master' into 公会副本 2020-08-22 15:39:33 +08:00
lvxinran 146c394e7a 公会副本提交 2020-08-22 15:38:31 +08:00
lvxinran 86eee21319 怪物战力修改表数据 2020-08-21 20:53:26 +08:00
zhangshanxue 3ef43a64a7 灵动网页支付 2020-08-21 20:31:30 +08:00
lvxinran 26e02ac204 无尽修改 2020-08-21 19:25:31 +08:00
lvxinran 388a28507b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-21 18:46:55 +08:00
lvxinran e9fe5e2992 礼包修改 2020-08-21 18:46:49 +08:00
lvxinran f7b77d668a 副本提交 2020-08-28 14:38:20 +08:00
lilei 80bd02138f 破阵诛仙累冲任务修正 2020-08-21 18:00:07 +08:00
lilei 7c7e5cf9f1 破阵诛仙系列任务 2020-08-21 16:36:46 +08:00
lvxinran c6a0354f81 公会副本提交,大闹天宫埋点提交 2020-08-20 23:02:13 +08:00
lvxinran 95375eab26 公会副本提交 2020-08-27 19:49:57 +08:00
lilei 2cdf521ce3 探索达人替换为极速达人,增加探索次数特权逻辑 2020-08-20 14:06:48 +08:00