Dove/Eustia
15
2
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Dove:274375cd42042d841e3be45f957afcf018e6f76d
Branches Tags
Dove:main
Dove:map
Dove:story
Dove:story-sound
Dove:status-itcfangye
Dove:story-laodeng
..
compare: Dove:6ad6856671adaba56acb48cbca3932198900e0b0
Branches Tags
Dove:map
Dove:story
Dove:story-sound
Dove:status-itcfangye
Dove:story-laodeng
Dove:main

23 Commits
274375cd42 ... 6ad6856671

Author SHA1 Message Date
strawberry42271
6ad6856671 还原cgText 2025-01-28 00:15:43 +08:00
strawberry42271
04b50e01ff 修音频系统插件 2025-01-28 00:04:33 +08:00
strawberry42271
732d9e5613 大概修了 2025-01-27 21:46:45 +08:00
strawberry42271
53e262dbd5 .. 2025-01-27 21:03:12 +08:00
strawberry42271
9f81251570 . 2025-01-27 20:32:25 +08:00
strawberry42271
17db7a81b9 修复bgm 2025-01-27 20:12:31 +08:00
strawberry42271
3f3dd1aece Merge branch 'status-itcfangye' into story 2025-01-27 19:56:39 +08:00
strawberry42271
43fec5a6a1 更改警告事件，增加工具栏锁定 2025-01-27 19:55:01 +08:00
egamerainy1022
d7de13aacb theme.mp3重新换源 2025-01-27 19:52:36 +08:00
laodeng
4625b787d8 删掉warning里多余的console.log 2025-01-27 18:11:11 +08:00
laodeng
f179815394 Merge branch 'map' into story-laodeng 2025-01-27 14:09:40 +08:00
laodeng
2c790053c7 更改warning插件，调整镜头和相关变量 2025-01-27 13:34:15 +08:00
strawberry42271
bb41bad059 Merge branch 'status-itcfangye' into story-laodeng 2025-01-27 00:13:47 +08:00
strawberry42271
8b267f3745 Merge branch 'main' into story-laodeng 2025-01-22 16:25:55 +08:00
strawberry42271
6e2b99b4f8 Merge branch 'status' into story-laodeng 2025-01-06 17:01:56 +08:00
strawberry42271
5574e905a7 素材压缩、同步 2025-01-05 00:40:27 +08:00
strawberry42271
c9e3aaffb6 Merge branch 'story' into story-laodeng 2024-12-24 16:00:11 +08:00
strawberry42271
9dc4b8cb8c Merge branch 'status' into story-laodeng 2024-12-24 15:39:52 +08:00
strawberry42271
3980c9b423 Merge branch 'status' into story-laodeng 2024-12-24 14:54:32 +08:00
strawberry42271
4442b2d1ad Merge branch 'story' into story-laodeng 2024-12-12 10:10:29 +08:00
laodeng
486af13031 在酒馆写个事件 2024-12-12 09:21:41 +08:00
laodeng
8076469ce3 再改一下出生点 2024-12-12 09:15:51 +08:00
laodeng
0d29822eb1 改一下出生点测试分支提交功能 2024-12-12 09:09:43 +08:00
11 changed files with 8605 additions and 8323 deletions
Show Stats Expand all files Collapse all files

9
_server/MotaAction.g4
View File

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

1
_server/MotaActionParser.js
View File

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

2
libs/events.js
View File

@ -2222,7 +2222,7 @@ events.prototype._action_insert = 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.doAction();
};

4
libs/loader.js
View File

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

2356
libs/utils.js
View File

File diff suppressed because it is too large Load Diff

BIN
project/bgms/theme.mp3 Normal file
View File

Binary file not shown.

BIN
project/bgms/theme.opus
View File

Binary file not shown.

4
project/data.js
View File

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

297
project/floors/street01.js
View File

