Merge branch 'noAnimate' into hasAnimate

This commit is contained in:
bdf1 2022-11-07 08:22:17 +13:00
commit 898e4e0cdd

View File

@ -34,12 +34,19 @@ main.floors.MT1=
"condition": "(flag:1fnpc==1)",
"true": [
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
@ -64,35 +71,56 @@ main.floors.MT1=
"text": "否",
"action": [
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
},
"\t[老人]刚进塔来的吗.......雪儿放你进来的?",
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "shaohuyilv.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
80,
50,
"291.2",
"466.4"
],
"opacity": 1,
"time": 0
@ -101,23 +129,37 @@ main.floors.MT1=
"\t[老人]...............",
"\t[老人]不要问不该问的,这对你没有好处.......",
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
80,
50,
"291.2",
"466.4"
],
"opacity": 1,
"time": 0
@ -127,23 +169,37 @@ main.floors.MT1=
"\t[邵虎]您在这么危险的地方.....一定有原因吧?",
"\t[老人]不愧是雪儿放进来的人呢........你说的没错,自从我儿子进塔再也没回来以后......我就一直在这里了。",
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "shaohuyilv.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
80,
50,
"291.2",
"466.4"
],
"opacity": 1,
"time": 0
@ -152,23 +208,37 @@ main.floors.MT1=
"\t[邵虎]冒犯了......他怎么会来这种地方......",
"\t[老人]我不想多说......这里涉及的东西太多........你一个外人还是少知道点好........",
{
"type": "showImage",
"type": "showImage2",
"code": 1,
"image": "npcnan.png",
"sloc": [
0,
0,
null
],
"loc": [
180,
40
330,
70,
"304.8",
"432.8"
],
"opacity": 1,
"time": 0
},
{
"type": "showImage",
"type": "showImage2",
"code": 2,
"image": "shaohusikao.png",
"sloc": [
0,
0,
null
],
"loc": [
-30,
20
80,
50,
"291.2",
"466.4"
],
"opacity": 1,
"time": 0