fix: handle spine with .json, fix spine pivot problem

OpenWebGAL · Dec 22, 2024 · 4e10a86 · 4e10a86
1 parent 3534bdd
commit 4e10a86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts b/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts
@@ -610,17 +610,19 @@ export default class PixiStage {
       setTimeout(() => {
         if (spineResource && this.getStageObjByUuid(figureUuid)) {
           const figureSpine = new Spine(spineResource.spineData);
-          const transY = spineResource?.spineData?.y ?? 0;
+          const spineBounds = figureSpine.getLocalBounds();
+          const spineCenterX = spineBounds.x + spineBounds.width / 2;
+          const spineCenterY = spineBounds.y + spineBounds.height / 2;
+          figureSpine.pivot.set(spineCenterX, spineCenterY);
+          // TODO: set animation 还没做
+          // figureSpine.state.setAnimation()
           /**
            * 重设大小
            */
           const originalWidth = figureSpine.width;
           const originalHeight = figureSpine.height;
           const scaleX = this.stageWidth / originalWidth;
           const scaleY = this.stageHeight / originalHeight;
-          // 我也不知道为什么啊啊啊啊
-          figureSpine.y = -(scaleY * transY) / 2;
-          figureSpine.state.setAnimation(0, '07', true);
           const targetScale = Math.min(scaleX, scaleY);
           const figureSprite = new PIXI.Sprite();
           figureSprite.addChild(figureSpine);

diff --git a/packages/webgal/src/Stage/MainStage/useSetFigure.ts b/packages/webgal/src/Stage/MainStage/useSetFigure.ts
@@ -207,9 +207,12 @@ function removeFig(figObj: IStageObject, enterTikerKey: string, effects: IEffect
 
 function addFigure(type?: 'image' | 'live2D' | 'spine', ...args: any[]) {
   const url = args[1];
+  const baseUrl = window.location.origin;
+  const urlObject = new URL(url, baseUrl);
+  const _type = urlObject.searchParams.get('type') as 'image' | 'live2D' | 'spine' | null;
   if (url.endsWith('.json')) {
     return addLive2dFigure(...args);
-  } else if (url.endsWith('.skel')) {
+  } else if (url.endsWith('.skel') || _type === 'spine') {
     // @ts-ignore
     return WebGAL.gameplay.pixiStage?.addSpineFigure(...args);
   } else {