Compare commits

..

No commits in common. "6ad6856671adaba56acb48cbca3932198900e0b0" and "4625b787d866ab715fd7ad13de2544b43500da76" have entirely different histories.

11 changed files with 8371 additions and 8609 deletions

View File

@ -1968,17 +1968,16 @@ return code;
*/; */;
drawWarning_s drawWarning_s
: '警告坐标x' PosString 'y' PosString '缩放倍率'EvalString '文字大小'Int '警告内容' EvalString? '副标题' EvalString? '不播放音效' Bool? Newline : '警告坐标x' PosString 'y' PosString '文字大小'Int '警告内容' EvalString? '副标题' EvalString? '不播放音效' Bool? Newline
/* drawWarning_s /* drawWarning_s
tooltip : drawWarning: 绘制warning警告并拉进镜头,本事件为异步事件,下一事件将在3100ms后执行 tooltip : drawWarning: 绘制warning警告并拉进镜头,本事件为异步事件,下一事件将在3100ms后执行
helpUrl : /_docs/#/instruction helpUrl : /_docs/#/instruction
default : [0, 0,'2',24,"这里是提示内容","绿色史莱姆",false] default : [0, 0,24,"这里是提示内容","绿色史莱姆",false]
colour : this.soundColor colour : this.soundColor
selectPoint : ["PosString_0", "PosString_1"] selectPoint : ["PosString_0", "PosString_1"]
if(!EvalString_1||!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数或整数"); var code = '{"type": "drawWarning", "x": '+PosString_0+', "y": '+PosString_1+',"size":'+Int_0+',"text": "'+EvalString_0+'", "text2": "'+EvalString_1+'", "warning": '+Bool_0+'},\n';
var code = '{"type": "drawWarning", "x": '+PosString_0+', "y": '+PosString_1+',"large":'+EvalString_0+',"size":'+Int_0+',"text": "'+EvalString_1+'", "text2": "'+EvalString_2+'", "warning": '+Bool_0+'},\n';
return code; return code;
*/; */;
@ -2417,7 +2416,7 @@ stopAnimate_s
tooltip : stopAnimate停止所有动画 tooltip : stopAnimate停止所有动画
helpUrl : /_docs/#/instruction helpUrl : /_docs/#/instruction
default : [false] default : [false]
colour : this.soundColor colour : this.imageColor
Bool_0 = Bool_0?', "doCallback": true':''; Bool_0 = Bool_0?', "doCallback": true':'';
var code = '{"type": "stopAnimate"'+Bool_0+'},\n'; var code = '{"type": "stopAnimate"'+Bool_0+'},\n';
return code; return code;

View File

