Merge branch 'noAnimate' into hasAnimate

This commit is contained in:
bdf1 2022-11-08 03:22:05 +13:00
commit e5fcc23ee5
5 changed files with 395 additions and 129 deletions

View File

@ -48,12 +48,19 @@ main.floors.MT10=
"time": 1000 "time": 1000
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "kulouzhanshi.png", "image": "kulouzhanshi.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-20, 100,
0 70,
"333.6",
444
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -84,12 +91,19 @@ main.floors.MT10=
"time": 1000 "time": 1000
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 2, "code": 2,
"image": "shaohuzixin.png", "image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
180, 80,
0 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -246,12 +260,19 @@ main.floors.MT10=
"time": 2000 "time": 2000
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "shaohuzixin.png", "image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -264,12 +285,19 @@ main.floors.MT10=
}, },
"\t[嗜骨]..........我不.......能说..........", "\t[嗜骨]..........我不.......能说..........",
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "shaohuzixin.png", "image": "shaohuzixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -290,12 +318,19 @@ main.floors.MT10=
"time": 1000 "time": 1000
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "shaohuyilv.png", "image": "shaohuyilv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
180, 80,
0 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -421,12 +456,19 @@ main.floors.MT10=
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "shaohuzixin.png", "image": "shaohuzixin.png",
"loc": [ "sloc": [
0, 0,
0 0,
null
],
"loc": [
80,
50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -624,12 +666,19 @@ main.floors.MT10=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "kulouzhanshi.png", "image": "kulouzhanshi.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-20, 100,
0 70,
"333.6",
444
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -679,12 +728,19 @@ main.floors.MT10=
"time": 500 "time": 500
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "shaohuyilv.png", "image": "shaohuyilv.png",
"loc": [ "sloc": [
0, 0,
0 0,
null
],
"loc": [
80,
50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0

View File

@ -77,12 +77,19 @@ main.floors.MT5=
"name": "linghaihuanxin.mp3" "name": "linghaihuanxin.mp3"
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekezixin.png", "image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -108,12 +115,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekexiaohei.png", "image": "jiekexiaohei.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -128,12 +142,19 @@ main.floors.MT5=
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao.png", "image": "jiekedajiao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -164,12 +185,19 @@ main.floors.MT5=
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekezixin.png", "image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -194,12 +222,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekeyilv.png", "image": "jiekeyilv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -212,12 +247,19 @@ main.floors.MT5=
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekezixin.png", "image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -242,12 +284,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekeyilv.png", "image": "jiekeyilv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -275,12 +324,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekeyilv.png", "image": "jiekeyilv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -331,12 +387,19 @@ main.floors.MT5=
"name": "se83.mp3" "name": "se83.mp3"
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekezixin.png", "image": "jiekezixin.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -365,12 +428,19 @@ main.floors.MT5=
"keep": true "keep": true
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao2.png", "image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -406,12 +476,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao2.png", "image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -433,12 +510,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekexiaohei.png", "image": "jiekexiaohei.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -511,12 +595,19 @@ main.floors.MT5=
"name": "se83.mp3" "name": "se83.mp3"
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekeyilv.png", "image": "jiekeyilv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -530,12 +621,19 @@ main.floors.MT5=
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao2.png", "image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -578,12 +676,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao.png", "image": "jiekedajiao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -615,12 +720,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao2.png", "image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -645,12 +757,19 @@ main.floors.MT5=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "jiekedajiao2.png", "image": "jiekedajiao2.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
100, 330,
40 70,
"289.6",
"376.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0

View File

@ -16,12 +16,19 @@ main.floors.MT6=
"condition": "(flag:6fNPC==1)", "condition": "(flag:6fNPC==1)",
"true": [ "true": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnan.png", "image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
180, 330,
40 70,
"304.8",
"432.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -50,35 +57,38 @@ main.floors.MT6=
"text": "否", "text": "否",
"action": [ "action": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnan.png", "image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
80, 330,
40 70,
"304.8",
"432.8"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
}, },
"\t[老人]我怎么不认识你.........你是镇天谷的人吗?", "\t[老人]我怎么不认识你.........你是镇天谷的人吗?",
{ {
"type": "showImage", "type": "showImage2",
"code": 1,
"image": "npcnan.png",
"loc": [
180,
40
],
"opacity": 1,
"time": 0
},
{
"type": "showImage",
"code": 2, "code": 2,
"image": "shaohuyilv.png", "image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0

View File

@ -33,35 +33,74 @@ main.floors.MT7=
"text": "否", "text": "否",
"action": [ "action": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnv.png", "image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
80, 330,
40 70,
"287.2",
"417.6"
],
"opacity": 1,
"time": 0
},
{
"type": "showImage2",
"code": 1,
"image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [
330,
70,
"287.2",
"417.6"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
}, },
"\t[女人]啊.........", "\t[女人]啊.........",
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnv.png", "image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
180, 330,
40 70,
"287.2",
"417.6"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 2, "code": 2,
"image": "shaohuyilv.png", "image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -85,23 +124,37 @@ main.floors.MT7=
"condition": "(flag:juqing>=1)", "condition": "(flag:juqing>=1)",
"true": [ "true": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 2,
"image": "shaohuyilv.png", "image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 2, "code": 1,
"image": "npcnv.png", "image": "npcnv.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
180, 330,
40 70,
"287.2",
"417.6"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -139,12 +192,19 @@ main.floors.MT7=
], ],
"false": [ "false": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 2,
"image": "shaohuyilv.png", "image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-30, 80,
20 50,
"291.2",
"466.4"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -173,12 +233,19 @@ main.floors.MT7=
"condition": "(flag:7fduihua2==1)", "condition": "(flag:7fduihua2==1)",
"true": [ "true": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnv.png", "image": "npcnv.png",
"loc": [ "sloc": [
0, 0,
0 0,
null
],
"loc": [
330,
70,
"287.2",
"417.6"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0
@ -192,12 +259,19 @@ main.floors.MT7=
], ],
"false": [ "false": [
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "npcnv.png", "image": "npcnv.png",
"loc": [ "sloc": [
0, 0,
0 0,
null
],
"loc": [
330,
70,
"287.2",
"417.6"
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0

View File

@ -63,12 +63,19 @@ main.floors.MT9=
] ]
}, },
{ {
"type": "showImage", "type": "showImage2",
"code": 1, "code": 1,
"image": "kulouzhanshi.png", "image": "kulouzhanshi.png",
"sloc": [
0,
0,
null
],
"loc": [ "loc": [
-20, 100,
30 70,
"333.6",
444
], ],
"opacity": 1, "opacity": 1,
"time": 0 "time": 0