Fixed some bugs. Add some stories

project/data.js

@@ -116,7 +116,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"MT7",
 			"MT8",
 			"MT9",
-			"MT10"
+			"MT10",
+			"DL1"
 		],
 		"floorPartitions": [],
 		"images": [
@@ -256,10 +257,12 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"cbzc.mp3",
 			"ending.mp3",
 			"gaolikangzhikb.mp3",
+			"jw.mp3",
 			"lfmg.mp3",
 			"mingyuetianya.mp3",
 			"mingyunshouhu.mp3",
 			"mingzhentankenanlansegubao.mp3",
+			"shenqu.mp3",
 			"shenweiqianchong.mp3",
 			"shuiyu.mp3",
 			"tiankong.mp3",

project/floors/BH1.js

@@ -318,6 +318,9 @@ main.floors.BH1=
         ],
         "5,1": [
             "红宝石增加攻击力\n蓝宝石增加防御力\n绿宝石增加护盾值\n黄宝石增加全属性\n白宝石进行加点\n血红宝石增加生命上限\n粉臻宝石增加魔力值\n各色钥匙对应各色门\n琼浆雨露以及血瓶进行相应的回复生命值"
+        ],
+        "7,1": [
+            "商店50次升级一次\n计分方式："
         ]
     },
     "changeFloor": {
@@ -345,7 +348,7 @@ main.floors.BH1=
     "cannotMoveIn": {},
     "map": [
     [ 20, 20, 20, 20, 20, 20, 91, 20, 20, 20, 20, 20, 20],
-    [ 20, 20, 20, 20, 20,10289,  0,  0, 20, 20, 20, 20, 20],
+    [ 20, 20, 20, 20, 20,10289,  0,10289, 20, 20, 20, 20, 20],
     [ 20, 21, 21, 21, 82,  0,  0,  0, 81, 81, 81, 22, 20],
     [ 20, 20, 20, 20, 20,  0,  0,  0,20400, 20, 20, 20, 20],
     [ 20, 20, 20, 20, 20,  0,  0,  0, 20, 20, 20, 20, 20],

project/floors/DL1.js

@@ -0,0 +1,142 @@
+main.floors.DL1=
+{
+    "floorId": "DL1",
+    "title": "东凌帝国 1 ",
+    "name": "东凌帝国1",
+    "width": 13,
+    "height": 13,
+    "canFlyTo": true,
+    "canFlyFrom": true,
+    "canUseQuickShop": true,
+    "cannotViewMap": false,
+    "images": [],
+    "ratio": 8,
+    "defaultGround": "X20061",
+    "bgm": "jw.mp3",
+    "firstArrive": [
+        {
+            "type": "jumpHero",
+            "loc": [
+                1,
+                6
+            ],
+            "time": 500
+        },
+        {
+            "type": "changePos",
+            "direction": "right"
+        },
+        {
+            "type": "moveHero",
+            "time": 500,
+            "steps": [
+                "right:3"
+            ]
+        },
+        "\t[莫析辉,hero]\b[hero]准圣子哥哥，你怎么来了。",
+        "\t[葛尔丹,N566]\b[this,7,6]圣子弟弟，近来光明神殿宽裕，哥哥我，晋升为光明圣子了。",
+        "\t[莫析辉,hero]\b[hero]那就恭喜了。",
+        "\t[葛尔丹,N566]\b[this,7,6]东凌帝国与北寒帝国的这场战争，令我很是伤感，没什么好恭喜的。",
+        "\t[莫析辉,hero]\b[hero]圣子哥哥忧国忧民，可不是大喜么？",
+        "\t[葛尔丹,N566]\b[this,7,6]呵呵，弟弟你也会开玩笑了。最近二长老和七长老在光明神殿留下的气息消失，教皇爷爷特派大长老与我、骑士队长来一探究竟。",
+        "\t[莫析辉,hero]\b[hero]大长老也来了，看来教皇爷爷很重视这个事。",
+        "\t[葛尔丹,N566]\b[this,7,6]废话不多说，咱们进入东凌帝国一探究竟吧！",
+        "\t[莫析辉,hero]\b[hero]不用了，我在莫析家族探的差不多了，就是东凌皇室、北寒皇室、北纳家族干的！",
+        "\t[汪周,N468]\b[this,8,7]圣子殿下，这东凌皇室、北寒皇室都好处理。可这北纳家族……可是圣女的家族啊……",
+        "\t[葛尔丹,N566]\b[this,7,6]这是什么话？难道队长大人认为只能蜜西娅欺负圣子弟弟，就不许圣子弟弟还手了？",
+        "\t[汪周,N468]\b[this,8,7]属下不是这个意思。",
+        "\t[葛尔丹,N566]\b[this,7,6]圣子弟弟，为兄的提醒一下你，可不要在大长老面前透露出对蜜西娅的仇恨，否则啊，大长老肯定不会答应让你报仇的！",
+        "\t[莫析辉,hero]\b[hero]我知道了，多谢哥哥提醒呢。",
+        "\t[葛尔丹,N566]\b[this,7,6]那就先进去，为圣子弟弟、还有二长老、七长老讨个公道吧！",
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    8,
+                    5
+                ]
+            ],
+            "remove": true
+        },
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    7,
+                    6
+                ]
+            ],
+            "remove": true
+        },
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    8,
+                    7
+                ]
+            ],
+            "remove": true
+        },
+        {
+            "type": "hide",
+            "loc": [
+                [
+                    3,
+                    7
+                ]
+            ],
+            "remove": true
+        }
+    ],
+    "eachArrive": [],
+    "parallelDo": "",
+    "events": {},
+    "changeFloor": {
+        "0,6": {
+            "floorId": "ZL1",
+            "loc": [
+                12,
+                6
+            ]
+        }
+    },
+    "beforeBattle": {},
+    "afterBattle": {},
+    "afterGetItem": {},
+    "afterOpenDoor": {},
+    "autoEvent": {},
+    "cannotMove": {},
+    "cannotMoveIn": {},
+    "map": [
+    [ 16, 16, 16, 16, 16,20346,20347, 16, 16, 16, 16, 16, 16],
+    [ 16,  0,  0,  0, 16,20354,20355, 16,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0, 16, 16,  0, 16,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,579,  0,  0,  0, 16],
+    [ 94,  0,  0,  0,  0,  0,  0,567,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,584,  0,  0,  0,  0,469,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16],
+    [ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16]
+],
+    "bgmap": [
+
+],
+    "fgmap": [
+
+],
+    "bg2map": [
+
+],
+    "fg2map": [
+
+],
+    "flyPoint": [
+        0,
+        6
+    ]
+}