@ -1,162 +1,139 @@
main.floors.street01 = {
floorId: "street01",
title: "街道",
name: "1",
width: 13,
height: 13,
canFlyTo: true,
canFlyFrom: true,
canUseQuickShop: true,
images: [],
ratio: 1,
defaultGround: "X90001",
firstArrive: [],
eachArrive: [],
parallelDo: "",
events: {
"5,7": [
{
type: "changeFloor",
floorId: "jiuguan",
loc: [5, 12],
direction: "up",
},
],
},
changeFloor: {
"0,8": {
floorId: "changguan2",
loc: [12, 8],
main.floors.street01=
{
"floorId": "street01",
"title": "街道",
"name": "1",
"width": 13,
"height": 13,
"canFlyTo": true,
"canFlyFrom": true,
"canUseQuickShop": true,
"images": [],
"ratio": 1,
"defaultGround": "X90001",
"firstArrive": [],
"eachArrive": [],
"parallelDo": "",
"events": {
"5,7": [
{
"type": "changeFloor",
"floorId": "jiuguan",
"loc": [
5,
12
],
"direction": "up"
}
]
},
"12,9": {
floorId: "zhujuejia",
loc: [0, 9],
"changeFloor": {
"0,8": {
"floorId": "changguan2",
"loc": [
12,
8
]
},
"12,9": {
"floorId": "zhujuejia",
"loc": [
0,
9
]
}
},
},
beforeBattle: {},
afterBattle: {},
afterGetItem: {},
afterOpenDoor: {},
autoEvent: {},
cannotMove: {
"10,6": ["left", "right"],
},
cannotMoveIn: {
"10,6": ["left", "right"],
},
map: [
[
110121, 110122, 200040, 200225, 200138, 200227, 200228, 200225, 200250,
200227, 200228, 200046, 130090,
],
[
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,
],
[
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,
],
[
110124, 0, 200176, 200177, 200178, 200179, 71786, 90064, 90064, 90064, 0,
90064, 110125,
],
[
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],
[0, 0, 0, 110118, 110118, 202, 110118, 110118, 110122, 0, 0, 0, 94],
[130170, 0, 0, 0, 71, 35, 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,
],
],
areas: "牢狱",
bgmap: [
[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],
[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],
[90001, 0, 0, 0, 0, 0, 71786, 0, 60135, 60135, 60135, 60135, 0],
[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],
[
70025, 70025, 70025, 90001, 90001, 90244, 90001, 90001, 90001, 70025,
70025, 70025, 70025,
],
[
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],
],
fgmap: [
[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, 130084],
[0, 0, 200110, 200111, 0, 200108, 200109, 0, 0, 0, 0, 0, 0],
[0, 0, 200118, 200119, 0, 200116, 200117, 0, 0, 0, 0, 0, 0],
[0, 20241, 0, 0, 0, 0, 0, 0, 0, 70552, 0, 70554, 0],
[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],
[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],
],
};
"beforeBattle": {},
"afterBattle": {},
"afterGetItem": {},
"afterOpenDoor": {},
"autoEvent": {},
"cannotMove": {
"10,6": [
"left",
"right"
]
},
"cannotMoveIn": {
"10,6": [
"left",
"right"
]
},
"map": [
[110121,110122,200040,200225,200138,200227,200228,200225,200250,200227,200228,200046,130090],
[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],
[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],
[110124, 0,200176,200177,200178,200179,71786,90064,90064,90064, 0,90064,110125],
[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],
[ 0, 0, 0,110118,110118,202,110118,110118,110122, 0, 0, 0, 94],
[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]
],
"areas": "牢狱",
"bgmap": [
[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],
[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],
[90001, 0, 0, 0, 0, 0,71786, 0,60135,60135,60135,60135, 0],
[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],
[70025,70025,70025,90001,90001,90244,90001,90001,90001,70025,70025,70025,70025],
[ 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]
],
"fgmap": [
[ 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,130084],
[ 0, 0,200110,200111, 0,200108,200109, 0, 0, 0, 0, 0, 0],
[ 0, 0,200118,200119, 0,200116,200117, 0, 0, 0, 0, 0, 0],
[ 0,20241, 0, 0, 0, 0, 0, 0, 0,70552, 0,70554, 0],
[ 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],
[ 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]
]
}

9
project/floors/yiqu1.js
View File

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

14246
project/plugins.js
View File

File diff suppressed because it is too large Load Diff