diff --git a/_server/CodeMirror/defs.js b/_server/CodeMirror/defs.js
index de741741..17adb7a4 100644
--- a/_server/CodeMirror/defs.js
+++ b/_server/CodeMirror/defs.js
@@ -983,6 +983,62 @@ var terndefs_f6783a0a_522d_417e_8407_94c67b692e50 = [
         "!stdProto": "Boolean"
       },
     },
+    "abstract": "?",
+    "arguments": "?",
+    "boolean": "?",
+    "break": "?",
+    "byte": "?",
+    "case": "?",
+    "catch": "?",
+    "char": "?",
+    "const": "?",
+    "continue": "?",
+    "debugger": "?",
+    "default": "?",
+    "delete": "?",
+    "do": "?",
+    "double": "?",
+    "else": "?",
+    "eval": "?",
+    "false": "bool",
+    "final": "?",
+    "finally": "?",
+    "float": "?",
+    "for": "?",
+    "function": "?",
+    "goto": "?",
+    "if": "?",
+    "implements": "?",
+    "in": "?",
+    "instanceof": "?",
+    "int": "?",
+    "interface": "?",
+    "long": "?",
+    "native": "?",
+    "new": "?",
+    "null": "?",
+    "package": "?",
+    "private": "?",
+    "protected": "?",
+    "public": "?",
+    "return": "?",
+    "short": "?",
+    "static": "?",
+    "switch": "?",
+    "synchronized": "?",
+    "this": "?",
+    "throw": "?",
+    "throws": "?",
+    "transient": "?",
+    "true": "bool",
+    "try": "?",
+    "typeof": "?",
+    "var": "?",
+    "void": "?",
+    "volatile": "?",
+    "while": "?",
+    "with": "?",
+    "yield": "?",
     "RegExp": {
       "!type": "fn(source: string, flags?: string)",
       "prototype": {
@@ -2074,7 +2130,7 @@ var terndefs_f6783a0a_522d_417e_8407_94c67b692e50 = [
         }, 
         "playSound": {
           "!doc": "播放一个音效",
-          "!tyoe": "fn(sound: string)"
+          "!type": "fn(sound: string)"
         },
         "stopSound": {
           "!doc": "停止所有SE", 
diff --git a/_server/editor.js b/_server/editor.js
index 5198a509..7fbbe2e9 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -163,10 +163,10 @@ editor.prototype.init = function (callback) {
         if (str.length != 3) window.onerror("index.html格式不正确");
         editor.dom.gameInject.innerHTML = str[1];
         
-        var cvs = ['bg', 'fg', 'event', 'event2'].map(function(e) {
+        var cvs = ['bg', 'event', 'event2', 'fg'].map(function(e) {
             return document.getElementById(e);
         });
-        ['bg', 'fg', 'ev', 'ev2'].forEach(function(e, i) {
+        ['bg', 'ev', 'ev2', 'fg'].forEach(function(e, i) {
             editor.dom[e+'c'] = cvs[i];
             editor.dom[e+'Ctx'] = cvs[i].getContext('2d');
             
diff --git a/_server/editor_multi.js b/_server/editor_multi.js
index 82c660d1..f9fe4389 100644
--- a/_server/editor_multi.js
+++ b/_server/editor_multi.js
@@ -8,7 +8,7 @@ editor_multi = function () {
         "Ctrl-/": function (cm) { cm.toggleComment(); },
         "Ctrl-B": function (cm) { ternServer.jumpToDef(cm); },
         "Ctrl-Q": function(cm) { ternServer.rename(cm); },
-        "Ctrl-F": CodeMirror.commands.find,
+        "Ctrl-F": CodeMirror.commands.findPersistent,
         "Ctrl-R": CodeMirror.commands.replaceAll,
         "Ctrl-D": function(cm){ cm.foldCode(cm.getCursor()); },
         "Ctrl-O": function () { editor_multi.openUrl('/_docs/#/api'); },
@@ -37,12 +37,12 @@ editor_multi = function () {
     });
 
     var commandsName = {
-        'Ctrl+/': '注释当前行（Ctrl+/）',
+        'Ctrl-/': '注释当前选中行（Ctrl+/）',
         'Ctrl-B': '跳转到定义（Ctrl+B）',
         'Ctrl-Q': '重命名变量（Ctrl+Q）',
         'Ctrl-F': '查找（Ctrl+F）',
         'Ctrl-R': '全部替换（Ctrl+R）',
-        'Ctrl-D': '折叠块（Ctrl+D）',
+        'Ctrl-D': '折叠或展开块（Ctrl+D）',
         'Ctrl-O': '打开API列表（Ctrl+O）',
         'Ctrl-P': '打开在线插件列表（Ctrl+P）'
     };
diff --git a/project/functions.js b/project/functions.js
index 45b68e6b..c3da7ca3 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -515,7 +515,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	// 光环和支援检查
 	if (!core.status.checkBlock) core.status.checkBlock = {};
 
-	if (core.status.checkBlock.needCache || floorId != core.status.floorId) {
+	if (core.status.checkBlock.needCache) {
 		// 从V2.5.4开始，对光环效果增加缓存，以解决多次重复计算的问题，从而大幅提升运行效率。
 		var hp_buff = 0,
 			atk_buff = 0,
@@ -1187,6 +1187,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		// 检查地图范围类技能
 		var specialFlag = core.getSpecialFlag(enemy);
 		if (specialFlag & 1) needCache = true;
+		if (core.status.event.id == 'viewMaps') needCache = true;
+		if ((core.status.event.id == 'book' || core.status.event.id == 'bool-detail') && core.status.event.ui) needCache = true;
 	}
 
 	// 更新夹击伤害