Merge branch 'status' into story
This commit is contained in:
commit
d4914043e5
@ -1144,16 +1144,19 @@ textcgDrawingList
|
||||
| textcgDrawingEmpty;
|
||||
|
||||
textcgDrawing
|
||||
: '立绘' EvalString? '绘制坐标' 'x' Number '变暗'Bool? Newline
|
||||
: '立绘' EvalString? '绘制坐标' 'x' Number '变暗'Bool? '绘制大小w' IntString? 'h' IntString? '绘制比例(填写后w、h失效,此项默认1.7)' EvalString? Newline
|
||||
|
||||
/* textcgDrawing
|
||||
tooltip : 立绘
|
||||
helpUrl : /_docs/#/instruction
|
||||
default : ["tati_050145a.webp",100,false]
|
||||
default : ["tati_050145a.webp",100,false,"","",""]
|
||||
colour : this.subColor
|
||||
allImages : ['EvalString_0']
|
||||
|
||||
return '{ "name": "'+EvalString_0+'", "px": '+Number_0+',"filter":'+Bool_0+' },'
|
||||
if(EvalString_1&&!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数、整数或不填");
|
||||
IntString_0=IntString_0?(',"w":'+IntString_0+''):''
|
||||
IntString_1=IntString_1?(',"h":'+IntString_1+''):''
|
||||
EvalString_1=EvalString_1?(',"scale":'+EvalString_1+''):''
|
||||
return '{ "name": "'+EvalString_0+'", "px": '+Number_0+',"filter":'+Bool_0+IntString_0+IntString_1+EvalString_1+' },'
|
||||
*/;
|
||||
|
||||
textcgDrawingEmpty
|
||||
@ -2229,7 +2232,7 @@ setanimate_s
|
||||
: '新建 帧动画/特效' '名称' EvalString '参照点偏移像素x' IntString? 'y' IntString? '动画大小 宽' IntString '高' IntString '总帧数' IntString BGNL?Newline
|
||||
'图片序列（同一帧后面覆盖先前的，默认起始帧为0，结束帧为最后一帧)'BGNL?Newline
|
||||
'(剪裁区域不填写为全图，绘制区域不填写为全画面）'BGNL?Newline
|
||||
'(透明度100为不透明，默认为不透明，结束透明度默认与开始透明度相同）'BGNL?Newline
|
||||
'(不透明度100为不透明，默认为不透明，结束透明度默认与开始不透明度相同）'BGNL?Newline
|
||||
animateDrawableimage+? Newline
|
||||
'音频序列（到达对应帧进行播放）'BGNL?Newline
|
||||
animateDrawablesound+? Newline
|
||||
@ -2253,17 +2256,17 @@ animateDrawableList
|
||||
| animateDrawabletextEmpty;
|
||||
|
||||
animateDrawableimage
|
||||
: '图片' EvalString? '起始帧' IntString? '起始透明度' IntString? BGNL? Newline
|
||||
: '图片' EvalString? '起始帧' IntString? '起始不透明度' IntString? BGNL? Newline
|
||||
'剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString?'旋转角度'IntString? BGNL? Newline
|
||||
'结束帧' IntString? '结束透明度' IntString? '剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString?'旋转角度'IntString? Newline
|
||||
'结束帧' IntString? '结束不透明度' IntString? '剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString?'旋转角度'IntString? Newline
|
||||
/* animateDrawableimage
|
||||
tooltip : 帧动画图片列表
|
||||
helpUrl : /_docs/#/instruction
|
||||
default : ["","","","","","","","","","","","","","","","","","","","","","",""]
|
||||
colour : this.subColor
|
||||
allImages : ['EvalString_0']
|
||||
if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_12&&(IntString_12 < 0||IntString_12>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('不透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_12&&(IntString_12 < 0||IntString_12>100)) throw new Error('不透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
IntString_0 = IntString_0 ? (', "beforefarme": '+IntString_0+'') : '';
|
||||
IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : '';
|
||||
IntString_2 = IntString_2 ? (', "cx": '+IntString_2+'') : '';
|
||||
@ -2326,7 +2329,7 @@ return code;
|
||||
*/;
|
||||
|
||||
playanimate_s
|
||||
: '播放 帧动画/特效' '名称' EvalString '像素x' IntString? 'y' IntString? '跟随勇士' Bool 'x方向缩放' IntString? 'y方向缩放'IntString? Newline
|
||||
: '播放 帧动画/特效' '名称' EvalString '像素x' IntString? 'y' IntString? '跟随勇士' Bool 'x方向缩放' EvalString? 'y方向缩放'EvalString? Newline
|
||||
|
||||
/* playanimate_s
|
||||
tooltip : playanimate:播放帧动画，选择跟随勇士后x、y将失效改为勇士中心坐标
|
||||
@ -2336,9 +2339,11 @@ default : ["zone","","",false,"",""]
|
||||
colour : this.soundColor
|
||||
IntString_0 = IntString_0 ? (', "x": '+IntString_0+'') : '';
|
||||
IntString_1 = IntString_1 ? (', "y": '+IntString_1+'') : '';
|
||||
IntString_2 = IntString_2 ? (', "scalex": '+IntString_2+'') : '';
|
||||
IntString_3 = IntString_3 ? (', "scaley": '+IntString_3+'') : '';
|
||||
var code = '{"type": "playanimate", "name": "'+EvalString_0+'"'+IntString_0+IntString_1+',"hero":'+Bool_0+IntString_2+IntString_3+'},\n';
|
||||
if(EvalString_1&&!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数、整数或不填");
|
||||
if(EvalString_2&&!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_2))throw new Error("此项仅能填写小数、整数或不填");
|
||||
EvalString_1 = EvalString_1 ? (', "scalex": '+EvalString_1+'') : '';
|
||||
EvalString_2 = EvalString_2 ? (', "scaley": '+EvalString_2+'') : '';
|
||||
var code = '{"type": "playanimate", "name": "'+EvalString_0+'"'+IntString_0+IntString_1+',"hero":'+Bool_0+EvalString_1+EvalString_2+'},\n';
|
||||
return code;
|
||||
*/;
|
||||
|
||||
@ -2611,10 +2616,10 @@ return code;
|
||||
*/;
|
||||
|
||||
animationDrawable_s
|
||||
: '帧动画' '总显示帧数' IntString '底色' ColorString? Colour '底色透明度' IntString? BGNL?Newline
|
||||
: '帧动画' '总显示帧数' IntString '底色' ColorString? Colour '底色不透明度' IntString? BGNL?Newline
|
||||
'图片序列（同一帧后面覆盖先前的，默认起始帧为0，结束帧为最后一帧)'BGNL?Newline
|
||||
'(剪裁区域不填写为全图，绘制区域不填写为全画面）'BGNL?Newline
|
||||
'(透明度100为不透明，默认为不透明，结束透明度默认与开始透明度相同）'BGNL?Newline
|
||||
'(不透明度100为不透明，默认为不透明，结束不透明度默认与开始透明度相同）'BGNL?Newline
|
||||
animationDrawableimage+? Newline
|
||||
'音频序列（到达对应帧进行播放）'BGNL?Newline
|
||||
animationDrawablesound+? Newline
|
||||
@ -2642,17 +2647,17 @@ animationDrawableList
|
||||
| animationDrawabletextEmpty;
|
||||
|
||||
animationDrawableimage
|
||||
: '图片' EvalString? '起始帧' IntString? '起始透明度' IntString? BGNL? Newline
|
||||
: '图片' EvalString? '起始帧' IntString? '起始不透明度' IntString? BGNL? Newline
|
||||
'剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString? BGNL? Newline
|
||||
'结束帧' IntString? '结束透明度' IntString? '剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString? Newline
|
||||
'结束帧' IntString? '结束不透明度' IntString? '剪裁坐标cx' IntString? 'cy' IntString? '宽' IntString? '高' IntString? '绘制坐标x'IntString? 'y' IntString? '宽' IntString? '高' IntString? Newline
|
||||
/* animationDrawableimage
|
||||
tooltip : 帧动画图片列表
|
||||
helpUrl : /_docs/#/instruction
|
||||
default : ["","","","","","","","","","","","","","","","","","","","",""]
|
||||
colour : this.subColor
|
||||
allImages : ['EvalString_0']
|
||||
if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_11&&(IntString_11 < 0||IntString_11>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('不透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
if (IntString_11&&(IntString_11 < 0||IntString_11>100)) throw new Error('不透明度范围为0-100,0为透明,100为不透明,不填默认为不透明')
|
||||
IntString_0 = IntString_0 ? (', "beforefarme": '+IntString_0+'') : '';
|
||||
IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : '';
|
||||
IntString_2 = IntString_2 ? (', "cx": '+IntString_2+'') : '';
|
||||
|
||||
@ -551,6 +551,9 @@ MotaActionParser = function () {
|
||||
one[0],
|
||||
one[1],
|
||||
one[2],
|
||||
one[3],
|
||||
one[4],
|
||||
one[5],
|
||||
res,
|
||||
]);
|
||||
}
|
||||
@ -2901,7 +2904,7 @@ MotaActionParser = function () {
|
||||
MotaActionFunctions.processcgDrawing = function (bodyList) {
|
||||
var list = [];
|
||||
bodyList.forEach(function (one) {
|
||||
list.push([one.name, one.px, one.filter]);
|
||||
list.push([one.name, one.px, one.filter, one.w, one.h, one.scale]);
|
||||
});
|
||||
return list;
|
||||
};
|
||||
|
||||
1199
_server/config.json
1199
_server/config.json
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user