project/floors/GM8.js

@@ -240,6 +240,26 @@ main.floors.GM8=
             "time": 500,
             "keep": true
         },
+        {
+            "type": "playBgm",
+            "name": "shenqu.mp3"
+        },
+        "\t[蝶影,N432]我，蝶影，是安南奎的养女，安南静。",
+        "\t[蝶影,N432]我记得，很小的时候，我的亲生父亲曾是东凌帝国的小军官，母亲是军队的女医。",
+        "\t[蝶影,N432]每天，我都爱坐在屋檐下，静静地等待着爸爸妈妈的归来。",
+        "\t[蝶影,N432]爸爸每次都会给我带来我最爱的糖葫芦，甜甜的，我十分喜欢。妈妈会给我编制最美的麻花辫，戴着青色的发绳，很是美丽。",
+        "\t[蝶影,N432]东凌帝国与北寒帝国的摩擦源源不断，他们总是很忙。有时候，我也恨他们，为什么不能多陪陪自己。",
+        "\t[蝶影,N432]他们总是很晚才回来，带回我最爱的糖葫芦，然后，我会开心地去迎接他们。可是那天，夕阳染红了夜晚的天空，他们也不曾回来，直到星辰闪烁，寒月来临，他们也不曾回来……",
+        "\t[蝶影,N432]我在屋檐等待了一个晚上，只能不断地念叨着爸妈快些回来。",
+        "\t[蝶影,N432]很久以后，我的养父安南奎才找到我，带来了爸爸妈妈战死的消息。战场瞬息万变，北寒帝国突然降临的埋伏，让爸爸所在的军队遭到了重创。",
+        "\t[蝶影,N432]为了救下爸爸，妈妈随着援军连日奔波，却也是徒劳，最终成为了北寒帝国的俘虏。",
+        "\t[蝶影,N432]养父带我来到边境之时，看到的是母亲破碎的身体。想哭就哭吧，静儿。养父如是说道。我望着北面那片土地，心中只有无数的恨意。",
+        "\t[蝶影,N432]养父说，我们一切都要以家族为重。以后，你便叫蝶影吧！",
+        "\t[蝶影,N432]蝶影，像蝴蝶一般翩翩起舞么？我何曾像蝴蝶一般翩翩起舞，一切，只为了家族而已。",
+        "\t[蝶影,N432]我要效忠的人，是莫析家那个金发的小男孩。但我却被送到了圣女的身边。经过养父的调教，圣女对我很是满意。",
+        "\t[蝶影,N432]圣女是一个善良的人，她愿意帮助那些穷苦的百姓，对我也很好。如果，她不是家族的敌人，那该多好。",
+        "\t[蝶影,N432]圣子，我要效忠的小男孩，每次都会给予我一个温暖的微笑。我相信，他将来会是家族最英明的领导，也会是最好的教皇陛下……",
+        "\t[蝶影,N432]三长老是一个精明的人，每时每刻，我都感觉他能一眼看穿自己。也许，有一天我将暴露……不知道，还会有人记得我的付出么……",
         {
             "type": "hide",
             "loc": [
@@ -402,6 +422,40 @@ main.floors.GM8=
             "value": "1"
         },
         "次日，光明圣子的守护骑士罗涛筋脉寸断，倒在圣女宫门口……",
+        {
+            "type": "setCurtain",
+            "color": [
+                0,
+                0,
+                0,
+                1
+            ],
+            "time": 500,
+            "keep": true
+        },
+        {
+            "type": "playBgm",
+            "name": "shenqu.mp3"
+        },
+        "\t[罗涛,N582]\b[this,6,8]什么是光明？",
+        "\t[罗涛,N582]\b[this,6,8]母亲告诉我，光明，是从内心散发出的正义和勇气，是坚定不移的信念和追求。它照亮前行的道路，让人们在黑暗中找到希望和勇气，永远不要放弃对光明的追求。",
+        "\t[罗涛,N582]\b[this,6,8]我来自一个单亲家庭，很久以前，爹与娘有了一夜情，便有了我。可惜，娘并不是爹所爱，不久后，爹便抛下了娘，与他的真爱远走高飞。",
+        "\t[罗涛,N582]\b[this,6,8]娘，含辛茹苦将我养大，早已病痛缠身。",
+        "\t[罗涛,N582]\b[this,6,8]我的武艺一向不错，运气也不差，遇到了我人生中的贵人，沂蒙贤。也就是光明神殿的三长老。",
+        "\t[罗涛,N582]\b[this,6,8]三长老将娘的病痛治好，还让我进入了光明神殿，这个传说中大陆最强的势力，我成为了一名光明骑士。",
+        "\t[罗涛,N582]\b[this,6,8]光明骑士，我拥有了光明的未来。我可以让娘过上好日子了，我真的很开心，娘辛苦了一辈子，我终于可以给娘最好的一切了。",
+        "\t[罗涛,N582]\b[this,6,8]我在光明神殿努力向上，只为了让娘过得更好一些。那天，我拿了光明骑士比武的第一名，第一名的奖励是什么？成为下一任骑士队长？还是获得大量的赏金？",
+        "\t[罗涛,N582]\b[this,6,8]新的光明圣子恰好在此刻出现了，教皇陛下亲自将我指给了圣子殿下，让我成为了一名守护骑士。",
+        "\t[罗涛,N582]\b[this,6,8]守护骑士，我太高兴了，我成为了光明神殿少有的守护骑士。我以为，我会就此过上幸福的一生。",
+        "\t[罗涛,N582]\b[this,6,8]当三长老沂蒙贤找到我时，我感到心中的天崩塌了。什么是光明？这就是光明吗？当昔日的贵人与如今的主子成为敌对，我该怎么选择？",
+        "\t[罗涛,N582]\b[this,6,8]圣子殿下亲和待人，我不想，也不愿做此不忠之事。\n不会伤害到你家圣子的，三长老笑眯眯地对我说道，他拿出了一个瓶子，这里面的东西，给你家圣子倒上一点，就没事了。",
+        "\t[罗涛,N582]\b[this,6,8]真的要这么做吗？我如是想道。\n想想你的母亲，沂蒙贤对着我微微一笑。看着他老谋深算的样子，我知道，自己已经无路可走。",
+        "\t[罗涛,N582]\b[this,6,8]葛尔丹，之前的光明圣子，现在的准圣子，他总是笑眯眯地盯着我，仿佛什么都知道。",
+        "\t[罗涛,N582]\b[this,6,8]啊，圣子殿下，我无路可走，无路可退。当二长老带我走进他的住处时，我便眼前一黑。娘，我不能再为您尽孝了……",
+        {
+            "type": "setCurtain",
+            "time": 500
+        },
         {
             "type": "setBlock",
             "number": "N577",

project/floors/MT1.js

@@ -5,7 +5,7 @@ main.floors.MT1=
     "name": "莫析家族1",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT10.js

@@ -5,7 +5,7 @@ main.floors.MT10=
     "name": "莫析家族10",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT2.js

@@ -5,7 +5,7 @@ main.floors.MT2=
     "name": "莫析家族2",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT3.js

@@ -5,7 +5,7 @@ main.floors.MT3=
     "name": "莫析家族3",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,
@@ -13,7 +13,7 @@ main.floors.MT3=
     "ratio": 8,
     "defaultGround": "ground",
     "bgm": "21-30.mp3",
-    "firstArrive": [],
+    "firstArrive": null,
     "eachArrive": [],
     "parallelDo": "",
     "events": {
@@ -29,6 +29,12 @@ main.floors.MT3=
             {
                 "type": "hide",
                 "remove": true
+            },
+            {
+                "type": "setFloor",
+                "name": "canFlyTo",
+                "floorId": "MT0",
+                "value": "true"
             }
         ]
     },

project/floors/MT4.js

@@ -5,7 +5,7 @@ main.floors.MT4=
     "name": "莫析家族4",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT5.js

@@ -5,7 +5,7 @@ main.floors.MT5=
     "name": "莫析家族5",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT6.js

@@ -5,7 +5,7 @@ main.floors.MT6=
     "name": "莫析家族6",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT7.js

@@ -5,7 +5,7 @@ main.floors.MT7=
     "name": "莫析家族7",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT8.js

@@ -5,7 +5,7 @@ main.floors.MT8=
     "name": "莫析家族8",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/MT9.js

@@ -5,7 +5,7 @@ main.floors.MT9=
     "name": "莫析家族9",
     "width": 13,
     "height": 13,
-    "canFlyTo": false,
+    "canFlyTo": true,
     "canFlyFrom": true,
     "canUseQuickShop": true,
     "cannotViewMap": false,

project/floors/XY7.js

@@ -121,7 +121,7 @@ main.floors.XY7=
                 "true": [
                     "\t[${flag:shengqishi_name},N472]\b[this]可恶，那准圣子殿下，你能告诉我是谁吗？",
                     "\t[葛尔丹,N566]\b[this,5,4]呵呵",
-                    "\t[葛尔丹,N566]\b[this,5,4]这内奸啊，不仅敢对光明圣子干坏事，他啊，嗨忠于光明圣女呢。圣子弟弟，你可要小心点咯。"
+                    "\t[葛尔丹,N566]\b[this,5,4]这内奸啊，不仅敢对光明圣子干坏事，他啊，还忠于光明圣女呢。圣子弟弟，你可要小心点咯。"
                 ],
                 "false": [
                     "\t[莫析辉,hero]\b[hero]内奸？哥哥说笑了，在我来之前，你是光明圣子，而我，也是光明圣子，难道这内奸还敢专门对光明圣子做坏事不成？",

project/floors/ZL1.js

@@ -241,29 +241,6 @@ main.floors.ZL1=
                 ],
                 "no": []
             }
