合并状态栏显示项

libs/control.js

@@ -2612,20 +2612,25 @@ control.prototype._shouldDisplayStatus = function(id) {
         }
         return toDraw;
     }
+    var obj = {};
+    core.flags.statusBarItems.forEach(function (v) { obj[v] = true; })
     switch (id) {
-        case 'floor': return core.flags.enableFloor;
-        case 'name': return core.flags.enableName;
-        case 'lv': return core.flags.enableLv;
-        case 'hpmax': return core.flags.enableHPMax;
-        case 'mana': return core.flags.enableMana;
-        case 'mdef': return core.flags.enableMDef;
-        case 'money': return core.flags.enableMoney;
-        case 'experience': return core.flags.enableExperience && !core.flags.levelUpLeftMode;
-        case 'up': return core.flags.enableLevelUp;
-        case 'skill': return core.flags.enableSkill;
-        case 'key': return core.flags.enableKeys;
-        case 'pzf': return core.flags.enablePZF;
-        case 'debuff': return core.flags.enableDebuff;
+        case 'floor': return obj.enableFloor;
+        case 'name': return obj.enableName;
+        case 'lv': return obj.enableLv;
+        case 'hp': return obj.enableHP;
+        case 'hpmax': return obj.enableHPMax;
+        case 'mana': return obj.enableMana;
+        case 'atk': return obj.enableAtk;
+        case 'def': return obj.enableDef;
+        case 'mdef': return obj.enableMDef;
+        case 'money': return obj.enableMoney;
+        case 'experience': return obj.enableExperience && !obj.levelUpLeftMode;
+        case 'up': return obj.enableLevelUp;
+        case 'skill': return obj.enableSkill;
+        case 'key': return obj.enableKeys;
+        case 'pzf': return obj.enablePZF;
+        case 'debuff': return obj.enableDebuff;
         default: return true;
     }
 }
@@ -2822,7 +2827,7 @@ control.prototype._resize_status = function (obj) {
         core.dom.statusTexts[i].style.color = obj.globalAttribute.statusBarColor;
     }
     // keys
-    if (core.flags.enableGreenKey) {
+    if (core.flags.statusBarItems.indexOf('enableGreenKey')>=0) {
         core.dom.keyCol.style.fontSize = '0.75em';
         core.statusBar.greenKey.style.display = '';
     } else {

libs/core.js

@@ -282,8 +282,6 @@ core.prototype._init_flags = function () {
 }
 
 core.prototype._init_sys_flags = function () {
-    if (!core.flags.enableExperience) core.flags.enableLevelUp = false;
-    if (!core.flags.enableLevelUp) core.flags.levelUpLeftMode = false;
     if (core.flags.equipboxButton) core.flags.equipment = true;
     core.flags.displayEnemyDamage = core.getLocalStorage('enemyDamage', core.flags.displayEnemyDamage);
     core.flags.displayCritical = core.getLocalStorage('critical', core.flags.displayCritical);

libs/events.js

@@ -2535,8 +2535,15 @@ events.prototype.setGlobalAttribute = function (name, value) {
 ////// 设置全局开关 //////
 events.prototype.setGlobalFlag = function (name, value) {
     var flags = core.getFlag("globalFlags", {});
-    flags[name] = value;
-    core.flags[name] = value;
+    if (name.startsWith('s:')) {
+        name = name.substring(2);
+        var statusBarItems = core.flags.statusBarItems.filter(function (v) {return v!=name;});
+        if (value) statusBarItems.push(name);
+        core.flags.statusBarItems = statusBarItems;
+        flags.statusBarItems = core.clone(statusBarItems);
+    } else {
+        flags[name] = core.flags.name = value;
+    }
     core.setFlag("globalFlags", flags);
     core.resize();
     if (name == 'blurFg')
@@ -2963,7 +2970,7 @@ events.prototype.checkLvUp = function () {
 }
 
 events.prototype._checkLvUp_check = function () {
-    if (!core.flags.enableLevelUp || !core.firstData.levelUp
+    if (core.flags.statusBarItems.indexOf('enableLevelUp')>=0 || !core.firstData.levelUp
         || core.status.hero.lv >= core.firstData.levelUp.length) return null;
     // 计算下一个所需要的数值
     var next = (core.firstData.levelUp[core.status.hero.lv] || {});

libs/ui.js

@@ -1762,9 +1762,9 @@ ui.prototype._drawBook_drawRow2 = function (index, enemy, top, left, width, posi
     var col1 = left, col2 = left + width * 9 / 25, col3 = left + width * 17 / 25;
     // 获得第二行绘制的内容
     var second_line = [];
-    if (core.flags.enableMoney) second_line.push(["金币", core.formatBigNumber(enemy.money || 0)]);
+    if (core.flags.statusBarItems.indexOf('enableMoney')>=0) second_line.push(["金币", core.formatBigNumber(enemy.money || 0)]);
     if (core.flags.enableAddPoint) second_line.push(["加点", core.formatBigNumber(enemy.point || 0)]);
-    if (core.flags.enableExperience) second_line.push(["经验", core.formatBigNumber(enemy.experience || 0)]);
+    if (core.flags.statusBarItems.indexOf('enableExperience')>=0) second_line.push(["经验", core.formatBigNumber(enemy.experience || 0)]);
 
     var damage_offset = col1 + (this.PIXEL - col1) / 2 - 12;
     // 第一列
@@ -2650,7 +2650,7 @@ ui.prototype.drawStatistics = function (floorIds) {
         +"总计打死了"+statistics.battle+"个怪物，得到了"+core.formatBigNumber(statistics.money)+"金币，"+core.formatBigNumber(statistics.experience)+"点经验。\n\n"
         +"受到的总伤害为"+core.formatBigNumber(statistics.battleDamage+statistics.poisonDamage+statistics.extraDamage)
         +"，其中战斗伤害"+core.formatBigNumber(statistics.battleDamage)+"点"
-        +(core.flags.enableDebuff?("，中毒伤害"+core.formatBigNumber(statistics.poisonDamage)+"点"):"")
+        +(core.flags.statusBarItems.indexOf('enableDebuff')>=0?("，中毒伤害"+core.formatBigNumber(statistics.poisonDamage)+"点"):"")
         +"，领域/夹击/阻击/血网伤害"+core.formatBigNumber(statistics.extraDamage)+"点。",
         "\t[说明]1. 地图数据统计的效果仅模拟当前立刻获得该道具的效果。\n2. 不会计算“不可被浏览地图”的隐藏层的数据。\n" +
         "3. 不会计算任何通过事件得到的道具（显示事件、改变图块、或直接增加道具等）。\n"+
@@ -2765,8 +2765,8 @@ ui.prototype._drawStatistics_items = function (floorId, floor, id, obj) {
 ui.prototype._drawStatistics_generateText = function (obj, type, data) {
     var text = type+"地图中：\n";
     text += "共有怪物"+data.monster.count+"个";
-    if (core.flags.enableMoney) text+="，总金币数"+data.monster.money;
-    if (core.flags.enableExperience) text+="，总经验数"+data.monster.experience;
+    if (core.flags.statusBarItems.indexOf('enableMoney')>=0) text+="，总金币数"+data.monster.money;
+    if (core.flags.statusBarItems.indexOf('enableExperience')>=0) text+="，总经验数"+data.monster.experience;
     if (core.flags.enableAddPoint) text+="，总加点数"+data.monster.point;
     text+="。\n";