From b8e3c3798dc4113bd8c69f90a531fdf6a5a3a4b8 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Thu, 15 Nov 2018 17:38:15 +0800
Subject: [PATCH] levelUpLeftMode

---
 _server/data.comment.js | 6 ++++++
 libs/control.js         | 3 ++-
 libs/core.js            | 2 ++
 project/data.js         | 3 ++-
 project/functions.js    | 6 +++++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/_server/data.comment.js b/_server/data.comment.js
index 0f7dc2ba..6d277522 100644
--- a/_server/data.comment.js
+++ b/_server/data.comment.js
@@ -424,6 +424,12 @@ data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                     "_bool": "bool",
                     "_data": "是否允许等级提升（进阶）；如果上面enableExperience为false，则此项恒视为false"
                 },
+                "levelUpLeftMode": {
+                    "_leaf": true,
+                    "_type": "checkbox",
+                    "_bool": "bool",
+                    "_data": "进阶使用扣除模式，即在状态栏显示距离下个等级所需要的经验值；只有enableExperience和enableLevelUp均开启时才有效。"
+                },
                 "enableKeys": {
                     "_leaf": true,
                     "_type": "checkbox",
diff --git a/libs/control.js b/libs/control.js
index 9530927f..79e630ba 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2786,6 +2786,7 @@ control.prototype.resize = function(clientWidth, clientHeight) {
     if (!core.flags.enableMoney) count--;
     if (!core.flags.enableExperience) count--;
     if (!core.flags.enableLevelUp) count--;
+    if (core.flags.levelUpLeftMode) count--;
     if (!core.flags.enableDebuff) count--;
     if (!core.flags.enableKeys) count--;
     if (!core.flags.enablePZF) count--;
@@ -3092,7 +3093,7 @@ control.prototype.resize = function(clientWidth, clientHeight) {
         {
             id: 'expCol',
             rules: {
-                display: core.flags.enableExperience ? 'block': 'none'
+                display: core.flags.enableExperience && !core.flags.levelUpLeftMode ? 'block': 'none'
             }
         },
         {
diff --git a/libs/core.js b/libs/core.js
index 35186832..896989e1 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -183,6 +183,8 @@ core.prototype.init = function (coreData, callback) {
 
     if (!core.flags.enableExperience)
         core.flags.enableLevelUp = false;
+    if (!core.flags.enableLevelUp)
+        core.flags.levelUpLeftMode = false;
     if (!core.flags.canOpenBattleAnimate) {
         core.flags.showBattleAnimateConfirm = false;
         core.flags.battleAnimate = false;
diff --git a/project/data.js b/project/data.js
index 66e83fbb..89f513e0 100644
--- a/project/data.js
+++ b/project/data.js
@@ -203,6 +203,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"enableMoney": true,
 		"enableExperience": false,
 		"enableLevelUp": false,
+		"levelUpLeftMode": false,
 		"enableKeys": true,
 		"enablePZF": false,
 		"enableDebuff": false,
@@ -233,6 +234,6 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"canGoDeadZone": false,
 		"enableMoveDirectly": true,
 		"enableDisabledShop": true,
-		"disableShopOnDamage": true
+		"disableShopOnDamage": false
 	}
 }
\ No newline at end of file
diff --git a/project/functions.js b/project/functions.js
index 59ad43f7..ca618442 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -817,7 +817,11 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 
 	// 进阶
 	if (core.flags.enableLevelUp && core.status.hero.lv<core.firstData.levelUp.length) {
-		core.statusBar.up.innerHTML = core.firstData.levelUp[core.status.hero.lv].need || " ";
+		var need = core.firstData.levelUp[core.status.hero.lv].need;
+		if (core.flags.levelUpLeftMode)
+            core.statusBar.up.innerHTML = (need - core.getStatus('experience')) || " ";
+		else
+            core.statusBar.up.innerHTML = need || " ";
 	}
 	else core.statusBar.up.innerHTML = " ";