Merge branch 'shengqishi' into feature

project/data.js

@@ -61,7 +61,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"CZ8",
 			"CZ9",
 			"CZ10",
-			"MM1"
+			"MM1",
+			"SR1"
 		],
 		"floorPartitions": [],
 		"images": [

project/floors/CZ10.js

@@ -241,7 +241,12 @@ main.floors.CZ10=
             },
             "data": [
                 {
-                    "type": "changeFloor"
+                    "type": "changeFloor",
+                    "floorId": "SR1",
+                    "loc": [
+                        6,
+                        12
+                    ]
                 }
             ]
         }
@@ -902,15 +907,6 @@ main.floors.CZ10=
                                 ],
                                 "remove": true
                             },
-                            {
-                                "type": "show",
-                                "loc": [
-                                    [
-                                        6,
-                                        0
-                                    ]
-                                ]
-                            },
                             {
                                 "type": "hide",
                                 "loc": [
@@ -920,19 +916,28 @@ main.floors.CZ10=
                                     ]
                                 ],
                                 "remove": true
-                            },
-                            {
-                                "type": "setBlock",
-                                "number": "upPortal",
-                                "loc": [
-                                    [
-                                        6,
-                                        0
-                                    ]
-                                ]
                             }
                         ]
                     },
+                    {
+                        "type": "setBlock",
+                        "number": "upPortal",
+                        "loc": [
+                            [
+                                6,
+                                0
+                            ]
+                        ]
+                    },
+                    {
+                        "type": "show",
+                        "loc": [
+                            [
+                                6,
+                                0
+                            ]
+                        ]
+                    },
                     {
                         "type": "changeFloor",
                         "floorId": "MM1"

project/floors/MM1.js

@@ -5,10 +5,10 @@ main.floors.MM1=
     "name": "1",
     "width": 13,
     "height": 13,
-    "canFlyTo": true,
+    "canFlyTo": false,
-    "canFlyFrom": true,
+    "canFlyFrom": false,
-    "canUseQuickShop": true,
+    "canUseQuickShop": false,
-    "cannotViewMap": false,
+    "cannotViewMap": true,
     "images": [],
     "ratio": 1,
     "defaultGround": "X10025",
@@ -51,5 +51,6 @@ main.floors.MM1=
 ],
     "fg2map": [
 
-]
+],
+    "cannotMoveDirectly": false
 }

project/floors/SR1.js

@@ -0,0 +1,95 @@
+main.floors.SR1=
+{
+    "floorId": "SR1",
+    "title": "深入 1 ",
+    "name": "深入1",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "cannotViewMap": false,
+    "images": [],
+    "ratio": 2,
+    "defaultGround": "grass",
+    "bgm": "mingyuetianya.mp3",
+    "firstArrive": [
+        "\t[莫析辉,hero]\b[hero]哟，不知是哪阵风把圣女姐姐吹到了这里来呢？",
+        "\t[蜜西娅,N489]\b[this,6,10]圣子弟弟别贫嘴啊，光明神殿的圣子，竟然输给了黑暗圣子，据说那黑暗圣子与你差不多大呢。",
+        "\t[莫析辉,hero]\b[hero]呵，别说我没打赢他，圣女姐姐你虚长我几岁，也未必能打赢他哦。",
+        "\t[蜜西娅,N489]\b[this,6,10]是吗？那弟弟你可要看好了，姐姐这就去抓住黑暗圣子给你瞧瞧。",
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    6,
+                    10
+                ]
+            ],
+            "remove": true
+        },
+        "\t[莫析辉,hero]\b[hero]嘁！我倒看看你能不能打赢黑暗圣子！"
+    ],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {
+        "6,12": {
+            "floorId": "CZ10",
+            "loc": [
+                6,
+                0
+            ]
+        }
+    },
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [151,151,151,151,151,151,151,151,151,151,151,151,151],
+    [151,151,151,151,151,151,151,151,151,151,151,151,151],
+    [  0,  0,151,151,151,151,151,151,151,151,151,151,151],
+    [151,  0,151,  0,151,  0,151,  0,  0,  0,151,  0,20284],
+    [151,  0,151,  0,151,  0,151,  0,  0,  0,151,  0,151],
+    [151,  0,151,  0,151,  0,151,151,  0,151,151,  0,151],
+    [151,  0,151,  0,  0,  0,489,151,  0,151,151,  0,151],
+    [151,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,151],
+    [151,151,151,151,151,151, 91,151,151,151,151,151,151]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [142,142,142,142,142,142,142,142,142,142,142,142,142],
+    [  0,  0,20295,  0,  0,  0,  0,  0,  0,  0,20295,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,20294,  0,  0,  0,20276],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+],
+    "flyPoint": [
+        6,
+        12
+    ]
+}

project/maps.js

@@ -16,7 +16,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"14": {"cls":"animates","id":"curseNet","canPass":true,"trigger":"null","script":"(function () {\n\tif (!core.hasItem('amulet')) {\n\t\tcore.triggerDebuff('get', 'curse');\n\t\tcore.updateStatusBar();\n\t}\n\n\t// 如果要做一次性咒网，可直接注释掉下面这句话：\n\t// core.removeBlock(core.getHeroLoc('x'), core.getHeroLoc('y'));\n})()","name":"咒网"},
 	"15": {"cls":"animates","id":"blueLava"},
 	"16": {"cls":"animates","id":"water"},
-	"20": {"cls":"autotile","id":"autotile","canBreak":true},
+	"20": {"cls":"autotile","id":"autotile"},
 	"21": {"cls":"items","id":"yellowKey"},
 	"22": {"cls":"items","id":"blueKey"},
 	"23": {"cls":"items","id":"redKey"},