add skin support.

ArisStudio · Aug 18, 2023 · 590a232 · 590a232
1 parent 54a0861
commit 590a232
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/Assets/ArisStudio/Components/Button/ButtonLight1.mat b/Assets/ArisStudio/Components/Button/ButtonLight1.mat
@@ -28,6 +28,6 @@ Material:
     - _Length: 0.351
     - _Size: 0.2
     - _Speed: 10
-    - _StartAngle: 149.29335
+    - _StartAngle: 241.51262
     m_Colors:
     - _BorderColor: {r: 32, g: 32, b: 32, a: 1}
diff --git a/Assets/ArisStudio/Components/Button/ButtonLight2.mat b/Assets/ArisStudio/Components/Button/ButtonLight2.mat
@@ -28,6 +28,6 @@ Material:
     - _Length: 0.3
     - _Size: 0.2
     - _Speed: 10
-    - _StartAngle: 329.2934
+    - _StartAngle: 60.152496
     m_Colors:
     - _BorderColor: {r: 32, g: 32, b: 32, a: 1}
diff --git a/Assets/ArisStudio/MainControl.cs b/Assets/ArisStudio/MainControl.cs
@@ -166,7 +166,7 @@ public void SetPlay()
             }
 
             isPlaying = true;
-            debugConsole.PrintLog("Play Once");
+            // debugConsole.PrintLog("Play Once");
         }
 
         public void SetTyping(bool b)
@@ -178,6 +178,7 @@ public void SetSelect(string tName)
         {
             runLineNumber = targetList[tName];
             isSelecting = false;
+            isPlaying = true;
             debugConsole.PrintLog($"Select: <color=lime>{tName}</color>");
         }
 

diff --git a/Assets/ArisStudio/Spr/SprFactory.cs b/Assets/ArisStudio/Spr/SprFactory.cs
@@ -343,6 +343,11 @@ private void SCommand(string sCommand)
                     ssList[l[1]].GetComponent<SprState>().HighLight(float.Parse(l[3]));
                     break;
                 }
+                case "skin":
+                {
+                    ssList[l[1]].GetComponent<SprState>().SetSkin(l[3]);
+                    break;
+                }
                 case "state":
                 {
                     ssList[l[1]].GetComponent<SprState>().SetState(l[3]);

diff --git a/Assets/ArisStudio/Spr/SprState.cs b/Assets/ArisStudio/Spr/SprState.cs
@@ -176,6 +176,13 @@ public void HighLight(float f)
             }
         }
 
+        public void SetSkin(string skinName)
+        {
+            if (!isSpr) return;
+            sa.skeleton.SetSkin(skinName);
+            sa.skeleton.SetSlotsToSetupPose();
+        }
+
         public void SetState(string stateName)
         {
             if (isSpr)

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -123,7 +123,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.2.24
+  bundleVersion: 0.2.25
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0