@ -2105,7 +2105,6 @@ MotaActionParser = function () {
this.next = MotaActionBlocks["drawWarning_s"].xmlText([ this.next = MotaActionBlocks["drawWarning_s"].xmlText([
data.x, data.x,
data.y, data.y,
data.large,
data.size, data.size,
data?.text, data?.text,
data?.text2, data?.text2,

View File

@ -2222,7 +2222,7 @@ events.prototype._action_insert = function (data, x, y, prefix) {
}; };
events.prototype._action_playBgm = function (data, x, y, prefix) { events.prototype._action_playBgm = function (data, x, y, prefix) {
core.playBgm(data.name, data.startTime || 0); //core.playBgm(data.name, data.startTime || 0);
core.setFlag("__bgm__", data.keep ? data.name : null); core.setFlag("__bgm__", data.keep ? data.name : null);
core.doAction(); core.doAction();
}; };

View File

@ -676,13 +676,13 @@ loader.prototype._saveSounds = function (data, onfinished) {
}; };
loader.prototype.loadOneMusic = function (name) { loader.prototype.loadOneMusic = function (name) {
/* var music = new Audio(); var music = new Audio();
music.preload = "none"; music.preload = "none";
if (main.bgmRemote) if (main.bgmRemote)
music.src = main.bgmRemoteRoot + core.firstData.name + "/" + name; music.src = main.bgmRemoteRoot + core.firstData.name + "/" + name;
else music.src = "project/bgms/" + name; else music.src = "project/bgms/" + name;
music.loop = "loop"; music.loop = "loop";
core.material.bgms[name] = music;*/ core.material.bgms[name] = music;
}; };
loader.prototype.loadOneSound = function (name) { loader.prototype.loadOneSound = function (name) {

File diff suppressed because it is too large Load Diff

Binary file not shown.

BIN
project/bgms/theme.opus Normal file

Binary file not shown.

View File

@ -911,7 +911,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"Halbmond.opus", "Halbmond.opus",
"ed.opus", "ed.opus",
"op.opus", "op.opus",
"theme.mp3" "theme.opus"
], ],
"sounds": [ "sounds": [
"aiy010000010.opus", "aiy010000010.opus",
@ -1067,7 +1067,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
"饰品", "饰品",
"饰品" "饰品"
], ],
"startBgm": "theme.mp3", "startBgm": "theme.opus",
"styles": { "styles": {
"startBackground": "project/images/background.webp", "startBackground": "project/images/background.webp",
"startVerticalBackground": "project/images/backgroundvertical.webp", "startVerticalBackground": "project/images/backgroundvertical.webp",

View File

@ -1,139 +1,162 @@
main.floors.street01= main.floors.street01 = {
{ floorId: "street01",
"floorId": "street01", title: "街道",
"title": "街道", name: "1",
"name": "1", width: 13,
"width": 13, height: 13,
"height": 13, canFlyTo: true,
"canFlyTo": true, canFlyFrom: true,
"canFlyFrom": true, canUseQuickShop: true,
"canUseQuickShop": true, images: [],
"images": [], ratio: 1,
"ratio": 1, defaultGround: "X90001",
"defaultGround": "X90001", firstArrive: [],
"firstArrive": [], eachArrive: [],
"eachArrive": [], parallelDo: "",
"parallelDo": "", events: {
"events": {
"5,7": [ "5,7": [
{ {
"type": "changeFloor", type: "changeFloor",
"floorId": "jiuguan", floorId: "jiuguan",
"loc": [ loc: [5, 12],
5, direction: "up",
12
],
"direction": "up"
}
]
}, },
"changeFloor": { ],
},
changeFloor: {
"0,8": { "0,8": {
"floorId": "changguan2", floorId: "changguan2",
"loc": [ loc: [12, 8],
12,
8
]
}, },
"12,9": { "12,9": {
"floorId": "zhujuejia", floorId: "zhujuejia",
"loc": [ loc: [0, 9],
0,
9
]
}
}, },
"beforeBattle": {},
"afterBattle": {},
"afterGetItem": {},
"afterOpenDoor": {},
"autoEvent": {},
"cannotMove": {
"10,6": [
"left",
"right"
]
}, },
"cannotMoveIn": { beforeBattle: {},
"10,6": [ afterBattle: {},
"left", afterGetItem: {},
"right" afterOpenDoor: {},
] autoEvent: {},
cannotMove: {
"10,6": ["left", "right"],
}, },
"map": [ cannotMoveIn: {
[110121,110122,200040,200225,200138,200227,200228,200225,200250,200227,200228,200046,130090], "10,6": ["left", "right"],
[110124, 0,200048,200233,200146,200235,200236,200233,200250,200235,200228,200054,130098], },
[110124, 0,200056,200153,200154,200155,200244,200272,200154,200276,200228,200054,130060], map: [
[110124, 0,200272,200161,200162,200163,200276,200168,200171,200172, 0,70327,130068], [
[110124, 0,200168,200169,200170,200171,200172,200080,200081,200086, 0,70335,110114], 110121, 110122, 200040, 200225, 200138, 200227, 200228, 200225, 200250,
[110124, 0,200176,200177,200178,200179,71786,90064,90064,90064, 0,90064,110125], 200227, 200228, 200046, 130090,
[110124, 0,200088,200089,200004,200005,200006,71795, 0, 0, 0, 0,110125], ],
[110118,110118,200096,110116,110020, 0,200014, 0, 0, 0, 0, 0,110125], [
[ 92, 0, 0,110124, 0,201, 0, 0,110125,110122,110122,110122,110122], 110124, 0, 200048, 200233, 200146, 200235, 200236, 200233, 200250, 200235,
[ 0, 0, 0,110118,110118,202,110118,110118,110122, 0, 0, 0, 94], 200228, 200054, 130098,
[130170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], ],
[130178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130168,130169], [
[130225,130169,130169,130169,130169,130170,110122,110122,130168,130169,130169,130224,130177] 110124, 0, 200056, 200153, 200154, 200155, 200244, 200272, 200154, 200276,
], 200228, 200054, 130060,
"areas": "牢狱", ],
"bgmap": [ [
[90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,90001], 110124, 0, 200272, 200161, 200162, 200163, 200276, 200168, 200171, 200172,
[90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,90001], 0, 70327, 130068,
[90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,90001], ],
[90001,71818,71819, 0, 0, 0, 0, 0, 0, 0,10036, 0,90001], [
[90001,71826,71827, 0, 0, 0, 0, 0, 0, 0, 0, 0,90001], 110124, 0, 200168, 200169, 200170, 200171, 200172, 200080, 200081, 200086,
[90001, 0, 0, 0, 0, 0,71786, 0,60135,60135,60135,60135, 0], 0, 70335, 110114,
[90001, 0, 0, 0, 0, 0, 0, 0, 0,90001,90001,90001, 0], ],
[90001,90001,90001, 0, 0, 0, 0, 0,90001, 0, 0, 0, 0], [
[70032,70032,70025, 0, 0,90244,90001,90001,90001, 0, 0, 0, 0], 110124, 0, 200176, 200177, 200178, 200179, 71786, 90064, 90064, 90064, 0,
[70025,70025,70025,90001,90001,90244,90001,90001,90001,70025,70025,70025,70025], 90064, 110125,
[ 0,70025,70025,70025,70025,70025,70025,70025,70025,70025,70025,70025,70025], ],
[ 0,70025,70025,70025,70025,70025,70025,70025,70025,70025,70025, 0, 0], [
[ 0, 0, 0, 0, 0, 0,90001,90001, 0, 0, 0, 0, 0] 110124, 0, 200088, 200089, 200004, 200005, 200006, 71795, 0, 0, 0, 0,
], 110125,
"fgmap": [ ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130076], [110118, 110118, 200096, 110116, 110020, 0, 200014, 0, 0, 0, 0, 0, 110125],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,130084], [92, 0, 0, 110124, 0, 201, 0, 0, 110125, 110122, 110122, 110122, 110122],
[ 0, 0,200110,200111, 0,200108,200109, 0, 0, 0, 0, 0, 0], [0, 0, 0, 110118, 110118, 202, 110118, 110118, 110122, 0, 0, 0, 94],
[ 0, 0,200118,200119, 0,200116,200117, 0, 0, 0, 0, 0, 0], [130170, 0, 0, 0, 71, 35, 0, 0, 0, 0, 0, 0, 0],
[ 0,20241, 0, 0, 0, 0, 0, 0, 0,70552, 0,70554, 0], [130178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130168, 130169],
[ 0, 0, 0, 0, 0, 93,200180,71787, 0,70560, 0,70562, 0], [
[110114,110114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 130225, 130169, 130169, 130169, 130169, 130170, 110122, 110122, 130168,
[ 0, 0, 0, 0, 0, 0, 0, 0,110143,110114,110114,110114,110114], 130169, 130169, 130224, 130177,
[ 0, 0, 0,110114,120095, 0,120095,120095,110114, 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], areas: "牢狱",
[ 0, 0, 0, 0, 0, 0,110114,110114, 0, 0, 0, 0, 0], bgmap: [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] [90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90001],
], [90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90001],
"bg2map": [ [90001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90001],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [90001, 71818, 71819, 0, 0, 0, 0, 0, 0, 0, 10036, 0, 90001],
[ 0,90650,90651, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [90001, 71826, 71827, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90001],
[ 0,90658,90659, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [90001, 0, 0, 0, 0, 0, 71786, 0, 60135, 60135, 60135, 60135, 0],
[ 0, 0, 0, 0, 0, 0,70163,70325,70325,70326, 0,200162, 0], [90001, 0, 0, 0, 0, 0, 0, 0, 0, 90001, 90001, 90001, 0],
[ 0, 0, 0, 0, 0, 0,70171,70333,70333,70334,70553,200162, 0], [90001, 90001, 90001, 0, 0, 0, 0, 0, 90001, 0, 0, 0, 0],
[ 0,71834,71835, 0, 0, 0,90064, 0, 0, 0,70561, 0,110122], [70032, 70032, 70025, 0, 0, 90244, 90001, 90001, 90001, 0, 0, 0, 0],
[ 0,71842,71843,200089,200004,200005,71794, 0,90617,70568,70569,70570, 0], [
[ 0, 0, 0,200097,200012,200013,110012, 0, 0, 0, 0, 0, 0], 70025, 70025, 70025, 90001, 90001, 90244, 90001, 90001, 90001, 70025,
[ 0, 0, 0, 0,110028,90244, 0,120108,120108,110134,110134,110134,110134], 70025, 70025, 70025,
[ 0, 0, 0, 0,120103,90244,120103,120103, 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, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025,
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] 70025, 70025,
], ],
"fg2map": [ [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 0, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025, 70025,
[ 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, 90001, 90001, 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,393,394,395, 0, 0, 0], fgmap: [
[ 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, 130076],
[ 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, 130084],
[ 0, 0, 0, 0,110114, 0,110114,110114, 0, 0, 0, 0, 0], [0, 0, 200110, 200111, 0, 200108, 200109, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 200118, 200119, 0, 200116, 200117, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 20241, 0, 0, 0, 0, 0, 0, 0, 70552, 0, 70554, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 93, 200180, 71787, 0, 70560, 0, 70562, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] [110114, 110114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
] [0, 0, 0, 0, 0, 0, 0, 0, 110143, 110114, 110114, 110114, 110114],
} [0, 0, 0, 110114, 120095, 0, 120095, 120095, 110114, 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, 110114, 110114, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
],
bg2map: [
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 90650, 90651, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 90658, 90659, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 70163, 70325, 70325, 70326, 0, 200162, 0],
[0, 0, 0, 0, 0, 0, 70171, 70333, 70333, 70334, 70553, 200162, 0],
[0, 71834, 71835, 0, 0, 0, 90064, 0, 0, 0, 70561, 0, 110122],
[
0, 71842, 71843, 200089, 200004, 200005, 71794, 0, 90617, 70568, 70569,
70570, 0,
],
[0, 0, 0, 200097, 200012, 200013, 110012, 0, 0, 0, 0, 0, 0],
[
0, 0, 0, 0, 110028, 90244, 0, 120108, 120108, 110134, 110134, 110134,
110134,
],
[0, 0, 0, 0, 120103, 90244, 120103, 120103, 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],
],
fg2map: [
[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, 393, 394, 395, 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, 110114, 0, 110114, 110114, 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],
],
};

View File

@ -14,14 +14,7 @@ main.floors.yiqu1=
"firstArrive": [], "firstArrive": [],
"eachArrive": [], "eachArrive": [],
"parallelDo": "", "parallelDo": "",
"events": { "events": {},
"5,9": [
{
"type": "insert",
"name": "chapter01"
}
]
},
"changeFloor": { "changeFloor": {
"0,7": { "0,7": {
"floorId": "yiqu2", "floorId": "yiqu2",

File diff suppressed because it is too large Load Diff