diff --git a/project/floors/BH1.js b/project/floors/BH1.js
index 20a4a48..0509240 100644
--- a/project/floors/BH1.js
+++ b/project/floors/BH1.js
@@ -176,8 +176,8 @@ main.floors.BH1=
                             "\t[???,N467]\b[this,0,6]啊?",
                             "\t[光明骑士,N440]\b[this,2,7]殿下，这小子不清不楚的，你怎么能让他留在身边呢……",
                             "\t[辉,hero]\b[hero]我意已决，不用多说。你叫什么名字？",
-                            "\t[???,N467]\b[this,0,6]回殿下，我叫唐佳成。",
-                            "\t[辉,hero]\b[hero]那好，唐佳成，你去圣子宫等着吧。我给你一些东西。",
+                            "\t[???,N467]\b[this,0,6]回殿下，我叫${flag:shengqishi_name}。",
+                            "\t[辉,hero]\b[hero]那好，${flag:shengqishi_name}，你去圣子宫等着吧。我给你一些东西。",
                             {
                                 "type": "setValue",
                                 "name": "status:atk",
@@ -196,8 +196,8 @@ main.floors.BH1=
                                 "operator": "-=",
                                 "value": "200"
                             },
-                            "资助可怜的小乞丐唐佳成，攻防-2，生命上限-200",
-                            "\t[唐佳成,N467]\b[this,0,6]谢谢圣子殿下！",
+                            "资助可怜的小乞丐${flag:shengqishi_name}，攻防-2，生命上限-200",
+                            "\t[${flag:shengqishi_name},N467]\b[this,0,6]谢谢圣子殿下！",
                             {
                                 "type": "hide",
                                 "loc": [
diff --git a/project/floors/GM1.js b/project/floors/GM1.js
index 839ced4..59cdf98 100644
--- a/project/floors/GM1.js
+++ b/project/floors/GM1.js
@@ -14,6 +14,11 @@ main.floors.GM1=
     "defaultGround": "X30023",
     "bgm": "mingyunshouhu.mp3",
     "firstArrive": [
+        {
+            "type": "setValue",
+            "name": "flag:shengqishi_name",
+            "value": "\"鹿间裕贵\""
+        },
         {
             "type": "changePos",
             "direction": "up"
diff --git a/project/floors/GM3.js b/project/floors/GM3.js
index 3e68c8e..b6498e4 100644
--- a/project/floors/GM3.js
+++ b/project/floors/GM3.js
@@ -138,11 +138,11 @@ main.floors.GM3=
                 "shadow": 0
             },
             "data": [
-                "\t[唐佳成,N467]\b[this]圣子殿下！",
-                "\t[辉,hero]\b[hero]emmm，唐佳成，你待在光明神殿最好还是找个事儿做。我总不能一直养着你吧?",
-                "\t[唐佳成,N467]\b[this]是，我想当骑士！",
+                "\t[${flag:shengqishi_name},N467]\b[this]圣子殿下！",
+                "\t[辉,hero]\b[hero]emmm，${flag:shengqishi_name}，你待在光明神殿最好还是找个事儿做。我总不能一直养着你吧?",
+                "\t[${flag:shengqishi_name},N467]\b[this]是，我想当骑士！",
                 "\t[辉,hero]\b[hero]是个不错的想法，那你去教皇殿右边的骑士团吧！",
-                "\t[唐佳成,N467]\b[this]是！"
+                "\t[${flag:shengqishi_name},N467]\b[this]是！"
             ]
         }
     },
diff --git a/project/plugins.js b/project/plugins.js
index 0617b39..42ad8eb 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -2608,7 +2608,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 
 	// 忽略的道具
 	const ignore = ['superPotion'];
-	const box = ['X10110'];
+	const box = ['X10110', 'X60549'];
 	const portals = ['upPortal', 'downPortal', 'leftPortal', 'rightPortal'];
 
 	// 取消注释下面这句可以减少超大地图的判定。
@@ -2649,7 +2649,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		const hero = core.clone(core.status.hero);
 		const handler = {
 			set(target, key, v) {
-				diff[key] = v - (target[key] || 0);
+				diff[key] = (diff[key] || 0) + v - (target[key] || 0);
 				if (!diff[key]) diff[key] = void 0;
 				return true;
 			}
@@ -2681,6 +2681,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				if (!block.event.trigger) {
 					drawItemDetail({ 'atk': 'X' }, x, y);
 				}
+				else if (block.event.trigger == "changeFloor") {
+					drawItemDetail({ 'atk': block.event.data.floorId/*, 'def': block.event.data.loc.join(',')*/ }, x, y);
+				}
 			}
 			if (item && item.cls === 'equips') {
 				// 装备也显示
@@ -2703,7 +2706,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							if ((i.name.indexOf("item:") == 0)) {
 								var itemId = i.name.substring(5),
 									count = core.itemCount(itemId);
-								diff[itemId] = value - count;
+								if (core.material.items[itemId].itemEffect) {
+									for (var i = count; i < value; i++) eval(core.material.items[itemId].itemEffect);
+								} else diff[itemId] = value - count;
 							}
 
 							//core.events._setValue_setBuff(i.name, value);
@@ -2714,7 +2719,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 							//core.events._setValue_setGlobal(i.name, value);
 							//core.events.setValue(i.name, i.operator, i.value);
 						};
-					diff['mana'] += 50;
+					diff['mana'] += { 'X10110': 50, 'X60549': 200 } [block.event.id] || 0;
 				} else
 					eval(item.itemEffect);
 			} catch (error) {}
@@ -2775,7 +2780,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				color = '#8f8';
 				break;
 			default:
-				if (diff[name] == 1) content = name;
+				if (diff[name] == 1) content = core.material.items[name].name;
 			}
 			// 绘制
 			core.status.damage.data.push({