fix Bulb. replace <n> with <br>. fix rootPath on mac.

ArisStudio · Aug 3, 2023 · 54a0861 · 54a0861
1 parent b4dbac2
commit 54a0861
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 7 deletions.
diff --git a/Assets/ArisStudio/Components/Button/AutoDefault.png b/Assets/ArisStudio/Components/Button/AutoDefault.png
diff --git a/Assets/ArisStudio/Components/Button/Button.png b/Assets/ArisStudio/Components/Button/Button.png
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: 29.722609
+    - _StartAngle: 149.29335
     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: 209.93394
+    - _StartAngle: 329.2934
     m_Colors:
     - _BorderColor: {r: 32, g: 32, b: 32, a: 1}
diff --git a/Assets/ArisStudio/MainControl.cs b/Assets/ArisStudio/MainControl.cs
@@ -124,9 +124,9 @@ public void SetLocalDataPath()
 #if UNITY_ANDROID
             var rootPath = $"file:///{Application.persistentDataPath}";
 #elif UNITY_STANDALONE_OSX
-            var rootPath = Directory.GetParent($"file://{Application.dataPath}").ToString();
+            var rootPath = $"file://{Directory.GetParent(Application.dataPath)}";
 #else
-            var rootPath = Directory.GetParent(Application.dataPath).ToString();
+             var rootPath = Directory.GetParent(Application.dataPath).ToString();
 #endif
             var localDataPath = Path.Combine(rootPath, "Data");
             sprFactory.SetSprDataPath(localDataPath);

diff --git a/Assets/ArisStudio/Spr/Emoticon/OldEmoticon/Animation/Bulb.anim b/Assets/ArisStudio/Spr/Emoticon/OldEmoticon/Animation/Bulb.anim
@@ -72,6 +72,34 @@ AnimationClip:
     path: Emoticon_Balloon_N/Emoji_Bulb_2
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Emoticon_Balloon_N/Emoji_Bulb_1
+    classID: 1
+    script: {fileID: 0}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -87,6 +115,13 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1020461155
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -164,6 +199,34 @@ AnimationClip:
     path: Emoticon_Balloon_N/Emoji_Bulb_2
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Emoticon_Balloon_N/Emoji_Bulb_1
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

diff --git a/Assets/ArisStudio/TextArea.cs b/Assets/ArisStudio/TextArea.cs
@@ -95,7 +95,7 @@ public void SetText(string sName, string sGroup, string sContent)
             tName.text = sName == string.Empty ? " " : sName;
             tGroup.text = sGroup == string.Empty ? " " : sGroup;
             tContent.text = string.Empty;
-            tmpContent = sContent == string.Empty ? " " : sContent.Replace("<n>", "\n");
+            tmpContent = sContent == string.Empty ? " " : sContent.Replace("<br>", "\n");
             typing = true;
             br.SetActive(false);
         }

diff --git a/Assets/Scenes/ArisStudio.unity b/Assets/Scenes/ArisStudio.unity
@@ -28525,7 +28525,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1920359946}
   m_HandleRect: {fileID: 1920359945}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:

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.23
+  bundleVersion: 0.2.24
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0