feat: oi篇增加debuff，并修改数据

project/data.js

@@ -1593,27 +1593,27 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				]
 			},
 			{
-				"need": "6270",
+				"need": "1800",
-				"title": "16岁",
+				"title": "16岁半",
 				"clear": true,
 				"action": [
 					{
 						"type": "setValue",
 						"name": "status:hp",
 						"operator": "+=",
-						"value": "6000"
+						"value": "0"
 					},
 					{
 						"type": "setValue",
 						"name": "status:atk",
 						"operator": "+=",
-						"value": "50"
+						"value": "500"
 					},
 					{
 						"type": "setValue",
 						"name": "status:def",
 						"operator": "+=",
-						"value": "50"
+						"value": "350"
 					}
 				]
 			}

project/enemys.js

@@ -35,7 +35,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"whiteHornSlime": {"name":"尖角怪","hp":1588,"atk":600,"def":274,"money":0,"exp":3,"point":0,"special":0},
 	"redSwordsman": {"name":"剑王","hp":22888,"atk":10999,"def":5266,"money":0,"exp":10,"point":0,"special":[6],"n":4},
 	"poisonZombie": {"name":"莫名的恐惧","hp":300,"atk":110,"def":38,"money":0,"exp":1,"point":0,"special":[]},
-	"octopus": {"name":"血影","hp":80000,"atk":25000,"def":8000,"money":0,"exp":100,"point":0,"special":0,"bigImage":"dragon_1.png"},
+	"octopus": {"name":"血影","hp":80000,"atk":24000,"def":8000,"money":0,"exp":100,"point":0,"special":0,"bigImage":"dragon_1.png"},
 	"princessEnemy": {"name":"假公主","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"angel": {"name":"天使","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"elemental": {"name":"幼儿园毕业","hp":888,"atk":280,"def":88,"money":0,"exp":30,"point":0,"special":0},
@@ -113,27 +113,27 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E462": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E463": {"name":"新敌人","hp":5000,"atk":2400,"def":1200,"money":0,"exp":9,"point":0,"special":[]},
 	"E464": {"name":"新敌人","hp":5200,"atk":2699,"def":1288,"money":0,"exp":9,"point":0,"special":[]},
-	"E465": {"name":"新敌人","hp":15000,"atk":7250,"def":3200,"money":0,"exp":10,"point":0,"special":[]},
+	"E465": {"name":"新敌人","hp":14000,"atk":6800,"def":3200,"money":0,"exp":10,"point":0,"special":[]},
-	"E466": {"name":"新敌人","hp":22500,"atk":11500,"def":3750,"money":0,"exp":10,"point":0,"special":[]},
+	"E466": {"name":"新敌人","hp":22500,"atk":10000,"def":3750,"money":0,"exp":10,"point":0,"special":[]},
 	"E467": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E468": {"name":"新敌人","hp":2888,"atk":235,"def":333,"money":0,"exp":4,"point":0,"special":[2]},
 	"E469": {"name":"记忆深处","hp":440,"atk":235,"def":71,"money":0,"exp":1,"point":0,"special":[]},
-	"E470": {"name":"新敌人","hp":15000,"atk":2500,"def":3000,"money":0,"exp":10,"point":0,"special":[2]},
+	"E470": {"name":"新敌人","hp":12000,"atk":2500,"def":2800,"money":0,"exp":10,"point":0,"special":[2]},
 	"E471": {"name":"幼儿园的烦恼","hp":450,"atk":250,"def":75,"money":0,"exp":1,"point":0,"special":[]},
 	"E472": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E473": {"name":"新环境的压力","hp":350,"atk":188,"def":70,"money":0,"exp":1,"point":0,"special":[]},
 	"E474": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E475": {"name":"新敌人","hp":30000,"atk":13800,"def":4000,"money":0,"exp":10,"point":0,"special":[]},
+	"E475": {"name":"新敌人","hp":30000,"atk":12000,"def":4000,"money":0,"exp":10,"point":0,"special":[]},
 	"E476": {"name":"无形的压迫","hp":420,"atk":80,"def":80,"money":0,"exp":1,"point":0,"special":[2]},
 	"E477": {"name":"显现的优点","hp":2000,"atk":170,"def":300,"money":0,"exp":4,"point":0,"special":[2]},
-	"E478": {"name":"新敌人","hp":14000,"atk":9500,"def":3050,"money":0,"exp":10,"point":0,"special":[]},
+	"E478": {"name":"新敌人","hp":14000,"atk":9000,"def":3050,"money":0,"exp":10,"point":0,"special":[]},
-	"E479": {"name":"新敌人","hp":20000,"atk":10000,"def":3288,"money":0,"exp":10,"point":0,"special":[]},
+	"E479": {"name":"新敌人","hp":20000,"atk":8888,"def":3288,"money":0,"exp":10,"point":0,"special":[]},
 	"E480": {"name":"新敌人","hp":25000,"atk":4000,"def":4000,"money":0,"exp":10,"point":0,"special":[2]},
 	"E481": {"name":"新敌人","hp":50000,"atk":15000,"def":5000,"money":0,"exp":100,"point":0,"special":[]},
 	"E482": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E483": {"name":"幼儿园的压迫","hp":1000,"atk":270,"def":60,"money":0,"exp":35,"point":0,"special":[]},
 	"E484": {"name":"新敌人","hp":42000,"atk":22500,"def":8200,"money":0,"exp":10,"point":0,"special":[5]},
-	"E485": {"name":"新敌人","hp":42850,"atk":20000,"def":7000,"money":0,"exp":10,"point":0,"special":[4]},
+	"E485": {"name":"新敌人","hp":42850,"atk":19500,"def":7000,"money":0,"exp":10,"point":0,"special":[4]},
 	"E486": {"name":"背地的使坏","hp":1000,"atk":440,"def":220,"money":0,"exp":2,"point":0,"special":[]},
 	"E457": {"name":"新环境的影响","hp":430,"atk":260,"def":90,"money":0,"exp":1,"point":0,"special":[]},
 	"E487": {"name":"小学的滋味","hp":460,"atk":275,"def":100,"money":0,"exp":1,"point":0,"special":[]},
@@ -149,7 +149,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E497": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E498": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E499": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E500": {"name":"新敌人","hp":15000,"atk":8000,"def":3000,"money":0,"exp":10,"point":0,"special":[1]},
+	"E500": {"name":"新敌人","hp":15000,"atk":8000,"def":3000,"money":0,"exp":10,"point":0,"special":1},
 	"E501": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E502": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E503": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
@@ -158,12 +158,12 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E506": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E507": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E508": {"name":"新敌人","hp":2588,"atk":999,"def":477,"money":0,"exp":6,"point":0,"special":[4]},
-	"E509": {"name":"新敌人","hp":16000,"atk":8920,"def":3144,"money":0,"exp":10,"point":0,"special":[]},
+	"E509": {"name":"新敌人","hp":16000,"atk":8000,"def":3144,"money":0,"exp":10,"point":0,"special":[]},
 	"E510": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E511": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E512": {"name":"新敌人","hp":7000,"atk":600,"def":1400,"money":0,"exp":9,"point":0,"special":[2]},
 	"E513": {"name":"新敌人","hp":13800,"atk":2500,"def":2500,"money":0,"exp":10,"point":0,"special":[2]},
-	"E514": {"name":"新敌人","hp":15000,"atk":3500,"def":3200,"money":0,"exp":10,"point":0,"special":[2]},
+	"E514": {"name":"新敌人","hp":15000,"atk":3200,"def":3200,"money":0,"exp":10,"point":0,"special":[2]},
 	"E515": {"name":"新敌人","hp":40000,"atk":6000,"def":6400,"money":0,"exp":10,"point":0,"special":[2]},
 	"E516": {"name":"新敌人","hp":6000,"atk":2650,"def":1350,"money":0,"exp":9,"point":0,"special":[]},
 	"E517": {"name":"新敌人","hp":50000,"atk":18888,"def":8888,"money":0,"exp":10,"point":0,"special":[]},
@@ -180,10 +180,10 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E528": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E529": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E530": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E531": {"name":"新敌人","hp":15000,"atk":8400,"def":3088,"money":0,"exp":10,"point":0,"special":[6],"value":null,"n":4},
+	"E531": {"name":"新敌人","hp":15000,"atk":8000,"def":3088,"money":0,"exp":10,"point":0,"special":[6],"value":null,"n":4},
 	"E532": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E533": {"name":"新敌人","hp":40000,"atk":18600,"def":7600,"money":0,"exp":10,"point":0,"special":[6],"n":4},
+	"E533": {"name":"新敌人","hp":40000,"atk":18000,"def":7600,"money":0,"exp":10,"point":0,"special":[6],"n":4},
-	"E534": {"name":"新敌人","hp":12000,"atk":7500,"def":3000,"money":0,"exp":10,"point":0,"special":[]},
+	"E534": {"name":"新敌人","hp":12000,"atk":6800,"def":3000,"money":0,"exp":10,"point":0,"special":[]},
 	"E535": {"name":"新敌人","hp":24000,"atk":12888,"def":5433,"money":0,"exp":10,"point":0,"special":[]},
 	"E536": {"name":"新敌人","hp":24888,"atk":5000,"def":5599,"money":0,"exp":10,"point":0,"special":[2]},
 	"E537": {"name":"新敌人","hp":45000,"atk":17233,"def":8500,"money":0,"exp":10,"point":0,"special":[]},
@@ -191,7 +191,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E539": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E540": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E541": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E542": {"name":"新敌人","hp":50000,"atk":18888,"def":8000,"money":0,"exp":10,"point":0,"special":[]},
+	"E542": {"name":"新敌人","hp":50000,"atk":18500,"def":8000,"money":0,"exp":10,"point":0,"special":[]},
 	"E543": {"name":"新敌人","hp":34000,"atk":20000,"def":7500,"money":0,"exp":10,"point":0,"special":[]},
 	"E544": {"name":"新敌人","hp":80000,"atk":30000,"def":12000,"money":0,"exp":10,"point":0,"special":[]},
 	"E545": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
@@ -226,14 +226,14 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E628": {"name":"新敌人","hp":8000,"atk":2500,"def":1050,"money":0,"exp":8,"point":0,"special":[]},
 	"E629": {"name":"新敌人","hp":6000,"atk":2200,"def":1000,"money":0,"exp":8,"point":0,"special":[]},
 	"E630": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E631": {"name":"新敌人","hp":30000,"atk":12000,"def":10000,"money":0,"exp":10,"point":0,"special":[3]},
+	"E631": {"name":"新敌人","hp":100,"atk":12300,"def":10000,"money":0,"exp":10,"point":0,"special":[3]},
 	"E632": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E633": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E634": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E775": {"name":"新敌人","hp":7000,"atk":3720,"def":1768,"money":0,"exp":10,"point":0,"special":[]},
 	"E776": {"name":"新敌人","hp":5400,"atk":1920,"def":888,"money":0,"exp":8,"point":0,"special":[]},
 	"E777": {"name":"新敌人","hp":8888,"atk":5800,"def":2000,"money":0,"exp":10,"point":0,"special":[]},
-	"E778": {"name":"新敌人","hp":14000,"atk":8888,"def":3000,"money":0,"exp":10,"point":0,"special":[]},
+	"E778": {"name":"新敌人","hp":14000,"atk":8500,"def":3000,"money":0,"exp":10,"point":0,"special":[]},
 	"E779": {"name":"新敌人","hp":6500,"atk":3600,"def":1740,"money":0,"exp":10,"point":0,"special":[]},
 	"E780": {"name":"新敌人","hp":5290,"atk":1618,"def":900,"money":0,"exp":8,"point":0,"special":[4]},
 	"E781": {"name":"新敌人","hp":5000,"atk":1600,"def":900,"money":0,"exp":8,"point":0,"special":[]},
@@ -250,7 +250,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"E792": {"name":"新敌人","hp":7000,"atk":2788,"def":1428,"money":0,"exp":9,"point":0,"special":[5]},
 	"E798": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E810": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
-	"E811": {"name":"北大的签约","hp":400000,"atk":20000,"def":15000,"money":0,"exp":15,"point":0,"special":[30],"bigImage":"heiniao.png","notBomb":true},
+	"E811": {"name":"北大的签约","hp":999999,"atk":88888,"def":60000,"money":0,"exp":15,"point":0,"special":[30],"bigImage":"heiniao.png","notBomb":true},
 	"E806": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E807": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"E808": {"name":"新敌人","hp":40000,"atk":14000,"def":6400,"money":0,"exp":10,"point":0,"special":[]},

project/floors/BOSS4.js

@@ -14,6 +14,25 @@ main.floors.BOSS4=
     "defaultGround": "ground",
     "bgm": "guimie.mp3",
     "firstArrive": [
+        "攻防血增加5倍",
+        {
+            "type": "setValue",
+            "name": "status:hp",
+            "operator": "*=",
+            "value": "5"
+        },
+        {
+            "type": "setValue",
+            "name": "status:atk",
+            "operator": "*=",
+            "value": "5"
+        },
+        {
+            "type": "setValue",
+            "name": "status:def",
+            "operator": "*=",
+            "value": "5"
+        },
         {
             "type": "setCurtain",
             "time": 500
@@ -23,15 +42,52 @@ main.floors.BOSS4=
     "parallelDo": "",
     "events": {},
     "changeFloor": {},
-    "beforeBattle": {},
+    "beforeBattle": {
+        "6,2": [
+            {
+                "type": "setValue",
+                "name": "status:exp",
+                "operator": "-=",
+                "value": "15"
+            }
+        ]
+    },
     "afterBattle": {
         "6,2": [
+            {
+                "type": "setValue",
+                "name": "status:hp",
+                "operator": "/=",
+                "value": "5"
+            },
+            {
+                "type": "setValue",
+                "name": "status:atk",
+                "operator": "/=",
+                "value": "5"
+            },
+            {
+                "type": "setValue",
+                "name": "status:def",
+                "operator": "/=",
+                "value": "5"
+            },
+            {
+                "type": "setValue",
+                "name": "status:exp",
+                "operator": "+=",
+                "value": "3"
+            },
             {
                 "type": "setValue",
                 "name": "status:hp",
                 "operator": "+=",
                 "value": "item:yellowKey*120000+item:blueKey*300000+item:redKey*900000+item:pickaxe*1800000"
             },
+            {
+                "type": "function",
+                "function": "function(){\ncore.events.checkLvUp()\n}"
+            },
             {
                 "type": "win",
                 "reason": ""
@@ -51,9 +107,9 @@ main.floors.BOSS4=
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
-    [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
+    [300253,300253,300253,300253,300253,553,438,553,300253,300253,300253,300253,300253],
-    [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
+    [300253,300253,300253,300253,300253,553,589,553,300253,300253,300253,300253,300253],
-    [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
+    [300253,300253,300253,300253,300253,553,585,553,300253,300253,300253,300253,300253],
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253],
     [300253,300253,300253,300253,300253,553,  0,553,300253,300253,300253,300253,300253]

project/floors/MT100.js

@@ -387,28 +387,6 @@ main.floors.MT100=
                 ]
             }
         ],
-        "2,10": [
-            {
-                "type": "setValue",
-                "name": "flag:xuedijing",
-                "operator": "+=",
-                "value": "1"
-            },
-            {
-                "type": "if",
-                "condition": "(flag:xuedijing==121)",
-                "true": [
-                    {
-                        "type": "openDoor",
-                        "loc": [
-                            6,
-                            5
-                        ],
-                        "floorId": "MT105"
-                    }
-                ]
-            }
-        ],
         "1,6": [
             {
                 "type": "setValue",
@@ -518,6 +496,28 @@ main.floors.MT100=
                     }
                 ]
             }
+        ],
+        "2,10": [
+            {
+                "type": "setValue",
+                "name": "flag:xuedijing",
+                "operator": "+=",
+                "value": "1"
+            },
+            {
+                "type": "if",
+                "condition": "(flag:xuedijing==121)",
+                "true": [
+                    {
+                        "type": "openDoor",
+                        "loc": [
+                            6,
+                            5
+                        ],
+                        "floorId": "MT105"
+                    }
+                ]
+            }
         ]
     },
     "afterGetItem": {},

project/floors/MT105.js

@@ -389,7 +389,9 @@ main.floors.MT105=
             "up"
         ],
         "6,4": [
-            "up"
+            "up",
+            "left",
+            "right"
         ],
         "5,4": [
             "up"

project/floors/MT106.js

@@ -44,7 +44,7 @@ main.floors.MT106=
     [140,140,733,140,140,140,140,140,140,140,492,140,140],
     [140,140,641,140,140,140,140,140,140,140, 81,140,140],
     [140,140,  0,639,  0,535,  0, 82,  0,731,  0,140,140],
-    [140,140,140,140,140,140,  0,738,140,140,140,140,140],
+    [140,140,140,140,140,140,738,140,140,140,140,140,140],
     [140,140,140,140,140,140,  0,140,140,140,140,140,140],
     [140,140,140,140,140,140,  0,140,140,140,140,140,140]
 ],

project/floors/MT119.js

@@ -43,10 +43,10 @@ main.floors.MT119=
     "map": [
     [320216,320217,320218,320219,320220,  0, 91,  0,320216,320217,320218,320219,320220],
     [320224,320225,320226,320227,320228,  0,  0,  0,320224,320225,320226,320227,320228],
-    [320232,320233,320234,320235,320236,  0,  0,  0,320232,320233,320234,320235,320236],
+    [320232,320233,320234,320235,320236,  0,737,  0,320232,320233,320234,320235,320236],
     [320240,320241,320242,320243,320244,  0,257,  0,320240,320241,320242,320243,320244],
-    [801,801,801,801,801,801,  0,801,801,801,801,801,801],
+    [801,801,801,801,801,801, 83,801,801,801,801,801,801],
-    [801,801,801,801,801,801,737,801,801,801,801,801,801],
+    [801,801,801,801,801,801, 83,801,801,801,801,801,801],
     [801,  0,603,603,  0,801,  0,801,  0,604,604,  0,801],
     [801,544,801,801, 82,801,544,801, 82,801,801,544,801],
     [801,737,  0,801,  0, 81,  0, 81,  0,735,735,  0,801],

project/floors/MT120.js

@@ -16,7 +16,39 @@ main.floors.MT120=
     "firstArrive": [],
     "eachArrive": [],
     "parallelDo": "",
-    "events": {},
+    "events": {
+        "6,1": {
+            "trigger": "action",
+            "enable": true,
+            "noPass": null,
+            "displayDamage": true,
+            "opacity": 1,
+            "filter": {
+                "blur": 0,
+                "hue": 0,
+                "grayscale": 0,
+                "invert": false,
+                "shadow": 0
+            },
+            "data": [
+                {
+                    "type": "if",
+                    "condition": "((status:lv>=25)&&(status:exp>=1797))",
+                    "true": [
+                        {
+                            "type": "openDoor"
+                        }
+                    ],
+                    "false": [
+                        {
+                            "type": "tip",
+                            "text": "你没有清完所有怪物！"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
     "changeFloor": {
         "6,12": {
             "floorId": "MT119",
@@ -39,19 +71,25 @@ main.floors.MT120=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,0": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [658,658,658,658,658,658, 89,658,658,658,658,658,658],
+    [658,658,658,658,658,658, 86,658,658,658,658,658,658],
+    [737,658,735,738,738, 83,  0, 82,734,735, 82,734,735],
+    [737,658,658,658,658,658,  0,658,658,658,658,658,658],
+    [737,658,735,738,738, 83,  0, 82,734,735, 82,734,735],
     [658,658,658,658,658,658,  0,658,658,658,658,658,658],
-    [658,737,738, 83,734, 81,  0, 81,734, 82,734,735,658],
+    [735,734, 82,735,734, 82,  0, 82,734,735, 82,734,735],
     [658,658,658,658,658,658,  0,658,658,658,658,658,658],
-    [658,737,738, 83,734, 81,  0, 81,734, 82,734,735,658],
+    [734, 81,734, 81,734, 81,  0, 81,734, 81,734, 81,734],
     [658,658,658,658,658,658,  0,658,658,658,658,658,658],
-    [658,737,738, 83,734, 81,  0, 81,734, 82,734,735,658],
+    [734, 81,734, 81,734, 81,  0, 81,734, 81,734, 81,734],
-    [658,658,658,658,658,658,  0,658,658,658,658,658,658],
-    [658,735,734, 82,734, 81,  0, 81,734, 82,734,735,658],
-    [658,658,658,658,658,658,  0,658,658,658,658,658,658],
-    [658,735,734, 82,734, 81,  0, 81,734, 82,734,735,658],
     [658,658,658,658,658,658,  0,658,658,658,658,658,658],
     [658,658,658,658,658,658, 93,658,658,658,658,658,658]
 ],

project/floors/MT50.js

@@ -286,7 +286,13 @@ main.floors.MT50=
         }
     },
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,1": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4],
     [  4,770,  1,768, 23,  4, 89,  4,773,768,  1,770,  4],

project/floors/MT51.js

@@ -145,7 +145,13 @@ main.floors.MT51=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,2": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,152,152,152,152,152,152,152,152,152,152,152,  0],

project/floors/MT58.js

@@ -67,8 +67,92 @@ main.floors.MT58=
     "afterGetItem": {},
     "afterOpenDoor": {},
     "autoEvent": {},
-    "cannotMove": {},
+    "cannotMove": {
-    "cannotMoveIn": {},
+        "2,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"3,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"4,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"5,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"7,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"8,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"9,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"10,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ]
+    },
+    "cannotMoveIn": {
+        "2,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"3,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"4,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"5,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"7,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"8,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"9,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ],"10,5": [
+            "up",
+            "down",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,  0],

project/floors/MT68.js

@@ -66,7 +66,13 @@ main.floors.MT68=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "5,4": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033],
     [480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033,480033],

project/floors/MT76.js

@@ -88,7 +88,13 @@ main.floors.MT76=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,3": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [174,174,174,174,174,174,174,174,174,174,174,174,174],
     [174,174,174,174,174,174,174,174,174,174,174,174,174],

project/floors/MT87.js

@@ -128,7 +128,13 @@ main.floors.MT87=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,0": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [182,182,182,182,182,182, 89,182,182,182,182,182,182],
     [182,182,182,182,182,182, 86,182,182,182,182,182,182],

project/floors/MT88.js

@@ -421,9 +421,7 @@ main.floors.MT88=
         "7,0": [
             "left"
         ],
-        "2,0": [
+        "2,0": [],
-            "left"
-        ],
         "4,1": [],
         "4,2": [
             "right"
@@ -498,9 +496,7 @@ main.floors.MT88=
         "7,0": [
             "left"
         ],
-        "2,0": [
+        "2,0": [],
-            "left"
-        ],
         "4,1": [],
         "4,2": [
             "right"

project/floors/MT95.js

@@ -260,7 +260,13 @@ main.floors.MT95=
     "afterOpenDoor": {},
     "autoEvent": {},
     "cannotMove": {},
-    "cannotMoveIn": {},
+    "cannotMoveIn": {
+        "6,0": [
+            "up",
+            "left",
+            "right"
+        ]
+    },
     "map": [
     [  0,390035,  0,390036,  0,390050, 89,390048,  0,390036,  0,390035,  0],
     [390057,390057,390057,390057,390057,390058, 86,390056,390057,390057,390057,390057,390057],

project/floors/MT96.js

@@ -13,10 +13,30 @@ main.floors.MT96=
     "ratio": 1,
     "defaultGround": "ground",
     "bgm": "zy.mp3",
-    "firstArrive": [],
+    "firstArrive": [
+        {
+            "type": "setValue",
+            "name": "item:I800",
+            "operator": "+=",
+            "value": "1"
+        }
+    ],
     "eachArrive": [],
     "parallelDo": "",
-    "events": {},
+    "events": {
+        "6,11": [
+            {
+                "type": "setValue",
+                "name": "item:I800",
+                "operator": "+=",
+                "value": "1"
+            },
+            {
+                "type": "hide",
+                "remove": true
+            }
+        ]
+    },
     "changeFloor": {
         "6,0": {
             "floorId": "MT97",
@@ -332,7 +352,7 @@ main.floors.MT96=
     [143,143,143,143,143,143,534,143,143,143,143,143,143],
     [143,143,143,143,143,143,  0,143,143,143,143,143,143],
     [143,143,143,143,143,143,734,143,143,143,143,143,143],
-    [143,143,143,143,143,143,331,143,143,143,143,143,143],
+    [143,143,143,143,143,143,  0,143,143,143,143,143,143],
     [143,143,143,143,143,143,  0,143,143,143,143,143,143]
 ],
     "bgmap": [

project/functions.js

@@ -726,7 +726,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 
 	// 先攻
 	if (core.hasSpecial(mon_special, 1)) init_damage += per_damage;
-	if (core.hasItem('I331') && core.status.hero.lv <= 25) init_damage += per_damage;
+	if (core.hasItem('I800') && core.status.hero.lv <= 25) init_damage += per_damage;
 
 	// 压迫
 	if (core.hasSpecial(mon_special, 28)) per_damage += 2000;

project/icons.js

@@ -753,7 +753,11 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"I822": 168,
 		"I823": 169,
 		"I824": 170,
-		"I825": 171
+		"I825": 171,
+		"I800": 172,
+		"I804": 173,
+		"I805": 174,
+		"I826": 175
 	},
 	"autotile": {
 		"autotile": 0,

project/items.js

@@ -289,7 +289,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "tools",
 		"name": "破墙镐",
 		"text": "可以破坏勇士面前的墙",
-		"useItemEffect": "(function () {\n\tvar canBreak = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable) return false;\n\t\treturn block.event.cls.indexOf('enemy') != 0 && block.event.cls.indexOf('items') != 0;\n\t};\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar success = false,\n\t\tfail = false;\n\tvar pickaxeFourDirections = false; // 是否多方向破；如果是将其改成true\n\tif (pickaxeFourDirections) {\n\t\t// 多方向破\n\t\tfor (var direction in core.utils.scan) { // 多方向破默认四方向，如需改成八方向请将这两个scan改为scan2\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (canBreak(nx, ny)) {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\t// 仅破当前\n\t\tif (canBreak(core.nextX(), core.nextY())) {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t} else if (canBomb(core.nextX(), core.nextY())) {\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'atk', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'def', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'hp', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'special', 0);\n\t\t\tcore.saveAndStopAutomaticRoute();\n\t\t\tcore.afterBattle(core.getBlockId(core.nextX(), core.nextY()), core.nextX(), core.nextY());\n\t\t\tfail = true;\n\t\t}\n\t}\n\n\tif (success || fail) {\n\t\tcore.playSound('破墙镐');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\t} else {\n\t\t// 无法使用\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
+		"useItemEffect": "(function () {\n\tvar canBreak = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable) return false;\n\t\treturn block.event.cls.indexOf('enemy') != 0 && block.event.cls.indexOf('items') != 0 && ![85, 86, 17].includes(block.id);\n\t};\n\tvar canBomb = function (x, y) {\n\t\tvar block = core.getBlock(x, y);\n\t\tif (block == null || block.disable || block.event.cls.indexOf('enemy') != 0) return false;\n\t\tvar enemy = core.material.enemys[block.event.id];\n\t\treturn enemy && !enemy.notBomb;\n\t};\n\n\tvar success = false,\n\t\tfail = false;\n\tvar pickaxeFourDirections = false; // 是否多方向破；如果是将其改成true\n\tif (pickaxeFourDirections) {\n\t\t// 多方向破\n\t\tfor (var direction in core.utils.scan) { // 多方向破默认四方向，如需改成八方向请将这两个scan改为scan2\n\t\t\tvar delta = core.utils.scan[direction];\n\t\t\tvar nx = core.getHeroLoc('x') + delta.x,\n\t\t\t\tny = core.getHeroLoc('y') + delta.y;\n\t\t\tif (canBreak(nx, ny)) {\n\t\t\t\tcore.removeBlock(nx, ny);\n\t\t\t\tsuccess = true;\n\t\t\t}\n\t\t}\n\t} else {\n\t\t// 仅破当前\n\t\tif (canBreak(core.nextX(), core.nextY())) {\n\t\t\tcore.removeBlock(core.nextX(), core.nextY());\n\t\t\tsuccess = true;\n\t\t} else if (canBomb(core.nextX(), core.nextY())) {\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'atk', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'def', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'hp', 0);\n\t\t\tcore.setEnemyOnPoint(core.nextX(), core.nextY(), null, 'special', 0);\n\t\t\tcore.saveAndStopAutomaticRoute();\n\t\t\tcore.afterBattle(core.getBlockId(core.nextX(), core.nextY()), core.nextX(), core.nextY());\n\t\t\tfail = true;\n\t\t}\n\t}\n\n\tif (success || fail) {\n\t\tcore.playSound('破墙镐');\n\t\tcore.drawTip(core.material.items[itemId].name + '使用成功', itemId);\n\t} else {\n\t\t// 无法使用\n\t\tcore.playSound('操作失败');\n\t\tcore.drawTip(\"当前无法使用\" + core.material.items[itemId].name, itemId);\n\t\tcore.addItem(itemId, 1);\n\t\treturn;\n\t}\n})();",
 		"canUseItemEffect": "true"
 	},
 	"icePickaxe": {
@@ -1206,13 +1206,34 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"cls": "items",
 		"name": "烈焰刃",
 		"canUseItemEffect": "true",
-		"itemEffect": "core.status.hero.atk += 2500"
+		"itemEffect": "core.status.hero.atk += 1500"
 	},
 	"I825": {
 		"cls": "items",
 		"name": "金之盾",
 		"canUseItemEffect": "true",
-		"itemEffect": "core.status.hero.def += 2500",
+		"itemEffect": "core.status.hero.def += 1500",
-		"itemEffectTip": "，防御+2500"
+		"itemEffectTip": "，防御+1500"
+	},
+	"I800": {
+		"cls": "constants",
+		"name": "恶意",
+		"canUseItemEffect": "true",
+		"text": "入学半年，我就得罪了无数人，还被张逸凡给踢出了同学群，他们的恶意时刻影响着我。受此影响，本区接下来的怪物先攻。"
+	},
+	"I804": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I805": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I826": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
 	}
 }

project/maps.js

@@ -724,9 +724,12 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"797": {"cls":"npc48","id":"N797","animate":1},
 	"798": {"cls":"enemys","id":"E798"},
 	"799": {"cls":"npcs","id":"N799"},
+	"800": {"cls":"items","id":"I800"},
 	"801": {"cls":"npcs","id":"N801","canBreak":true},
 	"802": {"cls":"npcs","id":"N802","canBreak":true},
 	"803": {"cls":"npcs","id":"N803","canBreak":true},
+	"804": {"cls":"items","id":"I804"},
+	"805": {"cls":"items","id":"I805"},
 	"806": {"cls":"enemys","id":"E806"},
 	"807": {"cls":"enemys","id":"E807"},
 	"808": {"cls":"enemys","id":"E808"},
@@ -747,6 +750,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"823": {"cls":"items","id":"I823"},
 	"824": {"cls":"items","id":"I824"},
 	"825": {"cls":"items","id":"I825"},
+	"826": {"cls":"items","id":"I826"},
 	"10044": {"cls":"tileset","id":"X10044","canBreak":true},
 	"230092": {"cls":"tileset","id":"X230092","canPass":true},
 	"450158": {"cls":"tileset","id":"X450158","canPass":true},