From 8f6d538ae90d63277098f3707c678c5c784f6e8c Mon Sep 17 00:00:00 2001 From: unanmed <1319491857@qq.com> Date: Tue, 15 Oct 2024 17:39:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=BD=E9=80=90=E6=88=98=E7=88=86?= =?UTF-8?q?=E7=82=B8=E6=89=AD=E6=9B=B2=E7=89=B9=E6=95=88=20&=20fix:=20?= =?UTF-8?q?=E6=89=AD=E6=9B=B2=E7=89=B9=E6=95=88=E5=8F=AA=E8=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=A4=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin/chase/chase1.ts | 199 ++++++++++++++++------------------- src/plugin/fx/pointShader.ts | 33 ++++-- 2 files changed, 114 insertions(+), 118 deletions(-) diff --git a/src/plugin/chase/chase1.ts b/src/plugin/chase/chase1.ts index fd82739..5ccac4a 100644 --- a/src/plugin/chase/chase1.ts +++ b/src/plugin/chase/chase1.ts @@ -104,7 +104,7 @@ let back: Sprite | undefined; const effect = new PointEffect(); Mota.require('var', 'loading').once('loaded', () => { - effect.create(Chase.shader, 10); + effect.create(Chase.shader, 30); }); /** @@ -218,6 +218,14 @@ export function initChase(): IChaseController { camera.destroy(); }); + chase.on('frame', () => { + effect.requestUpdate(); + }); + + chase.on('changeFloor', () => { + effect.clearEffect(); + }); + const controller: IChaseController = { chase, start(fromSave) { @@ -231,7 +239,7 @@ export function initChase(): IChaseController { if (fromSave) { initFromSave(chase); } - testEffect(chase); + // testEffect(); }, end(success) { chase.end(success); @@ -244,7 +252,7 @@ export function initChase(): IChaseController { return controller; } -function testEffect(chase: Chase) { +function testEffect() { // effect.addEffect( // PointEffectType.CircleContrast, // Date.now(), @@ -253,15 +261,16 @@ function testEffect(chase: Chase) { // [1, 0, 0, 0] // ); effect.addEffect( - PointEffectType.CircleWarpTangetial, + PointEffectType.CircleWarp, Date.now(), 100000, - [7 * 32 + 16, 17 * 32 + 16, 150, 120], - [Math.PI / 2, 0, 0, 0] + [7 * 32 + 16, 17 * 32 + 16, 200, 20], + [1 / 20, 1, 0.5, 0], + [0, Math.PI * 2, 0, 0] ); - chase.on('frame', () => { - effect.requestUpdate(); - }); + // chase.on('frame', () => { + // effect.requestUpdate(); + // }); } function initAudio(chase: Chase) { @@ -355,6 +364,23 @@ function drawBack(chase: Chase, ani: Animation) { }); } +function addCommonWarp(x: number, y: number) { + effect.addEffect( + PointEffectType.CircleWarp, + Date.now(), + 1000, + [x * 32 + 16, y * 32 + 16, 96, 16], + [1 / 20, 1, 0.5, 0], + [0, Math.PI * 2, 0, 0] + ); +} + +function explode1(x: number, y: number) { + core.setBlock(336, x, y); + core.drawAnimate('explosion1', x, y); + addCommonWarp(x, y); +} + function para1(chase: Chase) { chase.onFloorTime('MT15', 830, () => { for (let tx = 53; tx < 58; tx++) { @@ -366,50 +392,39 @@ function para1(chase: Chase) { core.drawAnimate('stone', 55, 5); }); chase.onFloorTime('MT15', 1080, () => { - core.setBlock(336, 58, 9); - core.setBlock(336, 59, 9); - core.drawAnimate('explosion1', 58, 9); - core.drawAnimate('explosion1', 59, 9); + explode1(58, 9); + explode1(59, 9); }); chase.onFloorTime('MT15', 1190, () => { - core.setBlock(336, 53, 8); - core.setBlock(336, 52, 8); - core.drawAnimate('explosion1', 53, 8); - core.drawAnimate('explosion1', 52, 8); + explode1(53, 8); + explode1(52, 8); }); chase.onFloorTime('MT15', 1580, () => { - core.setBlock(336, 51, 7); - core.drawAnimate('explosion1', 51, 7); + explode1(51, 7); }); chase.onFloorTime('MT15', 1830, () => { - core.setBlock(336, 47, 7); - core.setBlock(336, 49, 9); - core.drawAnimate('explosion1', 49, 9); - core.drawAnimate('explosion1', 47, 7); + explode1(47, 7); + explode1(49, 9); }); } function para2(chase: Chase) { let emitted32x9 = false; chase.onceLoc(45, 8, 'MT15', () => { - core.setBlock(336, 45, 9); - core.drawAnimate('explosion1', 45, 9); + explode1(45, 9); }); chase.onceLoc(45, 6, 'MT15', () => { - core.setBlock(336, 44, 6); - core.drawAnimate('explosion1', 44, 6); + explode1(44, 6); }); chase.onceLoc(45, 4, 'MT15', () => { - core.setBlock(336, 44, 4); - core.drawAnimate('explosion1', 44, 4); + explode1(44, 4); core.drawAnimate('explosion1', 48, 6); core.removeBlock(48, 6); + addCommonWarp(48, 6); }); chase.onceLoc(41, 3, 'MT15', () => { - core.setBlock(336, 41, 4); - core.setBlock(336, 32, 6); - core.drawAnimate('explosion1', 41, 4); - core.drawAnimate('explosion1', 32, 6); + explode1(41, 4); + explode1(32, 6); }); chase.onceLoc(35, 3, 'MT15', () => { core.drawAnimate('explosion3', 37, 7); @@ -424,28 +439,32 @@ function para2(chase: Chase) { core.removeBlock(33, 8); core.drawAnimate('explosion1', 34, 8); core.drawAnimate('explosion1', 33, 8); + addCommonWarp(34, 8); + addCommonWarp(33, 8); }); chase.onceLoc(33, 7, 'MT15', () => { - core.setBlock(336, 32, 9); - core.drawAnimate('explosion1', 32, 9); + explode1(32, 9); }); chase.onceLoc(33, 9, 'MT15', () => { if (emitted32x9) return; emitted32x9 = true; core.removeBlock(32, 9); core.drawAnimate('explosion1', 32, 9); + addCommonWarp(32, 9); }); chase.onceLoc(34, 9, 'MT15', () => { if (emitted32x9) return; emitted32x9 = true; core.removeBlock(32, 9); core.drawAnimate('explosion1', 32, 9); + addCommonWarp(32, 9); }); chase.onceLoc(35, 9, 'MT15', () => { if (emitted32x9) return; emitted32x9 = true; core.removeBlock(32, 9); core.drawAnimate('explosion1', 32, 9); + addCommonWarp(32, 9); }); for (let x = 19; x < 31; x++) { const xx = x; @@ -458,14 +477,10 @@ function para2(chase: Chase) { function para3(chase: Chase, ani: Animation) { chase.onceLoc(126, 7, 'MT14', () => { - core.setBlock(336, 126, 6); - core.setBlock(336, 124, 6); - core.setBlock(336, 124, 9); - core.setBlock(336, 126, 9); - core.drawAnimate('explosion1', 126, 6); - core.drawAnimate('explosion1', 124, 6); - core.drawAnimate('explosion1', 124, 9); - core.drawAnimate('explosion1', 126, 9); + explode1(126, 6); + explode1(124, 6); + explode1(124, 9); + explode1(126, 9); }); chase.onceLoc(123, 7, 'MT14', () => { core.setBlock(508, 127, 7); @@ -474,24 +489,19 @@ function para3(chase: Chase, ani: Animation) { core.setBlock(509, 112, 7); }, 520); core.drawHeroAnimate('amazed'); - core.setBlock(336, 121, 6); - core.setBlock(336, 122, 6); - core.setBlock(336, 120, 8); - core.setBlock(336, 121, 8); - core.setBlock(336, 122, 8); - core.drawAnimate('explosion1', 121, 6); - core.drawAnimate('explosion1', 122, 6); - core.drawAnimate('explosion1', 120, 8); - core.drawAnimate('explosion1', 121, 8); - core.drawAnimate('explosion1', 122, 8); + explode1(121, 6); + explode1(122, 6); + explode1(120, 8); + explode1(121, 8); + explode1(122, 8); }); let emitted110x10 = false; let emitted112x8 = false; chase.onceLoc(110, 10, 'MT14', () => { - core.setBlock(336, 109, 11); + explode1(109, 11); core.removeBlock(112, 8); - core.drawAnimate('explosion1', 109, 11); core.drawAnimate('explosion1', 112, 8); + addCommonWarp(112, 8); core.insertAction([ { type: 'moveHero', time: 400, steps: ['backward:1'] } ]); @@ -507,32 +517,22 @@ function para3(chase: Chase, ani: Animation) { emitted112x8 = true; }); chase.onceLoc(118, 7, 'MT14', () => { - core.setBlock(336, 117, 6); - core.setBlock(336, 116, 6); - core.setBlock(336, 115, 6); - core.setBlock(336, 114, 6); - core.setBlock(336, 117, 8); - core.setBlock(336, 116, 8); - core.drawAnimate('explosion1', 117, 6); - core.drawAnimate('explosion1', 116, 6); - core.drawAnimate('explosion1', 115, 6); - core.drawAnimate('explosion1', 114, 6); - core.drawAnimate('explosion1', 116, 8); - core.drawAnimate('explosion1', 117, 8); + explode1(117, 6); + explode1(116, 6); + explode1(115, 6); + explode1(114, 6); + explode1(117, 8); + explode1(116, 8); }); chase.onceLoc(112, 7, 'MT14', () => { - core.setBlock(336, 112, 8); - core.setBlock(336, 113, 7); - core.drawAnimate('explosion1', 112, 8); - core.drawAnimate('explosion1', 113, 7); + explode1(112, 8); + explode1(113, 7); }); chase.onceLoc(115, 7, 'MT14', () => { for (let tx = 111; tx <= 115; tx++) { - core.setBlock(336, tx, 10); - core.drawAnimate('explosion1', tx, 10); + explode1(tx, 10); } - core.setBlock(336, 112, 8); - core.drawAnimate('explosion1', 112, 8); + explode1(112, 8); }); chase.onceLoc(110, 7, 'MT14', () => { core.jumpBlock(97, 4, 120, -3, 2000); @@ -545,38 +545,28 @@ function para3(chase: Chase, ani: Animation) { core.drawAnimate('explosion2', 119, 7); core.removeBlock(105, 7); core.drawAnimate('explosion1', 105, 7); + addCommonWarp(105, 7); }); chase.onceLoc(97, 3, 'MT14', () => { - core.setBlock(336, 95, 3); - core.setBlock(336, 93, 6); - core.drawAnimate('explosion1', 95, 3); - core.drawAnimate('explosion1', 93, 6); + explode1(95, 3); + explode1(93, 6); }); chase.onceLoc(88, 6, 'MT14', () => { - core.setBlock(336, 87, 4); - core.setBlock(336, 88, 5); - core.drawAnimate('explosion1', 87, 4); - core.drawAnimate('explosion1', 88, 5); + explode1(87, 4); + explode1(88, 5); }); chase.onceLoc(86, 6, 'MT14', () => { - core.setBlock(336, 84, 6); - core.setBlock(336, 85, 5); - core.setBlock(336, 86, 8); - core.drawAnimate('explosion1', 84, 6); - core.drawAnimate('explosion1', 85, 5); - core.drawAnimate('explosion1', 86, 8); + explode1(84, 6); + explode1(85, 5); + explode1(86, 8); }); chase.onceLoc(81, 9, 'MT14', () => { - core.setBlock(336, 81, 8); - core.setBlock(336, 82, 11); - core.drawAnimate('explosion1', 81, 8); - core.drawAnimate('explosion1', 82, 11); + explode1(81, 8); + explode1(82, 11); }); chase.onceLoc(72, 11, 'MT14', () => { - core.setBlock(336, 73, 8); - core.setBlock(336, 72, 4); - core.drawAnimate('explosion1', 73, 8); - core.drawAnimate('explosion1', 72, 4); + explode1(73, 8); + explode1(72, 4); }); chase.onceLoc(71, 7, 'MT14', () => { for (let tx = 74; tx < 86; tx++) { @@ -587,10 +577,8 @@ function para3(chase: Chase, ani: Animation) { core.drawAnimate('explosion2', 79, 7); }); chase.onceLoc(68, 5, 'MT14', () => { - core.setBlock(336, 68, 4); - core.setBlock(336, 67, 6); - core.drawAnimate('explosion1', 68, 4); - core.drawAnimate('explosion1', 67, 6); + explode1(68, 4); + explode1(67, 6); }); chase.onceLoc(67, 10, 'MT14', () => { for (let tx = 65; tx <= 72; tx++) { @@ -603,12 +591,9 @@ function para3(chase: Chase, ani: Animation) { core.drawAnimate('explosion3', 69, 5); }); chase.onceLoc(64, 11, 'MT14', () => { - core.setBlock(336, 63, 9); - core.setBlock(336, 60, 8); - core.setBlock(336, 56, 11); - core.drawAnimate('explosion1', 63, 9); - core.drawAnimate('explosion1', 60, 8); - core.drawAnimate('explosion1', 56, 11); + explode1(63, 9); + explode1(60, 8); + explode1(56, 11); }); chase.onceLoc(57, 9, 'MT14', () => { for (let tx = 58; tx <= 64; tx++) { diff --git a/src/plugin/fx/pointShader.ts b/src/plugin/fx/pointShader.ts index 2b40dba..13fb863 100644 --- a/src/plugin/fx/pointShader.ts +++ b/src/plugin/fx/pointShader.ts @@ -176,9 +176,9 @@ export class PointEffect { const id = this.effectId++; // 第三项为特效的进度 const data = [type, id, 0, time, ...data1, ...data2, ...data3]; - this.startTime.set(id, now); + this.startTime.set(id, startTime); - if (now > startTime) { + if (now >= startTime) { this.addEffectToList(data); } else { // 如果还没开始，那么添加至预备队列 @@ -196,6 +196,15 @@ export class PointEffect { this.removeEffect(this.findIndexById(id)); } + /** + * 清除所有特性 + */ + clearEffect() { + this.dataList.fill(0); + this.dataPointer = 0; + this.needUpdateData = true; + } + /** * 设置一个特效的数据，注意特效数据必须填四位，不足者补0 * @param id 特效id @@ -248,13 +257,13 @@ export class PointEffect { } const type = data[0]; const list = this.dataList; - const id = data[1]; if (warpEffect.has(type)) { - list.copyWithin(16, 0, 16); + list.copyWithin(16, 0); list.set(data, 0); this.dataPointer++; this.idIndexMap.clear(); } else { + const id = data[1]; list.set(data, this.dataPointer * 16); this.idIndexMap.set(id, this.dataPointer); this.dataPointer++; @@ -331,7 +340,10 @@ export class PointEffect { if (type === PointEffectType.None) continue; const id = list[i * 16 + 1]; const start = this.startTime.get(id); - if (!start) continue; + if (!start) { + toRemove.push(i); + continue; + } const time = list[i * 16 + 3]; const progress = (now - start) / time; if (progress > 1) toRemove.push(i); @@ -375,12 +387,13 @@ export class PointEffect { const count = this.effectCount; const list = this.dataList; const transformed = this.transformed; - let scale = transform.scaleX * core.domStyle.scale; - if (this.shader?.highResolution) scale *= devicePixelRatio; + let ratio = core.domStyle.scale; + if (this.shader?.highResolution) ratio *= devicePixelRatio; + const scale = transform.scaleX * ratio; const scaleTransform = new Transform(); - scaleTransform.scale(scale, scale); + scaleTransform.scale(ratio, ratio); const scaled = scaleTransform.multiply(transform); - const fixedHeight = core._PY_ * scale; + const fixedHeight = core._PY_ * ratio; const transformXY = (index: number) => { const x = list[index + 4]; @@ -532,8 +545,6 @@ void main() { vec4 data3 = effect.info3; if (effectType == ${PointEffectType.None}) break; float progress = timeInfo.x; - // 我草了这句continue，调试的时候直接硬控我俩小时 - // if (now < 0.0 || now > end) continue; // 下面开始实施对应的着色器特效