Merge branch 'map' into story

project/data.js

@@ -14,7 +14,10 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"jiedao",
 			"street01",
 			"street02",
-			"guangchang"
+			"guangchang",
+			"guangchang2",
+			"xiaoxiang01",
+			"xiaoxiang02"
 		],
 		"floorPartitions": [],
 		"images": [

project/enemys.js

@@ -17,8 +17,8 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"redPriest": {"name":"高级法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"brownWizard": {"name":"初级巫师","hp":100,"atk":120,"def":0,"money":16,"exp":0,"point":0,"special":15,"value":100,"range":2},
 	"redWizard": {"name":"高级巫师","hp":1000,"atk":1200,"def":0,"money":160,"exp":0,"point":0,"special":15,"value":200,"zoneSquare":true},
-	"swordsman": {"name":"双手剑士","hp":100,"atk":120,"def":0,"money":6,"exp":0,"point":0,"special":4},
+	"swordsman": {"name":"双手剑士","hp":100,"atk":120,"def":0,"money":6,"exp":3,"point":0,"special":4},
-	"soldier": {"name":"冥战士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+	"soldier": {"name":"冥战士","hp":120,"atk":50,"def":8,"money":10,"exp":7,"point":0,"special":0},
 	"yellowKnight": {"name":"金骑士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"redKnight": {"name":"红骑士","hp":500,"atk":200,"def":50,"money":0,"exp":0,"point":0,"special":[7]},
 	"darkKnight": {"name":"黑骑士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
@@ -46,8 +46,8 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"skeletonWarrior": {"name":"骷髅士兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"whiteSlimeman": {"name":"水银战士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"slimeman": {"name":"影子战士","hp":100,"atk":0,"def":0,"money":11,"exp":0,"point":0,"special":[9],"atkValue":2,"defValue":3},
-	"yellowGateKeeper": {"name":"初级卫兵","hp":100,"atk":120,"def":0,"money":10,"exp":0,"point":0,"special":0},
+	"yellowGateKeeper": {"name":"初级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0},
-	"blueGateKeeper": {"name":"中级卫兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
+	"blueGateKeeper": {"name":"中级卫兵","hp":80,"atk":25,"def":5,"money":3,"exp":1,"point":0,"special":0},
 	"redGateKeeper": {"name":"高级卫兵","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"magicMaster": {"name":"黑暗大法师","hp":100,"atk":120,"def":0,"money":12,"exp":0,"point":0,"special":11,"value":0.3333333333333333,"add":true,"notBomb":true},
 	"devilWarrior": {"name":"魔神武士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},

project/floors/bihusuo.js

@@ -1,7 +1,7 @@
 main.floors.bihusuo=
 {
     "floorId": "bihusuo",
-    "title": "牢狱01",
+    "title": "庇护所",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -38,7 +38,7 @@ main.floors.bihusuo=
     [ 17, 17, 17, 17, 17,  0, 90,  0, 17, 17, 17, 17, 17],
     [ 17, 17, 17, 17, 17,  0,  0,  0, 17, 17, 17, 17, 17]
 ],
-    "areas": "牢狱",
+    "areas": "下层",
     "bgmap": [
     [  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],

project/floors/guangchang.js

@@ -1,7 +1,7 @@
 main.floors.guangchang=
 {
     "floorId": "guangchang",
-    "title": "牢狱01",
+    "title": "广场",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -23,6 +23,14 @@ main.floors.guangchang=
                 6
             ],
             "direction": "right"
+        },
+        "6,12": {
+            "floorId": "guangchang2",
+            "loc": [
+                6,
+                0
+            ],
+            "direction": "down"
         }
     },
     "beforeBattle": {},
@@ -45,7 +53,7 @@ main.floors.guangchang=
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141],
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141],
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141],
-    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141]
+    [  0,  0,  0,  0,  0,  0, 93,  0,  0,  0,  0,140,141]
 ],
     "areas": "牢狱",
     "bgmap": [

project/floors/guangchang2.js

@@ -0,0 +1,63 @@
+main.floors.guangchang2=
+{
+    "floorId": "guangchang2",
+    "title": "广场",
+    "name": "1",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "grass2",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {
+        "6,0": {
+            "floorId": "guangchang",
+            "loc": [
+                6,
+                12
+            ],
+            "direction": "up"
+        }
+    },
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [  0,  0,  0,  0,  0,  0, 91,  0,  0,  0,  0,140,141],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,141],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140]
+],
+    "areas": "牢狱",
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}

project/floors/jiaotang.js

@@ -1,7 +1,7 @@
 main.floors.jiaotang=
 {
     "floorId": "jiaotang",
-    "title": "牢狱01",
+    "title": "教堂",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -63,7 +63,7 @@ main.floors.jiaotang=
     [356,357,357,357,358,  0,  0,  0,356,357,357,357,358],
     [  0,  0,  0,  0,  0,  0, 90,  0,  0,  0,  0,  0,  0]
 ],
-    "areas": "牢狱",
+    "areas": "上层",
     "bgmap": [
     [  0,30017,30017,30017,  0,30017,30017,30017,  0,30017,30017,30017,  0],
     [  0,30025,30025,30025,  0,30025,30025,30025,  0,30025,30025,30025,  0],

project/floors/jiedao.js

@@ -1,7 +1,7 @@
 main.floors.jiedao=
 {
     "floorId": "jiedao",
-    "title": "牢狱01",
+    "title": "街道",
     "name": "1",
     "width": 13,
     "height": 13,

project/floors/shengnvhome.js

@@ -1,7 +1,7 @@
 main.floors.shengnvhome=
 {
     "floorId": "shengnvhome",
-    "title": "牢狱01",
+    "title": "圣女寝室",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -38,7 +38,7 @@ main.floors.shengnvhome=
     [ 17, 17, 17, 17, 17,  0,  0,  0, 17, 17, 17, 17, 17],
     [  0,  0,  0,  0,  0, 17, 90, 17, 17, 17, 17, 17, 17]
 ],
-    "areas": "牢狱",
+    "areas": "上层",
     "bgmap": [
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,30016,360,360,30017,30017,30017,30017,30017,30018,  0,  0],

project/floors/shinvhome.js

@@ -1,7 +1,7 @@
 main.floors.shinvhome=
 {
     "floorId": "shinvhome",
-    "title": "牢狱01",
+    "title": "侍女寝室",
     "name": "1",
     "width": 13,
     "height": 13,
@@ -38,7 +38,7 @@ main.floors.shinvhome=
     [ 17, 17, 17, 17, 17,  0,  0,  0, 17, 17, 17, 17, 17],
     [ 17, 17, 17, 17, 17, 17, 90, 17, 17, 17, 17, 17, 17]
 ],
-    "areas": "牢狱",
+    "areas": "上层",
     "bgmap": [
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,30016,360,360,30017,30017,30017,30017,30017,30018,  0,  0],

project/floors/street01.js

@@ -1,7 +1,7 @@
 main.floors.street01=
 {
     "floorId": "street01",
-    "title": "牢狱01",
+    "title": "街道",
     "name": "1",
     "width": 13,
     "height": 13,

project/floors/street02.js

@@ -1,7 +1,7 @@
 main.floors.street02=
 {
     "floorId": "street02",
-    "title": "牢狱01",
+    "title": "街道",
     "name": "1",
     "width": 13,
     "height": 13,

project/floors/xiaoxiang01.js

@@ -0,0 +1,54 @@
+main.floors.xiaoxiang01=
+{
+    "floorId": "xiaoxiang01",
+    "title": "小巷子",
+    "name": "1",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "grass2",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [140,140,140,140,140,140,140,140,140,140,140,140,140],
+    [140, 30,140,  0,  0,  0,221,  0,224,  0, 28, 27,140],
+    [140,224,140,225,140, 31,140,  0,140,140,140,224,140],
+    [140,  0, 32,  0,140,  0,140,225,140,224,  0,  0,140],
+    [140,225,140,140,140, 81,140,  0,  0,  0,140,  0, 94],
+    [140,  0,222,  0,221,  0,140, 81,140,225,140,140,140],
+    [140,140,140, 81,140,140,140, 31,140,  0, 81, 31,140],
+    [ 92,  0,  0,  0, 32, 32,140,  0,140,  0,140,140,140],
+    [140, 21, 21, 21, 21, 22,140,  0,  0,  0,222, 29,140],
+    [140,140,140,140,140,140,140, 93,140,140,140,140,140]
+],
+    "areas": "牢狱",
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}

project/floors/xiaoxiang02.js

@@ -0,0 +1,54 @@
+main.floors.xiaoxiang02=
+{
+    "floorId": "xiaoxiang02",
+    "title": "小巷",
+    "name": "1",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "images": [],
+    "ratio": 1,
+    "defaultGround": "grass2",
+    "firstArrive": [],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {},
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [141,141,141,141,141,141,141,141,141,141,141,141,141],
+    [140,140,140,140,140,140,140,140,140,140,140,140,140],
+    [140,  0,  0,  0,140,  0,  0,  0,  0,140,  0,  0,140],
+    [140,  0,140,  0,140,140,140,140,  0,140,140,  0,140],
+    [140,  0,140,  0,  0,  0,  0,  0,  0,  0,  0,  0,140],
+    [ 92,  0,140,140,140,140,  0,140,140,140,  0,140,140],
+    [140,  0,  0,  0,  0,  0,  0,  0,  0,140,  0,  0,140],
+    [140,140,140,140,140,  0,140,140,  0,140,140,  0,140],
+    [140,  0,  0,  0,140,  0,140,  0,  0,  0,140,  0,140],
+    [140,  0,  0,  0, 81,  0,140,  0,  0,  0,  0,  0,140],
+    [140,140,140,140,140,140,140,140,140,140,140,140,140]
+],
+    "areas": "牢狱",
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+]
+}