系统参数表修复冲突

This commit is contained in:
luying
2021-08-18 16:13:48 +08:00
parent f58124af88
commit d663f18aee

View File

@@ -166,10 +166,7 @@ export const TOWER_SEARCH = {
TOWER_SEARCH_REFRESHRULE_FEE: 10, // 镇念塔派遣任务刷新次数每次刷新消耗元宝119*10
TOWER_SEARCH_REFRESHRULE_MAX: 10, // 镇念塔派遣任务每天刷新次数每次刷新消耗元宝121但是有上限&
TOWER_SEARCH_GUARANTEED: '4&5', // 镇念塔派遣任务保底品质颜色
<<<<<<< Updated upstream
=======
TOWER_SEARCH_STARTLIMITED: 1, // 镇念塔派遣功能开启的层数
>>>>>>> Stashed changes
};
export const TOWER_BOOST = {
TOWER_BOOSTTIME: 5, // 镇念塔加速次数
@@ -177,12 +174,9 @@ export const TOWER_BOOST = {
TOWER_BOOSTCAST: 50, // 镇念塔加速次数每次消耗元宝量
TOWER_BOOSTCASTMAX: 300, // 镇念塔加速次数消耗元宝量上线
};
<<<<<<< Updated upstream
=======
export const TOWER_HANG_UP = {
TOWER_HANG_UP_ENABLE_LV: 1, // 第几层开始可以挂机
TOWER_HANG_UP_UNIT_TIME: 10, // 每几分钟能有一次收益
TOWER_HANG_UP_MAX_TIME: 24, // 最多可储存多少小时收益
TOWE_HANG_UP_SPD_UP_REC_TIME: 6, // 加速直接获得多少小时收益
};
>>>>>>> Stashed changes