Merge branch 'master' into develop

SpriteStudio · Jul 10, 2024 · fd3cf0f · fd3cf0f
2 parents f6897a4 + 76b76d2
commit fd3cf0f
Show file tree

Hide file tree

Showing 135 changed files with 3,123 additions and 1,792 deletions.
diff --git a/docs/Player/index.html b/docs/Player/index.html
@@ -6,7 +6,7 @@
 </head>
 <body>
   <!-- pixi.jsの読込 -->
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/8.0.2/pixi.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/8.2.2/pixi.min.js"></script>
   <!-- ss6player -->
   <script src="./ss6player-pixi.min.js"></script>
   <!-- ユーザープログラムの読込 -->

diff --git a/docs/Player/sample.js b/docs/Player/sample.js
@@ -14,6 +14,7 @@
 //const testVersion = "sampleAnimation1";
 //const testVersion = "sampleAnimation2";
 const testVersion = "sampleAnimation3";
+//const testVersion = "sampleReplaceTexture";
 
 (async () => {
   PIXI.sayHello();
@@ -44,6 +45,11 @@ const testVersion = "sampleAnimation3";
     "sampleAnimation3": {
       "ssfbFile": "./MeshBone/Knight.ssfb",
       "func": Play_sampleAnimation3
+    },
+
+    "sampleReplaceTexture": {
+      "ssfbFile": "./MeshBone/Knight.ssfb",
+      "func": Play_sampleReplaceTexture
     }
   };
 
@@ -115,4 +121,16 @@ const testVersion = "sampleAnimation3";
       mySS6Player.Play();
     }
   }
+
+  function Play_sampleReplaceTexture() {
+    let mySS6Player = new ss6PlayerPixi.SS6Player(mySS6Project);
+    mySS6Player.Setup("Knight_bomb", "Balloon");
+    mySS6Player.position = new PIXI.Point(320, 480);
+    mySS6Player.scale = new PIXI.Point(0.5, 0.5);
+    mySS6Player.SetPartCell('Head', 'Effect', 'Flame');
+    app.stage.addChild(mySS6Player);
+
+    // 再生開始
+    mySS6Player.Play();
+  }
 })();
diff --git a/docs/Player/ss6player-pixi.min.js b/docs/Player/ss6player-pixi.min.js
diff --git a/docs/Player/ss6player-pixi.umd.js b/docs/Player/ss6player-pixi.umd.js
diff --git a/docs/Player6/ss6player-pixi6.min.js b/docs/Player6/ss6player-pixi6.min.js