Merge branch 'map' of https://gitea.mota.press/Dove/Eustia into map
This commit is contained in:
		
						commit
						28b5f356d7
					
				| @ -873,11 +873,10 @@ action | ||||
|     |   disableShop_s | ||||
|     |   follow_s | ||||
|     |   unfollow_s | ||||
|     |   setanimate_s | ||||
|     |   deleteanimate_s | ||||
|     |   playanimate_s | ||||
|     |   clearanimate_s | ||||
|     |   animate_s | ||||
|     |   animateResize_s | ||||
|     |   pauseAnimate_s | ||||
|     |   remuseAnimate_s | ||||
|     |   animate_1_s | ||||
|     |   stopAnimate_s | ||||
|     |   vibrate_s | ||||
| @ -1074,6 +1073,97 @@ if (block.isCollapsed() || !block.isEnabled() || pos || Int_0 || Bool_0) { | ||||
| return code+',\n'; | ||||
| */; | ||||
| 
 | ||||
| 
 | ||||
| animationDrawable_s | ||||
|     :   '帧动画' '总显示帧数' IntString '底色' ColorString? Colour '底色不透明度' IntString? BGNL?Newline | ||||
|         '图片序列(同一帧后面覆盖先前的,默认起始帧为0,结束帧为最后一帧)'BGNL?Newline | ||||
|         '(剪裁区域不填写为全图,绘制区域不填写为全画面)'BGNL?Newline | ||||
|         '(不透明度100为不透明,默认为不透明,结束不透明度默认与开始透明度相同)'BGNL?Newline | ||||
|         animationDrawableimage+? Newline | ||||
|         '音频序列(到达对应帧进行播放)'BGNL?Newline | ||||
|         animationDrawablesound+? Newline | ||||
|      | ||||
| 
 | ||||
| /* animationDrawable_s | ||||
| tooltip : animationDrawable:帧动画图片叠加 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [30,"0, 0, 0",'rgb(0, 0, 0)',""] | ||||
| allImages : ['EvalString_0'] | ||||
| colour : this.imageColor | ||||
| if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明') | ||||
| 
 | ||||
| ColorString_0 = ColorString_0 ? (', "color": ['+ColorString_0+']') : ''; | ||||
| IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : ''; | ||||
| var imageList=animationDrawableimage_0?',"imageList": [\n'+animationDrawableimage_0.slice(0,-1)+'\n]':'' | ||||
| var soundList=animationDrawablesound_0?',"soundList": [\n'+animationDrawablesound_0.slice(0,-1)+'\n]':'' | ||||
| var code = '{"type": "animationDrawable", "allFarme": '+IntString_0+ColorString_0+IntString_1+imageList+soundList+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| animationDrawableList | ||||
|     : animationDrawableimage | ||||
|     | animationDrawablesound | ||||
|     | animationDrawabletextEmpty; | ||||
| 
 | ||||
| animationDrawableimage | ||||
|     : '图片' 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 | ||||
| /* 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为不透明,不填默认为不透明') | ||||
| IntString_0 = IntString_0 ? (', "beforefarme": '+IntString_0+'') : ''; | ||||
| IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : ''; | ||||
| IntString_2 = IntString_2 ? (', "cx": '+IntString_2+'') : ''; | ||||
| IntString_3 = IntString_3 ? (', "cy": '+IntString_3+'') : ''; | ||||
| IntString_4 = IntString_4 ? (', "cw": '+IntString_4+'') : ''; | ||||
| IntString_5 = IntString_5 ? (', "ch": '+IntString_5+'') : ''; | ||||
| IntString_6 = IntString_6 ? (', "x": '+IntString_6+'') : ''; | ||||
| IntString_7 = IntString_7 ? (', "y": '+IntString_7+'') : ''; | ||||
| IntString_8 = IntString_8 ? (', "w": '+IntString_8+'') : ''; | ||||
| IntString_9 = IntString_9 ? (', "h": '+IntString_9+'') : ''; | ||||
| 
 | ||||
| IntString_10 = IntString_10 ? (', "afterfarme": '+IntString_10+'') : ''; | ||||
| IntString_11 = IntString_11 ? (', "aglobalAlpha": '+IntString_11+'') : ''; | ||||
| IntString_12 = IntString_12 ? (', "acx": '+IntString_12+'') : ''; | ||||
| IntString_13 = IntString_13 ? (', "acy": '+IntString_13+'') : ''; | ||||
| IntString_14 = IntString_14 ? (', "acw": '+IntString_14+'') : ''; | ||||
| IntString_15 = IntString_15 ? (', "ach": '+IntString_15+'') : ''; | ||||
| IntString_16 = IntString_16 ? (', "ax": '+IntString_16+'') : ''; | ||||
| IntString_17 = IntString_17 ? (', "ay": '+IntString_17+'') : ''; | ||||
| IntString_18 = IntString_18 ? (', "aw": '+IntString_18+'') : ''; | ||||
| IntString_19 = IntString_19 ? (', "ah": '+IntString_19+'') : ''; | ||||
| 
 | ||||
| return '{ "image":"'+EvalString_0+'"'+IntString_0+IntString_1+IntString_2+IntString_3+IntString_4+IntString_5+IntString_6+IntString_7+IntString_8+IntString_9+IntString_10+IntString_11+IntString_12+IntString_13+IntString_14+IntString_15+IntString_16+IntString_17+IntString_18+IntString_19+'},' | ||||
| */; | ||||
| 
 | ||||
| animationDrawablesound | ||||
|     : '音效' EvalString? '起始帧' IntString '是否停止其他音效'Bool?  Newline  | ||||
|   | ||||
| /* animationDrawablesound | ||||
| tooltip : 帧动画配音 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["",0,false] | ||||
| colour : this.subColor | ||||
| allSounds : ['EvalString_0'] | ||||
| 
 | ||||
| return '{ "sound":"'+EvalString_0+'","startfarme":'+IntString_0+',"stopbefore":'+Bool_0+'},' | ||||
| */; | ||||
| 
 | ||||
| animationDrawabletextEmpty | ||||
|     :   Newline | ||||
|      | ||||
| /* animationDrawabletextEmpty | ||||
| var code = []; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| 
 | ||||
| over_s | ||||
|     :   '旁白文字' ':' EvalString BGNL? Newline | ||||
|     '背景' EvalString? '回忆滤镜' Bool? '持续帧数' Int? '渐入渐出帧数' Int? '音频文件' EvalString? BGNL? Newline | ||||
| @ -2003,10 +2093,10 @@ drawWarning_s | ||||
| /* drawWarning_s | ||||
| tooltip : drawWarning: 绘制warning警告并拉进镜头,本事件为异步事件,下一事件将在3100ms后执行 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [0, 0,'2',24,"这里是提示内容","绿色史莱姆",false] | ||||
| default : [0, 0,2,24,"这里是提示内容","绿色史莱姆",false] | ||||
| colour : this.soundColor | ||||
| selectPoint : ["PosString_0", "PosString_1"] | ||||
| if(!EvalString_1||!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_1))throw new Error("此项仅能填写小数或整数"); | ||||
| if(!EvalString_1||!/^(0|([1-9][0-9]*))(\.[\d]+)?$/.test(EvalString_0))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; | ||||
| */; | ||||
| @ -2272,138 +2362,6 @@ var code = '{"type": "vibrate", "direction": "'+Vibrate_List_0+'", "time": '+Int | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| setanimate_s | ||||
|     :   '新建 帧动画/特效' '名称' EvalString '参照点偏移像素x' IntString? 'y' IntString? '动画大小 宽' IntString '高' IntString '总帧数' IntString BGNL?Newline | ||||
|         '图片序列(同一帧后面覆盖先前的,默认起始帧为0,结束帧为最后一帧)'BGNL?Newline | ||||
|         '(剪裁区域不填写为全图,绘制区域不填写为全画面)'BGNL?Newline | ||||
|         '(不透明度100为不透明,默认为不透明,结束透明度默认与开始不透明度相同)'BGNL?Newline | ||||
|         animateDrawableimage+? Newline | ||||
|         '音频序列(到达对应帧进行播放)'BGNL?Newline | ||||
|         animateDrawablesound+? Newline | ||||
| 
 | ||||
| /* setanimate_s | ||||
| tooltip : setanimate:设置帧动画/特效(此项仅储存,不播放) | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["sword","","",192,192,60] | ||||
| colour : this.imageColor | ||||
| IntString_0 = IntString_0 ? (', "px": '+IntString_0+'') : ''; | ||||
| IntString_1 = IntString_1 ? (', "py": '+IntString_1+'') : ''; | ||||
| var imageList=animateDrawableimage_0?',"imageList": [\n'+animateDrawableimage_0.slice(0,-1)+'\n]':'' | ||||
| var soundList=animateDrawablesound_0?',"soundList": [\n'+animateDrawablesound_0.slice(0,-1)+'\n]':'' | ||||
| var code = '{"type": "setanimate", "name": "'+EvalString_0+'"'+IntString_0+IntString_1+' ,"width": '+IntString_2+', "height": '+IntString_3+', "allFarme": '+IntString_4+imageList+soundList+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| animateDrawableList | ||||
|     : animateDrawableimage | ||||
|     | animateDrawablesound | ||||
|     | animateDrawabletextEmpty; | ||||
| 
 | ||||
| animateDrawableimage | ||||
|     : '图片' 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 | ||||
| /* 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为不透明,不填默认为不透明') | ||||
| IntString_0 = IntString_0 ? (', "beforefarme": '+IntString_0+'') : ''; | ||||
| IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : ''; | ||||
| IntString_2 = IntString_2 ? (', "cx": '+IntString_2+'') : ''; | ||||
| IntString_3 = IntString_3 ? (', "cy": '+IntString_3+'') : ''; | ||||
| IntString_4 = IntString_4 ? (', "cw": '+IntString_4+'') : ''; | ||||
| IntString_5 = IntString_5 ? (', "ch": '+IntString_5+'') : ''; | ||||
| IntString_6 = IntString_6 ? (', "x": '+IntString_6+'') : ''; | ||||
| IntString_7 = IntString_7 ? (', "y": '+IntString_7+'') : ''; | ||||
| IntString_8 = IntString_8 ? (', "w": '+IntString_8+'') : ''; | ||||
| IntString_9 = IntString_9 ? (', "h": '+IntString_9+'') : ''; | ||||
| IntString_10 = IntString_10 ? (', "angle": '+IntString_10+'') : ''; | ||||
| 
 | ||||
| IntString_11 = IntString_11 ? (', "afterfarme": '+IntString_11+'') : ''; | ||||
| IntString_12 = IntString_12 ? (', "aglobalAlpha": '+IntString_12+'') : ''; | ||||
| IntString_13 = IntString_13 ? (', "acx": '+IntString_13+'') : ''; | ||||
| IntString_14 = IntString_14 ? (', "acy": '+IntString_14+'') : ''; | ||||
| IntString_15 = IntString_15? (', "acw": '+IntString_15+'') : ''; | ||||
| IntString_16 = IntString_16 ? (', "ach": '+IntString_16+'') : ''; | ||||
| IntString_17 = IntString_17 ? (', "ax": '+IntString_17+'') : ''; | ||||
| IntString_18 = IntString_18 ? (', "ay": '+IntString_18+'') : ''; | ||||
| IntString_19 = IntString_19 ? (', "aw": '+IntString_19+'') : ''; | ||||
| IntString_20 = IntString_20 ? (', "ah": '+IntString_20+'') : ''; | ||||
| IntString_21 = IntString_21 ? (', "aangle": '+IntString_21+'') : ''; | ||||
| return '{ "image":"'+EvalString_0+'"'+IntString_0+IntString_1+IntString_2+IntString_3+IntString_4+IntString_5+IntString_6+IntString_7+IntString_8+IntString_9+IntString_10+IntString_11+IntString_12+IntString_13+IntString_14+IntString_15+IntString_16+IntString_17+IntString_18+IntString_19+IntString_20+IntString_21+'},' | ||||
| */; | ||||
| 
 | ||||
| animateDrawablesound | ||||
|     : '音效' EvalString? '起始帧' IntString '是否停止其他音效'Bool  Newline  | ||||
|   | ||||
| /* animateDrawablesound | ||||
| tooltip : 帧动画配音 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["",0,false] | ||||
| colour : this.subColor | ||||
| allSounds : ['EvalString_0'] | ||||
| 
 | ||||
| return '{ "sound":"'+EvalString_0+'","startfarme":'+IntString_0+',"stopbefore":'+Bool_0+'},' | ||||
| */; | ||||
| 
 | ||||
| animateDrawabletextEmpty | ||||
|     :   Newline | ||||
|      | ||||
| /* animateDrawabletextEmpty | ||||
| var code = []; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| deleteanimate_s | ||||
|     :   '删除 帧动画/特效' '名称' EvalString Newline | ||||
| 
 | ||||
| /* deleteanimate_s | ||||
| tooltip : deleteanimate:删除储存的帧动画 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["zone"] | ||||
| 
 | ||||
| colour : this.imageColor | ||||
| 
 | ||||
| var code = '{"type": "deleteanimate", "name": "'+EvalString_0+'"},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| playanimate_s | ||||
|     :   '播放 帧动画/特效' '名称' EvalString '像素x'  IntString? 'y' IntString? '跟随勇士' Bool 'x方向缩放' EvalString? 'y方向缩放'EvalString?  Newline | ||||
| 
 | ||||
| /* playanimate_s | ||||
| tooltip : playanimate:播放帧动画,选择跟随勇士后x、y将失效改为勇士中心坐标 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["zone","","",false,"",""] | ||||
| 
 | ||||
| colour : this.imageColor | ||||
| IntString_0 = IntString_0 ? (', "x": '+IntString_0+'') : ''; | ||||
| IntString_1 = IntString_1 ? (', "y": '+IntString_1+'') : ''; | ||||
| 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; | ||||
| */; | ||||
| 
 | ||||
| clearanimate_s | ||||
|     :   '清空正在播放的帧动画/特效' | ||||
| 
 | ||||
| /* clearanimate_s | ||||
| tooltip : clearanimate:清空正在播放的帧动画 | ||||
| helpUrl : /_docs/#/instruction | ||||
| 
 | ||||
| colour : this.imageColor | ||||
| 
 | ||||
| var code = '{"type": "clearanimate"},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| animate_s | ||||
|     :   '显示动画' EvalString '位置' 'x' PosString? 'y' PosString? '相对窗口坐标' Bool '不等待执行完毕' Bool Newline | ||||
|      | ||||
| @ -2439,16 +2397,71 @@ var code = '{"type": "animate", "name": "'+EvalString_0+'", "loc": "hero"'+Bool_ | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| animateResize_s | ||||
|  :   '显示动画(60Fps)' EvalString '编号'PosString? '中心像素' 'x' PosString? 'y' PosString?'以勇士为中心' Bool'倒放' Bool'循环'Bool'不等待执行完毕' Bool Newline | ||||
|      | ||||
| 
 | ||||
| /* animateResize_s | ||||
| tooltip : animateResize:显示动画并选择是否以勇士为中心及倒放(以勇士为中心时,中心像素坐标无效) | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["zone","","","",false,false,false,false] | ||||
| allAnimates : ['EvalString_0'] | ||||
| previewBlock : true | ||||
| material : ["./project/animates/", "EvalString_0"] | ||||
| colour : this.soundColor | ||||
| 
 | ||||
| PosString_0 = PosString_0?', "id":'+PosString_0:''; | ||||
| Bool_0 = Bool_0?', "hero": true':''; | ||||
| if(!Bool_0){ | ||||
|     if(PosString_1===""||PosString_2==="")throw new Error("中心像素坐标或以勇士为中心必须填写一项"); | ||||
|      | ||||
|     Bool_0=',"centerX":'+PosString_1+', "centerY":'+PosString_2 | ||||
| } | ||||
| if(Bool_2&&!Bool_3 )throw new Error("循环必须与不等待执行完毕同时开启,否则将陷入死循环") | ||||
| Bool_1 = Bool_1?', "reverse": true':''; | ||||
| Bool_2 = Bool_2?', "loop": true':''; | ||||
| Bool_3 = Bool_3?', "async": true':''; | ||||
| var code = '{"type": "animateResize", "name": "'+EvalString_0+'"'+PosString_0+Bool_0+Bool_1+Bool_2+Bool_3+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| pauseAnimate_s | ||||
|  :   '暂停动画编号'PosString?'(不填写编号为暂停所有)' Newline | ||||
| 
 | ||||
| /* pauseAnimate_s | ||||
| tooltip : pauseAnimate:暂停动画(不填写编号为暂停所有) | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [''] | ||||
| colour : this.soundColor | ||||
| PosString_0 = PosString_0?', "id":'+PosString_0:''; | ||||
| var code = '{"type": "pauseAnimate"'+PosString_0+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| remuseAnimate_s | ||||
|  :   '继续动画编号'PosString?'(不填写编号为继续所有)'  Newline | ||||
| 
 | ||||
| /* remuseAnimate_s | ||||
| tooltip : remuseAnimate:继续动画(不填写编号为继续所有) | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [''] | ||||
| colour : this.soundColor | ||||
| PosString_0 = PosString_0?', "id":'+PosString_0:''; | ||||
| var code = '{"type": "remuseAnimate"'+PosString_0+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| stopAnimate_s | ||||
|     :   '停止所有动画' '执行动画回调' Bool Newline | ||||
|     :   '停止动画编号'PosString?'(不填写编号为继续所有)' '执行动画回调' Bool Newline | ||||
| 
 | ||||
| /* stopAnimate_s | ||||
| tooltip : stopAnimate:停止所有动画 | ||||
| tooltip : stopAnimate:停止动画(不填写编号为继续所有) | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [false] | ||||
| default : ["",false] | ||||
| colour : this.soundColor | ||||
| PosString_0 = PosString_0?', "id":'+PosString_0:''; | ||||
| Bool_0 = Bool_0?', "doCallback": true':''; | ||||
| var code = '{"type": "stopAnimate"'+Bool_0+'},\n'; | ||||
| var code = '{"type": "stopAnimate"'+PosString_0+Bool_0+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| @ -2720,95 +2733,6 @@ return code; | ||||
| */; | ||||
| 
 | ||||
| 
 | ||||
| animationDrawable_s | ||||
|     :   '帧动画' '总显示帧数' IntString '底色' ColorString? Colour '底色不透明度' IntString? BGNL?Newline | ||||
|         '图片序列(同一帧后面覆盖先前的,默认起始帧为0,结束帧为最后一帧)'BGNL?Newline | ||||
|         '(剪裁区域不填写为全图,绘制区域不填写为全画面)'BGNL?Newline | ||||
|         '(不透明度100为不透明,默认为不透明,结束不透明度默认与开始透明度相同)'BGNL?Newline | ||||
|         animationDrawableimage+? Newline | ||||
|         '音频序列(到达对应帧进行播放)'BGNL?Newline | ||||
|         animationDrawablesound+? Newline | ||||
|      | ||||
| 
 | ||||
| /* animationDrawable_s | ||||
| tooltip : animationDrawable:帧动画图片叠加 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : [30,"0, 0, 0",'rgb(0, 0, 0)',""] | ||||
| allImages : ['EvalString_0'] | ||||
| colour : this.imageColor | ||||
| if (IntString_1&&(IntString_1 < 0||IntString_1>100)) throw new Error('透明度范围为0-100,0为透明,100为不透明,不填默认为不透明') | ||||
| 
 | ||||
| ColorString_0 = ColorString_0 ? (', "color": ['+ColorString_0+']') : ''; | ||||
| IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : ''; | ||||
| var imageList=animationDrawableimage_0?',"imageList": [\n'+animationDrawableimage_0.slice(0,-1)+'\n]':'' | ||||
| var soundList=animationDrawablesound_0?',"soundList": [\n'+animationDrawablesound_0.slice(0,-1)+'\n]':'' | ||||
| var code = '{"type": "animationDrawable", "allFarme": '+IntString_0+ColorString_0+IntString_1+imageList+soundList+'},\n'; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| animationDrawableList | ||||
|     : animationDrawableimage | ||||
|     | animationDrawablesound | ||||
|     | animationDrawabletextEmpty; | ||||
| 
 | ||||
| animationDrawableimage | ||||
|     : '图片' 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 | ||||
| /* 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为不透明,不填默认为不透明') | ||||
| IntString_0 = IntString_0 ? (', "beforefarme": '+IntString_0+'') : ''; | ||||
| IntString_1 = IntString_1 ? (', "globalAlpha": '+IntString_1+'') : ''; | ||||
| IntString_2 = IntString_2 ? (', "cx": '+IntString_2+'') : ''; | ||||
| IntString_3 = IntString_3 ? (', "cy": '+IntString_3+'') : ''; | ||||
| IntString_4 = IntString_4 ? (', "cw": '+IntString_4+'') : ''; | ||||
| IntString_5 = IntString_5 ? (', "ch": '+IntString_5+'') : ''; | ||||
| IntString_6 = IntString_6 ? (', "x": '+IntString_6+'') : ''; | ||||
| IntString_7 = IntString_7 ? (', "y": '+IntString_7+'') : ''; | ||||
| IntString_8 = IntString_8 ? (', "w": '+IntString_8+'') : ''; | ||||
| IntString_9 = IntString_9 ? (', "h": '+IntString_9+'') : ''; | ||||
| 
 | ||||
| IntString_10 = IntString_10 ? (', "afterfarme": '+IntString_10+'') : ''; | ||||
| IntString_11 = IntString_11 ? (', "aglobalAlpha": '+IntString_11+'') : ''; | ||||
| IntString_12 = IntString_12 ? (', "acx": '+IntString_12+'') : ''; | ||||
| IntString_13 = IntString_13 ? (', "acy": '+IntString_13+'') : ''; | ||||
| IntString_14 = IntString_14 ? (', "acw": '+IntString_14+'') : ''; | ||||
| IntString_15 = IntString_15 ? (', "ach": '+IntString_15+'') : ''; | ||||
| IntString_16 = IntString_16 ? (', "ax": '+IntString_16+'') : ''; | ||||
| IntString_17 = IntString_17 ? (', "ay": '+IntString_17+'') : ''; | ||||
| IntString_18 = IntString_18 ? (', "aw": '+IntString_18+'') : ''; | ||||
| IntString_19 = IntString_19 ? (', "ah": '+IntString_19+'') : ''; | ||||
| 
 | ||||
| return '{ "image":"'+EvalString_0+'"'+IntString_0+IntString_1+IntString_2+IntString_3+IntString_4+IntString_5+IntString_6+IntString_7+IntString_8+IntString_9+IntString_10+IntString_11+IntString_12+IntString_13+IntString_14+IntString_15+IntString_16+IntString_17+IntString_18+IntString_19+'},' | ||||
| */; | ||||
| 
 | ||||
| animationDrawablesound | ||||
|     : '音效' EvalString? '起始帧' IntString '是否停止其他音效'Bool?  Newline  | ||||
|   | ||||
| /* animationDrawablesound | ||||
| tooltip : 帧动画配音 | ||||
| helpUrl : /_docs/#/instruction | ||||
| default : ["",0,false] | ||||
| colour : this.subColor | ||||
| allSounds : ['EvalString_0'] | ||||
| 
 | ||||
| return '{ "sound":"'+EvalString_0+'","startfarme":'+IntString_0+',"stopbefore":'+Bool_0+'},' | ||||
| */; | ||||
| 
 | ||||
| animationDrawabletextEmpty | ||||
|     :   Newline | ||||
|      | ||||
| /* animationDrawabletextEmpty | ||||
| var code = []; | ||||
| return code; | ||||
| */; | ||||
| 
 | ||||
| setCurtain_0_s | ||||
|     :   '更改画面色调' ColorString Colour '动画时间' IntString? BGNL? Newline '渐变方式' MoveMode_List '持续到下一个本事件' Bool '不等待执行完毕' Bool Newline | ||||
|      | ||||
|  | ||||
| @ -729,141 +729,7 @@ MotaActionParser = function () { | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|       case "setanimate": | ||||
|         var buildanimateDrawableimage = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimateDrawableimage(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animateDrawableimage"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               one[3], | ||||
|               one[4], | ||||
|               one[5], | ||||
|               one[6], | ||||
|               one[7], | ||||
|               one[8], | ||||
|               one[9], | ||||
|               one[10], | ||||
|               one[11], | ||||
|               one[12], | ||||
|               one[13], | ||||
|               one[14], | ||||
|               one[15], | ||||
|               one[16], | ||||
|               one[17], | ||||
|               one[18], | ||||
|               one[19], | ||||
|               one[20], | ||||
|               one[21], | ||||
|               one[22], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         var buildanimateDrawablesound = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimateDrawablesound(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animateDrawablesound"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         this.next = MotaActionBlocks["setanimate_s"].xmlText([ | ||||
|           data.name, | ||||
|           data.px, | ||||
|           data.py, | ||||
|           data.width, | ||||
|           data.height, | ||||
|           data.allFarme, | ||||
|           buildanimateDrawableimage(data.imageList), | ||||
|           buildanimateDrawablesound(data.soundList), | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|       case "clearanimate": | ||||
|         this.next = MotaActionBlocks["clearanimate_s"].xmlText([this.next]); | ||||
|         break; | ||||
|       case "deleteanimate": | ||||
|         this.next = MotaActionBlocks["deleteanimate_s"].xmlText([ | ||||
|           data.name, | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|       case "playanimate": | ||||
|         this.next = MotaActionBlocks["playanimate_s"].xmlText([ | ||||
|           data.name, | ||||
|           data.x, | ||||
|           data.y, | ||||
|           data.hero, | ||||
|           data.scalex, | ||||
|           data.scaley, | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|       case "animationDrawable": | ||||
|         var buildanimationDrawableimage = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimationDrawableimage(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animationDrawableimage"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               one[3], | ||||
|               one[4], | ||||
|               one[5], | ||||
|               one[6], | ||||
|               one[7], | ||||
|               one[8], | ||||
|               one[9], | ||||
|               one[10], | ||||
|               one[11], | ||||
|               one[12], | ||||
|               one[13], | ||||
|               one[14], | ||||
|               one[15], | ||||
|               one[16], | ||||
|               one[17], | ||||
|               one[18], | ||||
|               one[19], | ||||
|               one[20], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         var buildanimationDrawablesound = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimationDrawablesound(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animationDrawablesound"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         this.next = MotaActionBlocks["animationDrawable_s"].xmlText([ | ||||
|           data.allFarme, | ||||
|           data.color, | ||||
|           "rgba(" + data.color + ")", | ||||
|           data.globalAlpha, | ||||
|           buildanimationDrawableimage(data.imageList), | ||||
|           buildanimationDrawablesound(data.soundList), | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
| 
 | ||||
|       | ||||
|       case "tip": | ||||
|         this.next = MotaActionBlocks["tip_s"].xmlText([ | ||||
|           data.text, | ||||
| @ -1151,6 +1017,62 @@ MotaActionParser = function () { | ||||
|           ]); | ||||
|         } | ||||
|         break; | ||||
|         case "animationDrawable": | ||||
|         var buildanimationDrawableimage = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimationDrawableimage(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animationDrawableimage"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               one[3], | ||||
|               one[4], | ||||
|               one[5], | ||||
|               one[6], | ||||
|               one[7], | ||||
|               one[8], | ||||
|               one[9], | ||||
|               one[10], | ||||
|               one[11], | ||||
|               one[12], | ||||
|               one[13], | ||||
|               one[14], | ||||
|               one[15], | ||||
|               one[16], | ||||
|               one[17], | ||||
|               one[18], | ||||
|               one[19], | ||||
|               one[20], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         var buildanimationDrawablesound = function (obj) { | ||||
|           obj = MotaActionFunctions.processanimationDrawablesound(obj || []); | ||||
|           var res = null; | ||||
|           for (var ii = obj.length - 1, one; (one = obj[ii]); ii--) { | ||||
|             res = MotaActionBlocks["animationDrawablesound"].xmlText([ | ||||
|               one[0], | ||||
|               one[1], | ||||
|               one[2], | ||||
|               res, | ||||
|             ]); | ||||
|           } | ||||
|           return res; | ||||
|         }; | ||||
|         this.next = MotaActionBlocks["animationDrawable_s"].xmlText([ | ||||
|           data.allFarme, | ||||
|           data.color, | ||||
|           "rgba(" + data.color + ")", | ||||
|           data.globalAlpha, | ||||
|           buildanimationDrawableimage(data.imageList), | ||||
|           buildanimationDrawablesound(data.soundList), | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
| 
 | ||||
|       case "jumpHero": // 跳跃勇士
 | ||||
|         if (data.dxy) { | ||||
|           this.next = MotaActionBlocks["jumpHero_1_s"].xmlText([ | ||||
| @ -1235,8 +1157,34 @@ MotaActionParser = function () { | ||||
|           ]); | ||||
|         } | ||||
|         break; | ||||
|         case "animateResize": // 停止所有动画
 | ||||
|         this.next = MotaActionBlocks["animateResize_s"].xmlText([ | ||||
|           data.name, | ||||
|           data.id||"", | ||||
|           data.centerX||"", | ||||
|           data.centerY||"", | ||||
|           data.hero||false, | ||||
|           data.reverse||false, | ||||
|           data.loop||false, | ||||
|           data.async || false, | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|         case "pauseAnimate": // 暂停所有动画
 | ||||
|         this.next = MotaActionBlocks["pauseAnimate_s"].xmlText([ | ||||
|           data.id||"", | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|         case "remuseAnimate": // 继续所有动画
 | ||||
|         this.next = MotaActionBlocks["remuseAnimate_s"].xmlText([ | ||||
|           data.id||"", | ||||
|           this.next, | ||||
|         ]); | ||||
|         break; | ||||
|       case "stopAnimate": // 停止所有动画
 | ||||
|         this.next = MotaActionBlocks["stopAnimate_s"].xmlText([ | ||||
|           data.id||"", | ||||
|           data.doCallback || false, | ||||
|           this.next, | ||||
|         ]); | ||||
| @ -2938,80 +2886,7 @@ MotaActionParser = function () { | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   MotaActionFunctions.processanimationDrawableimage = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([ | ||||
|         one.image, | ||||
|         one.beforefarme, | ||||
|         one.globalAlpha, | ||||
|         one.cx, | ||||
|         one.cy, | ||||
|         one.cw, | ||||
|         one.ch, | ||||
|         one.x, | ||||
|         one.y, | ||||
|         one.w, | ||||
|         one.h, | ||||
|         one.afterfarme, | ||||
|         one.aglobalAlpha, | ||||
|         one.acx, | ||||
|         one.acy, | ||||
|         one.acw, | ||||
|         one.ach, | ||||
|         one.ax, | ||||
|         one.ay, | ||||
|         one.aw, | ||||
|         one.ah, | ||||
|       ]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   MotaActionFunctions.processanimationDrawablesound = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([one.sound, one.startfarme, one.stopbefore]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   MotaActionFunctions.processanimateDrawableimage = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([ | ||||
|         one.image, | ||||
|         one.beforefarme, | ||||
|         one.globalAlpha, | ||||
|         one.cx, | ||||
|         one.cy, | ||||
|         one.cw, | ||||
|         one.ch, | ||||
|         one.x, | ||||
|         one.y, | ||||
|         one.w, | ||||
|         one.h, | ||||
|         one.angle, | ||||
|         one.afterfarme, | ||||
|         one.aglobalAlpha, | ||||
|         one.acx, | ||||
|         one.acy, | ||||
|         one.acw, | ||||
|         one.ach, | ||||
|         one.ax, | ||||
|         one.ay, | ||||
|         one.aw, | ||||
|         one.ah, | ||||
|         one.aangle, | ||||
|       ]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   MotaActionFunctions.processanimateDrawablesound = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([one.sound, one.startfarme, one.stopbefore]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   | ||||
|   MotaActionFunctions.processMultiLoc = function (EvalString_0, EvalString_1) { | ||||
|     var floorstr = ""; | ||||
|     if (EvalString_0 && EvalString_1) { | ||||
| @ -3285,6 +3160,43 @@ MotaActionParser = function () { | ||||
|     return str; | ||||
|   }; | ||||
| 
 | ||||
|   MotaActionFunctions.processanimationDrawableimage = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([ | ||||
|         one.image, | ||||
|         one.beforefarme, | ||||
|         one.globalAlpha, | ||||
|         one.cx, | ||||
|         one.cy, | ||||
|         one.cw, | ||||
|         one.ch, | ||||
|         one.x, | ||||
|         one.y, | ||||
|         one.w, | ||||
|         one.h, | ||||
|         one.afterfarme, | ||||
|         one.aglobalAlpha, | ||||
|         one.acx, | ||||
|         one.acy, | ||||
|         one.acw, | ||||
|         one.ach, | ||||
|         one.ax, | ||||
|         one.ay, | ||||
|         one.aw, | ||||
|         one.ah, | ||||
|       ]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
|   MotaActionFunctions.processanimationDrawablesound = function (overList) { | ||||
|     var list = []; | ||||
|     overList.forEach(function (one) { | ||||
|       list.push([one.sound, one.startfarme, one.stopbefore]); | ||||
|     }); | ||||
|     return list; | ||||
|   }; | ||||
| 
 | ||||
|   MotaActionFunctions.replaceFromName = function (str) { | ||||
|     if (!str || MotaActionFunctions.disableReplace) return str; | ||||
|     var map = {}, | ||||
|  | ||||
| @ -354,6 +354,11 @@ editor_blockly = function () { | ||||
|                         editor.uievent.previewUI([{ type: "drawImage", image: obj.name, x: obj.loc[0], y: obj.loc[1] }]); | ||||
|                     } | ||||
|                     break; | ||||
|                     case 'animateResize_s': // 显示动画
 | ||||
|                     if (obj.name && obj.centerX&&obj.centerY) { | ||||
|                         editor.uievent.previewUI([{ type: "fillRect", x:obj.centerX-5, y: obj.centerY-5, width:10, height: 10, style:"#FF0000"}]); | ||||
|                     } | ||||
|                     break; | ||||
|                 case 'setCurtain_0_s': // 更改色调
 | ||||
|                     if (obj.color) { | ||||
|                         editor.uievent.previewUI([{ type: "fillRect", x: 0, y: 0, width: core.__PIXELS__, height: core.__PIXELS__, style: obj.color }]); | ||||
|  | ||||
| @ -1809,7 +1809,7 @@ events.prototype._action_animate = function (data, x, y, prefix) { | ||||
| }; | ||||
| 
 | ||||
| events.prototype._action_stopAnimate = function (data, x, y, prefix) { | ||||
|   core.stopAnimate(null, data.doCallback); | ||||
|   core.stopAnimate(data.id, data.doCallback); | ||||
|   core.doAction(); | ||||
| }; | ||||
| 
 | ||||
|  | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								project/animates/jianji2.animate
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								project/animates/jianji2.animate
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -911,6 +911,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = | ||||
| 		"animates": [ | ||||
| 			"hand", | ||||
| 			"jianji", | ||||
| 			"jianji2", | ||||
| 			"sword", | ||||
| 			"thunder", | ||||
| 			"yongchang", | ||||
| @ -1939,10 +1940,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = | ||||
| 				"type": "function", | ||||
| 				"function": "function(){\ncore.getItem('book', 1);\ncore.getItem('fly', 1);\ncore.getItem('postman', 1);\ncore.getItem('I369', 1);\n}" | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "insert", | ||||
| 				"name": "战斗动画特效注册" | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "insert", | ||||
| 				"name": "强制横屏" | ||||
|  | ||||
| @ -7737,648 +7737,6 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 = | ||||
| 				] | ||||
| 			} | ||||
| 		], | ||||
| 		"战斗动画特效注册": [ | ||||
| 			{ | ||||
| 				"type": "setanimate", | ||||
| 				"name": "sword", | ||||
| 				"px": 48, | ||||
| 				"py": 48, | ||||
| 				"width": 192, | ||||
| 				"height": 192, | ||||
| 				"allFarme": 15, | ||||
| 				"imageList": [ | ||||
| 					{ | ||||
| 						"image": "jianji.webp", | ||||
| 						"beforefarme": 0, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 192, | ||||
| 						"cy": 2112, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 3, | ||||
| 						"acx": 192, | ||||
| 						"acy": 2112, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "jianji.webp", | ||||
| 						"beforefarme": 4, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 384, | ||||
| 						"cy": 2112, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 6, | ||||
| 						"acx": 384, | ||||
| 						"acy": 2112, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "jianji.webp", | ||||
| 						"beforefarme": 7, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 576, | ||||
| 						"cy": 2112, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 9, | ||||
| 						"acx": 576, | ||||
| 						"acy": 2112, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "jianji.webp", | ||||
| 						"beforefarme": 10, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 768, | ||||
| 						"cy": 2112, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 12, | ||||
| 						"acx": 768, | ||||
| 						"acy": 2112, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "jianji.webp", | ||||
| 						"beforefarme": 13, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 0, | ||||
| 						"cy": 2304, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 15, | ||||
| 						"acx": 0, | ||||
| 						"acy": 2304, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					} | ||||
| 				], | ||||
| 				"soundList": [ | ||||
| 					{ | ||||
| 						"sound": "", | ||||
| 						"startfarme": 0, | ||||
| 						"stopbefore": false | ||||
| 					} | ||||
| 				] | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "setanimate", | ||||
| 				"name": "Fire01", | ||||
| 				"px": 48, | ||||
| 				"py": 48, | ||||
| 				"width": 192, | ||||
| 				"height": 192, | ||||
| 				"allFarme": 15, | ||||
| 				"imageList": [ | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 0, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 192, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 3, | ||||
| 						"acx": 192, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 4, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 384, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 6, | ||||
| 						"acx": 384, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 7, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 576, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 9, | ||||
| 						"acx": 576, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 10, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 768, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 12, | ||||
| 						"acx": 768, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 13, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 960, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 15, | ||||
| 						"acx": 960, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					} | ||||
| 				], | ||||
| 				"soundList": [ | ||||
| 					{ | ||||
| 						"sound": "", | ||||
| 						"startfarme": 0, | ||||
| 						"stopbefore": false | ||||
| 					} | ||||
| 				] | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "setanimate", | ||||
| 				"name": "Fire02", | ||||
| 				"px": 48, | ||||
| 				"py": 48, | ||||
| 				"width": 192, | ||||
| 				"height": 192, | ||||
| 				"allFarme": 15, | ||||
| 				"imageList": [ | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 0, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 192, | ||||
| 						"cy": 192, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 3, | ||||
| 						"acx": 192, | ||||
| 						"acy": 192, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 4, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 384, | ||||
| 						"cy": 192, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 6, | ||||
| 						"acx": 384, | ||||
| 						"acy": 192, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 7, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 576, | ||||
| 						"cy": 192, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 9, | ||||
| 						"acx": 576, | ||||
| 						"acy": 192, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 10, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 768, | ||||
| 						"cy": 192, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 12, | ||||
| 						"acx": 768, | ||||
| 						"acy": 192, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "015-Fire01.webp", | ||||
| 						"beforefarme": 13, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 960, | ||||
| 						"cy": 192, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 15, | ||||
| 						"acx": 960, | ||||
| 						"acy": 192, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					} | ||||
| 				], | ||||
| 				"soundList": [ | ||||
| 					{ | ||||
| 						"sound": "", | ||||
| 						"startfarme": 0, | ||||
| 						"stopbefore": false | ||||
| 					} | ||||
| 				] | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "setanimate", | ||||
| 				"name": "005-Attack03", | ||||
| 				"px": 48, | ||||
| 				"py": 48, | ||||
| 				"width": 192, | ||||
| 				"height": 192, | ||||
| 				"allFarme": 15, | ||||
| 				"imageList": [ | ||||
| 					{ | ||||
| 						"image": "005-Attack03.webp", | ||||
| 						"beforefarme": 0, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 0, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 3, | ||||
| 						"acx": 0, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "005-Attack03.webp", | ||||
| 						"beforefarme": 4, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 192, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 6, | ||||
| 						"acx": 192, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "005-Attack03.webp", | ||||
| 						"beforefarme": 7, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 384, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 9, | ||||
| 						"acx": 384, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "005-Attack03.webp", | ||||
| 						"beforefarme": 10, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 576, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 12, | ||||
| 						"acx": 576, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "005-Attack03.webp", | ||||
| 						"beforefarme": 13, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 768, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 15, | ||||
| 						"acx": 768, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					} | ||||
| 				], | ||||
| 				"soundList": [ | ||||
| 					{ | ||||
| 						"sound": "", | ||||
| 						"startfarme": 0, | ||||
| 						"stopbefore": false | ||||
| 					} | ||||
| 				] | ||||
| 			}, | ||||
| 			{ | ||||
| 				"type": "setanimate", | ||||
| 				"name": "012-Heal01", | ||||
| 				"px": 48, | ||||
| 				"py": 48, | ||||
| 				"width": 192, | ||||
| 				"height": 192, | ||||
| 				"allFarme": 15, | ||||
| 				"imageList": [ | ||||
| 					{ | ||||
| 						"image": "012-Heal01.webp", | ||||
| 						"beforefarme": 0, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 0, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 3, | ||||
| 						"acx": 0, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "012-Heal01.webp", | ||||
| 						"beforefarme": 4, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 192, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 6, | ||||
| 						"acx": 192, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "012-Heal01.webp", | ||||
| 						"beforefarme": 7, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 384, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 9, | ||||
| 						"acx": 384, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "012-Heal01.webp", | ||||
| 						"beforefarme": 10, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 576, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 12, | ||||
| 						"acx": 576, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					}, | ||||
| 					{ | ||||
| 						"image": "012-Heal01.webp", | ||||
| 						"beforefarme": 13, | ||||
| 						"globalAlpha": 100, | ||||
| 						"cx": 768, | ||||
| 						"cy": 0, | ||||
| 						"cw": 192, | ||||
| 						"ch": 192, | ||||
| 						"x": 0, | ||||
| 						"y": 0, | ||||
| 						"w": 96, | ||||
| 						"h": 96, | ||||
| 						"afterfarme": 15, | ||||
| 						"acx": 768, | ||||
| 						"acy": 0, | ||||
| 						"acw": 192, | ||||
| 						"ach": 192, | ||||
| 						"ax": 0, | ||||
| 						"ay": 0, | ||||
| 						"aw": 96, | ||||
| 						"ah": 96 | ||||
| 					} | ||||
| 				], | ||||
| 				"soundList": [ | ||||
| 					{ | ||||
| 						"sound": "", | ||||
| 						"startfarme": 0, | ||||
| 						"stopbefore": false | ||||
| 					} | ||||
| 				] | ||||
| 			} | ||||
| 		], | ||||
| 		"chapter06": null, | ||||
| 		"chapter07": null, | ||||
| 		"chapter000001": [ | ||||
|  | ||||
| @ -65,6 +65,13 @@ main.floors.changguan1= | ||||
|                 6, | ||||
|                 0 | ||||
|             ] | ||||
|         }, | ||||
|         "12,7": { | ||||
|             "floorId": "yiqu1", | ||||
|             "loc": [ | ||||
|                 0, | ||||
|                 7 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     "beforeBattle": {}, | ||||
| @ -82,7 +89,7 @@ main.floors.changguan1= | ||||
|     [110265,110266,110267,110268,  0,  0,  0,  0,  0,110304,110305,110306,110307], | ||||
|     [110273,110274,110275,110276,  0,  0,  0,  0,  0,110116,110313,110314,110315], | ||||
|     [110281,110282,110283,110284,  0,  0,  0,  0,  0,110132,  0,  0,  0], | ||||
|     [110289,110290,110291,110292,  0,  0,  0,  0,  0,  0,10254,10248, 94], | ||||
|     [110289,110290,110291,110292,  0,  0,  0,  0,  0,  0,  0,  0, 94], | ||||
|     [110297,110298,110299,110300,  0,  0,  0,  0,  0,110116,  0,  0,  0], | ||||
|     [110305,110306,110307,110308,  0,  0,  0,  0,  0,110261,110262,110262,110263], | ||||
|     [110313,110314,110315,110316,110122,110122,  0,110122,110122,110269,110270,110270,110271], | ||||
|  | ||||
| @ -93,8 +93,8 @@ main.floors.changguan2= | ||||
|     [140193,210153,210156,143,71695,  0,  0,  0,  0,  0,  0,  0, 94], | ||||
|     [140193,143,143,143,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140193,140193,130178,70130,  0,  0,  0,  0,  0,  0,  0,140,140], | ||||
|     [140193,140193,130178,40165,200199,71791,71791,71791,  0,  0,140192,140,140], | ||||
|     [140193,140193,130186,110114,110114,  0,143,143,143,  0,140192,140,140] | ||||
|     [140193,140193,130178,40165,200199,  0,  0,71791,  0,  0,140192,140,140], | ||||
|     [140193,140193,130186,110114,110114, 93, 93,  0,143,  0,140192,140,140] | ||||
| ], | ||||
|     "areas": "牢狱", | ||||
|     "bgmap": [ | ||||
| @ -125,7 +125,7 @@ main.floors.changguan2= | ||||
|     [140,140,140196,140202,200183,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140,140,140194,  0,200191,  0,  0,  0,  0,71818,140184,140,140], | ||||
|     [140,140,140194,  0,  0,  0,  0,  0,71832,71833,140192,140,140], | ||||
|     [140,140,140194,  0,  0,140184,140,140,140,140186,140192,140,140] | ||||
|     [140,140,140194,  0,110117,  0,  0,140184,140,140,140,140,140] | ||||
| ], | ||||
|     "bg2map": [ | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,110293,110294,110294,110294,110294], | ||||
| @ -140,7 +140,7 @@ main.floors.changguan2= | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,70138,  0,  0,  0,  0,  0,71826,  0,  0,  0], | ||||
|     [  0,  0,  0,40173,  0,71799,71799,71799,71840,71841,  0,  0,  0] | ||||
|     [  0,  0,  0,40173,  0,  0,  0,71799,71840,71841,  0,  0,  0] | ||||
| ], | ||||
|     "fg2map": [ | ||||
| 
 | ||||
|  | ||||
| @ -51,13 +51,6 @@ main.floors.guangchang2= | ||||
|                 8 | ||||
|             ] | ||||
|         }, | ||||
|         "12,10": { | ||||
|             "floorId": "xiaoxiang01", | ||||
|             "loc": [ | ||||
|                 0, | ||||
|                 10 | ||||
|             ] | ||||
|         }, | ||||
|         "2,0": { | ||||
|             "floorId": "guangchang6", | ||||
|             "loc": [ | ||||
| @ -74,8 +67,8 @@ main.floors.guangchang2= | ||||
|     "cannotMove": {}, | ||||
|     "cannotMoveIn": {}, | ||||
|     "map": [ | ||||
|     [  0,  0, 91,  0,210192,210194,210194,210175,210194,210194,210194,210192,143], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,143], | ||||
|     [  0,  0, 91,  0,210184,210186,210186,210186,210186,210186,210186,210186,143], | ||||
|     [  0,  0,  0,  0,210192,210194,210194,210175,210194,210194,210194,210194,143], | ||||
|     [120156,  0,  0,  0,90664,90648,90648,  0,90644,90648,90649,  0,143], | ||||
|     [120164,  0,  0,  0,90665,140110,122,  0,90645,140110,122,  0,120120], | ||||
|     [120172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120136], | ||||
| @ -84,7 +77,7 @@ main.floors.guangchang2= | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120160], | ||||
|     [ 92,  0,  0,  0,110384,110385,110376,  0,90652,90648,90649,  0,120168], | ||||
|     [  0,  0,  0,  0,110384,  0,122,  0,90653,  0,122,  0,120176], | ||||
|     [362,362,363,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94], | ||||
|     [362,362,363,  0,  0,  0,  0,  0,  0,  0,  0,  0,90266], | ||||
|     [210181,210181,210181,  0,  0,  0,  0,  0,  0,  0,  0,  0,110189], | ||||
|     [210186,210186,210186,361,362,362,362,362,362,362,362,362,110197] | ||||
| ], | ||||
| @ -131,7 +124,7 @@ main.floors.guangchang2= | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [110239,110239,110239,364,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,364,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,364,  0,  0,  0,  0,  0,  0,  0,  0,90266], | ||||
|     [  0,  0,  0,110239,110239,110239,110239,110239,110239,110239,110239,110239,  0] | ||||
| ], | ||||
|     "fg2map": [ | ||||
|  | ||||
| @ -109,7 +109,7 @@ main.floors.guangchang3= | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,50151,71217,140094], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,71791,140102], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140110], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0] | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140086] | ||||
| ], | ||||
|     "bg2map": [ | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|  | ||||
| @ -75,10 +75,10 @@ main.floors.guangchang5= | ||||
|     "cannotMove": {}, | ||||
|     "cannotMoveIn": {}, | ||||
|     "map": [ | ||||
|     [210161,210157,210162,  0,  0,  0, 91,  0,  0,  0,  0,  0,140086], | ||||
|     [210161,210157,210162,  0,  0,  0, 91,  0,  0,  0,  0,  0,140094], | ||||
|     [210164,210165,210170,  0,  0,  0,  0,  0,  0,  0,  0,20110,140094], | ||||
|     [210162,210178,210179,  0,  0,  0,  0,  0,  0,  0,122,  0,140102], | ||||
|     [210170,210178,210171,  0,  0,  0,  0,  0,  0,  0,  0,20110,  0], | ||||
|     [210170,210178,210171,  0,  0,  0,  0,  0,  0,  0,  0,20110,140110], | ||||
|     [  0,365,362,362,363,  0,  0,  0,361,362,362,362,362], | ||||
|     [  0,365,210177,210178,210176,  0,  0,  0,210176,210167,210178,210178,210178], | ||||
|     [362,363,210070,210071,210184,  0,  0,  0,210184,210068,210069,210178,210166], | ||||
|  | ||||
| @ -29,6 +29,13 @@ main.floors.guangchang6= | ||||
|                 12, | ||||
|                 9 | ||||
|             ] | ||||
|         }, | ||||
|         "12,7": { | ||||
|             "floorId": "yiqu1", | ||||
|             "loc": [ | ||||
|                 0, | ||||
|                 7 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     "beforeBattle": {}, | ||||
| @ -37,67 +44,71 @@ main.floors.guangchang6= | ||||
|     "afterOpenDoor": {}, | ||||
|     "autoEvent": {}, | ||||
|     "cannotMove": {}, | ||||
|     "cannotMoveIn": {}, | ||||
|     "cannotMoveIn": { | ||||
|         "4,12": [], | ||||
|         "4,11": [], | ||||
|         "4,10": [] | ||||
|     }, | ||||
|     "map": [ | ||||
|     [140087,20102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140095,20110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140103,20102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140111,20110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [362,362,362,363,364,  0,10171,10232,10240,  0,  0,  0,  0], | ||||
|     [210178,210178,210178,210167,364,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [210178,210178,210178,210178,364,  0,  0,  0,10254,10185,10245,10234,  0], | ||||
|     [210194,210175,210194,210194,364,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [110239,  0,126,71320,364,  0,  0,10272,10179,10171,10178,10273,  0], | ||||
|     [ 92,  0,  0,71328,364,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,71336,361,362,362,362,362,362,362,362,362], | ||||
|     [130183,  0,  0,  0,210176,210178,210178,210178,210178,210178,210167,210178,210178], | ||||
|     [130191,  0, 93,  0,210184,210178,210167,210178,210166,210178,210178,210178,210166] | ||||
|     [140095,120160,120161,120162,120163,120164,365,  0,  0,  0,  0,143,143], | ||||
|     [140095,120168,120169,120170,120171,120172,365,  0,  0,  0,  0,143,143], | ||||
|     [140103,120176,120177,20122,120179,120180,365,  0,  0,  0,  0,143,143], | ||||
|     [140111,20110,140107,140108,140109,20110,365,  0,  0,  0,  0,130192,130193], | ||||
|     [362,362,362,362,362,362,362,  0,  0,  0,  0,130200,130201], | ||||
|     [210178,210178,210178,210167,210178,210178,210176,  0,  0,  0,  0,140099,140100], | ||||
|     [210178,210178,210178,210178,210178,210178,210184,  0,  0,  0,  0,140107,140108], | ||||
|     [210194,210175,210194,210194,210194,210194,210192,  0,  0,  0,  0,  0, 94], | ||||
|     [110239,  0,  0,  0,  0,  0,365,  0,  0,  0,  0,120109,120110], | ||||
|     [ 92,  0,  0,  0,362,  0,363,  0,  0,  0,  0,120117,120118], | ||||
|     [  0,  0,  0,  0, 17,130046, 17,  0,  0,  0,140086,120125,120126], | ||||
|     [130183,  0,  0,  0, 17,130046, 17,  0,  0,  0,140094,120133,120134], | ||||
|     [130191,  0, 93,  0, 17,  0,  0,  0,  0,  0,140102,120141,120142] | ||||
| ], | ||||
|     "areas": "牢狱", | ||||
|     "bgmap": [ | ||||
|     [30055,30052,30052,30052,30052,30062,30052,30052,30052,30052,30052,30055,30052], | ||||
|     [30052,30052,30055,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30062,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,30052,30055,30052,30052,30052,30052], | ||||
|     [30052,30052,30052,30052,30055,30052,30052,30052,30052,30052,30052,30052,30052] | ||||
|     [30055,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30055,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,90078,  0,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,  0,  0,  0,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,  0,  0,  0,  0,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,  0,  0,  0,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,30052,30052,30052,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,210187,210178,210187,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,210195,210178,210195,90078,90078,90078,90078,90078,90078], | ||||
|     [30052,30052,30052,30052,90078,90078,90078,90078,90078,90078,90078,90078,90078] | ||||
| ], | ||||
|     "fgmap": [ | ||||
|     [  0,  0,  0,  0,  0,  0,  0,140087,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,140091,140092,140093,  0,  0,140095,  0,  0,  0,  0,  0], | ||||
|     [  0,20102,140099,140100,140101,20102,  0,140103,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,140111,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,140087,  0,  0,  0,140091,140092], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,140095,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,140103,  0,  0,  0,  0,  0], | ||||
|     [110231,  0,  0,  0,  0,  0,365,140111,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [110231,  0,  0,140086,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,140094,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,140102,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,140110,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  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,160032,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,160032,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,120178,  0,  0,160032,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,20130,  0,  0,160032,  0,  0,  0,  0,  0,  0], | ||||
|     [120103,120103,120103,120103,120103,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,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [120103,120103,120103,120103,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,170026,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,170026,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,170026,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,170026,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,170026,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,120103,120103,120103,120103,120103,120103,120103,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,365,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,365,130045,130046,130047,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,365,130045,130046,130047,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,365,130053,130054,130055,  0,  0,  0,  0,  0,  0] | ||||
| ], | ||||
|     "fg2map": [ | ||||
| 
 | ||||
|  | ||||
| @ -284,6 +284,29 @@ main.floors.jiaocheng02= | ||||
|                 "type": "hide", | ||||
|                 "remove": true | ||||
|             } | ||||
|         ], | ||||
|         "3,8": [ | ||||
|             { | ||||
|                 "type": "animationDrawable", | ||||
|                 "allFarme": 30, | ||||
|                 "color": [ | ||||
|                     0, | ||||
|                     0, | ||||
|                     0 | ||||
|                 ], | ||||
|                 "imageList": [ | ||||
|                     { | ||||
|                         "image": "" | ||||
|                     } | ||||
|                 ], | ||||
|                 "soundList": [ | ||||
|                     { | ||||
|                         "sound": "", | ||||
|                         "startfarme": 0, | ||||
|                         "stopbefore": false | ||||
|                     } | ||||
|                 ] | ||||
|             } | ||||
|         ] | ||||
|     }, | ||||
|     "changeFloor": { | ||||
|  | ||||
| @ -16,13 +16,6 @@ main.floors.xiaoxiang01= | ||||
|     "parallelDo": "", | ||||
|     "events": {}, | ||||
|     "changeFloor": { | ||||
|         "0,10": { | ||||
|             "floorId": "guangchang2", | ||||
|             "loc": [ | ||||
|                 12, | ||||
|                 10 | ||||
|             ] | ||||
|         }, | ||||
|         "12,7": { | ||||
|             "floorId": "xiaoxiang02", | ||||
|             "loc": [ | ||||
| @ -36,6 +29,13 @@ main.floors.xiaoxiang01= | ||||
|                 6, | ||||
|                 0 | ||||
|             ] | ||||
|         }, | ||||
|         "0,7": { | ||||
|             "floorId": "guangchang2", | ||||
|             "loc": [ | ||||
|                 12, | ||||
|                 10 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     "beforeBattle": {}, | ||||
|  | ||||
| @ -31,6 +31,13 @@ main.floors.yiqu1= | ||||
|                 0, | ||||
|                 8 | ||||
|             ] | ||||
|         }, | ||||
|         "0,7": { | ||||
|             "floorId": "guangchang6", | ||||
|             "loc": [ | ||||
|                 12, | ||||
|                 7 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     "beforeBattle": {}, | ||||
| @ -49,19 +56,19 @@ main.floors.yiqu1= | ||||
|         ] | ||||
|     }, | ||||
|     "map": [ | ||||
|     [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1], | ||||
|     [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1], | ||||
|     [  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1], | ||||
|     [  1,  1,  1,  1,  1,401,  1,  1,  1,  1,  1,  1,  1], | ||||
|     [  1, 32,  0, 21,  1,  0,  1, 31,  0, 81,201,  0, 21], | ||||
|     [  1,  1,205,  1,  1,421,  1,  0,  0,  1,  1,  0,  0], | ||||
|     [  1,  1,  0,  1,  1, 81,  1,  1, 81,  1,202,  0, 31], | ||||
|     [ 92,  0,201,  0, 21,  0,202,  0, 21, 82,  0,  1,  1], | ||||
|     [  1,  1, 81,  1,  1,  0,  1,205,  1,  1,  0,  0, 94], | ||||
|     [  1,  0, 31,  0,  1,201,  1,  0,  0, 31,  1,205,  1], | ||||
|     [  1,202,  0,202,  1,  0,  1,402, 21,  0,  1,  0,  1], | ||||
|     [  1, 22,205,403,  1,202,  1,  1,  1, 81,  1,201,  1], | ||||
|     [  1,  1,  1,  1,  1,  0,201,  0, 31,  0, 21,  0,  1] | ||||
|     [143,143,143,143,130193,130193,130193,130193,130193,143,143,143,143], | ||||
|     [143,143,143,143,130060,130061,130062,130201,130201,143,143,143,143], | ||||
|     [143,130193,130193,130194,130068,130069,130070,  0,120023,130192,130193,130193,143], | ||||
|     [130194,130201,130201,130202,130007,130006,130099,130098,120031,130200,130201,130201,143], | ||||
|     [130202, 32,  0, 21,201021,401,110116,  0,201, 81,  0, 21,130192], | ||||
|     [140101,  0,205,  0,201037,421,110124, 31,  0,110116, 31,  0,130200], | ||||
|     [140109,201037,  0,201037,200199, 81,110140,110138, 81,110138,110138,202,90667], | ||||
|     [ 92,201,  0,  0,  0,  0,202,  0,  0, 82,  0,  0,90675], | ||||
|     [120111,  0,  0, 21,  0,  0,201021,205,110138,110138,201021,  0, 94], | ||||
|     [120119,110122, 81,110122,201037,201,201029,402,  0, 31,201029,205,90650], | ||||
|     [120127,202, 31,202,201037,  0,201029,  0, 21,  0,201029,  0,110189], | ||||
|     [120135, 22,205,403,201037,202,201037,110122,110122, 81,201037,201,110197], | ||||
|     [120143,110138,110138,110138,201029,  0,201,  0, 31,  0, 21,  0,110197] | ||||
| ], | ||||
|     "bgmap": [ | ||||
|     [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078], | ||||
| @ -79,10 +86,34 @@ main.floors.yiqu1= | ||||
|     [90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078,90078] | ||||
| ], | ||||
|     "fgmap": [ | ||||
| 
 | ||||
|     [  0,  0,  0,  0,  0,120080,  0,  0,120066,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,120074,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,130091,130090,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,200175,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [140093,  0,  0,  0,200183,  0,  0,  0,  0,110152,  0,  0,  0], | ||||
|     [  0,201021,  0,201021,200191,  0,  0,  0,  0,110160,  0,  0,90667], | ||||
|     [  0,  0,  0,  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,201021,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,201021,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,201021,  0,  0,110114,110114,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,201021,  0,  0,  0,  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,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,120082,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,130015,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,110129,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,110146,110146,  0,110146,110146,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,110146,110146,  0,  0,  0], | ||||
|     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,90658], | ||||
|     [  0,  0,  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": [ | ||||
| 
 | ||||
|  | ||||
| @ -285,8 +285,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
|     }, | ||||
|         "afterBattle": async function (enemyId, x, y) { | ||||
| 	// 战斗结束后触发的事件
 | ||||
| 	var enemy = core.getEnemyInfo(enemyId, hero, x, y) | ||||
| 	var special = enemy.special; | ||||
| 	var enemy = core.material.enemys[enemyId] | ||||
| 	var special = core.getEnemyValue(enemy, "special", x, y); | ||||
| 	// 播放战斗音效和动画
 | ||||
| 	// 默认播放的动画;你也可以使用
 | ||||
| 	var animate = 'hand'; // 默认动画
 | ||||
| @ -1077,9 +1077,9 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 			} else { | ||||
| 				hero_damage += per_damage + per_mdamage | ||||
| 			} | ||||
| 			let animate = core.plugin.enemyanimate[enemy.id] ?? "sword" | ||||
| 			let animate = core.plugin.enemyanimate[enemy.id] ?? "jianji2" | ||||
| 			//这里可通过if更改默认的怪物攻击特效
 | ||||
| 			hero_animate.push(animate) //勇士身上绘制sword动画
 | ||||
| 			hero_animate.push(animate) //勇士身上绘制jianji2动画
 | ||||
| 			if (heroinfo.mhp + (hero_diff.mhp ?? 0) - hero_damage >= 0) { | ||||
| 				hero_diff.mhp = (hero_diff.mhp ?? 0) - hero_damage | ||||
| 				hero_damage = 0 | ||||
| @ -1102,7 +1102,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 				let mon_damage = 0 | ||||
| 				let hero_damage = 0 | ||||
| 				//这里写生效装备的技能效果,同时对双方属性的修改计入diff(不要在此直接修改heroinfo和enemyinfo)
 | ||||
| 				let animate = core.plugin.equipanimate[v.id] ?? "sword" | ||||
| 				let animate = core.plugin.equipanimate[v.id] ?? "jianji2" | ||||
| 				//这里可通过if更改默认的道具特效
 | ||||
| 				enemy_animate.push(animate) //勇士身上绘制动画
 | ||||
| 
 | ||||
| @ -1144,7 +1144,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 			let per_mdamage = Math.max(Math.floor(heroinfo.matk * (100 - enemyinfo.mdef) / 100), 0) | ||||
| 			mon_damage = per_damage + per_mdamage | ||||
| 			//这里记录伤害触发后的属性变化和动画,同时计入diff(不要在此直接修改heroinfo和enemyinfo)	
 | ||||
| 			let animate = core.plugin.heroanimate[equip0] ?? "sword" | ||||
| 			let animate = core.plugin.heroanimate[equip0] ?? "jianji2" | ||||
| 			//这里可通过if更改默认的武器攻击特效
 | ||||
| 			enemy_animate.push(animate) | ||||
| 
 | ||||
| @ -1170,7 +1170,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 			} else { | ||||
| 				hero_damage += per_damage + per_mdamage | ||||
| 			} | ||||
| 			let animate = core.plugin.enemyanimate[enemy.id] ?? "sword" | ||||
| 			let animate = core.plugin.enemyanimate[enemy.id] ?? "jianji2" | ||||
| 			//这里可通过if更改默认的怪物攻击特效
 | ||||
| 			hero_animate.push(animate) //勇士身上绘制sword动画
 | ||||
| 			if (heroinfo.mhp + (hero_diff.mhp ?? 0) - hero_damage >= 0) { | ||||
| @ -1194,7 +1194,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 				let mon_damage = 0 | ||||
| 				let hero_damage = 0 | ||||
| 				//这里写生效装备的技能效果,同时对双方属性的修改计入diff(不要在此直接修改heroinfo和enemyinfo)
 | ||||
| 				let animate = core.plugin.equipanimate[v.id] ?? "sword" | ||||
| 				let animate = core.plugin.equipanimate[v.id] ?? "jianji2" | ||||
| 				//这里可通过if更改默认的道具特效
 | ||||
| 				enemy_animate.push(animate) //怪物身上绘制动画
 | ||||
| 
 | ||||
| @ -1653,7 +1653,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = | ||||
| 		} | ||||
| 		core.drawbackground(core.ui.cgText.image, core.ui.cgText.memory) | ||||
| 	} | ||||
| 	core.plugin.playing.clear(); | ||||
| 	// 切换到对应的楼层
 | ||||
| 	core.changeFloor(data.floorId, null, data.hero.loc, 0, function () { | ||||
| 		// TODO:可以在这里设置读档后播放BGM
 | ||||
|  | ||||
							
								
								
									
										1828
									
								
								project/plugins.js
									
									
									
									
									
								
							
							
						
						
									
										1828
									
								
								project/plugins.js
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user