-        ],
-        "12,6": [
-            {
-                "type": "choices",
-                "text": "\t[提交成绩,hero]选择",
-                "choices": [
-                    {
-                        "text": "是",
-                        "action": [
-                            {
-                                "type": "win",
-                                "reason": "圣骑士"
-                            }
-                        ]
-                    },
-                    {
-                        "text": "否",
-                        "action": [
-                            "未完待续"
-                        ]
-                    }
-                ]
-            }
         ]
     },
     "changeFloor": {
@@ -280,6 +257,13 @@ main.floors.ZL1=
                 6,
                 12
             ]
+        },
+        "12,6": {
+            "floorId": "DL1",
+            "loc": [
+                0,
+                6
+            ]
         }
     },
     "beforeBattle": {},

project/items.js

@@ -1967,6 +1967,10 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"canUseItemEffect": "true",
 		"text": "使用后，消耗当前50魔力值，恢复100点生命值\n被动：新手保护（当攻防和小于50时，额外恢复100点生命值）",
 		"useItemEvent": [
+			{
+				"type": "if",
+				"condition": "(status:mana>=50)",
+				"true": [
 					{
 						"type": "if",
 						"condition": "(((status:atk)+(status:def))<=50)",
@@ -1999,6 +2003,15 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 							}
 						]
 					}
+				],
+				"false": [
+					{
+						"type": "playSound",
+						"name": "操作失败"
+					},
+					"魔力值不够！"
+				]
+			}
 		]
 	},
 	"I624": {

project/plugins.js

@@ -2109,10 +2109,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			['魔量', hero.mana + '/' + hero.manamax],
 			['钥匙', core.itemCount('yellowKey') + '/' + core.itemCount('blueKey') + '/' + core.itemCount('redKey') + '/' + core.itemCount('greenKey')],
 			['金币', (hero.money < 0 ? '\r[red]' : '') + hero.money + '\r'],
-			['生命', (hero.mdef < 0 ? '\r[red]' : '') + hero.hp + '\r'],
-			['攻速', (hero.atk < 0 ? '\r[red]' : '') + hero.atk + '\r'],
-			['护甲', (hero.def < 0 ? '\r[red]' : '') + hero.def + '\r'],
-			['钥匙', ],
+			['亲密度', ''],
+			['神之血', ''],
+			['琼浆玉露', ''],
+			['金币', ''],
 		]
 		var text2 = [
 			//['等级', '下级' + leveltext[hero.lv - 1][1]],
@@ -2125,10 +2125,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			['魔量', '用于施放技能的消耗'],
 			['钥匙', '用于开启黄/蓝/红/绿门'],
 			['金币', '用于商店购买的货币'],
-			['生命', '生命不足时游戏结束'],
-			['攻速', '每回合普攻伤害×' + Math.max(0, (hero.atk * 0.01 + 1)).toFixed(2)],
-			['护甲', '受到伤害' + (hero.def2 < 0 ? '\r[red]增加\r' : '减免') + '：' + ((1 - 100 / (100 + 3 * Math.abs(hero.def2))) * 100).toFixed(2) + '%'],
-			['钥匙', '用于开启门'],
+			['亲密度', '和圣骑士、准圣子、圣女亲密度'],
+			['神之血', '按生命上限一定比例回血'],
+			['琼浆玉露', '按生命上限一定比例回血'],
+			['金币', ''],
 		]
 
 		core.setFilter(ctx, 'hue-rotate(' + (col || 0) + 'deg)grayscale(' + (gry || 0) + '%)')