2.1.2

reitowo · Jul 10, 2018 · 8a0bae5 · 8a0bae5
1 parent 38ac66e
commit 8a0bae5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 27 deletions.
diff --git a/Assets/Events/FanmadeMatchEp1/FMEp1Controller.cs b/Assets/Events/FanmadeMatchEp1/FMEp1Controller.cs
@@ -1,15 +1,15 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
 public class FMEp1Controller : MonoBehaviour
-{ 
+{ 
     public void OpenUrl(string url)
     {
         Application.OpenURL(url);
-    }
-}
+    }
+}
diff --git a/Assets/Scripts/LimSystem/LimSystem.cs b/Assets/Scripts/LimSystem/LimSystem.cs
@@ -1070,7 +1070,7 @@ public class PreferencesContainer
         public string Designer = string.Empty;
         public float MusicPlayerPreciseOffset = 0;
         public float WaveformBlockerPosition = 0;
-        public int Build = 51;
+        public int Build = 52;
         public bool Autosave = true;
         public bool JudgeColor = true;
         public bool CloudAutosave = false;
@@ -1091,7 +1091,7 @@ public class PreferencesContainer
 public class LimSystem : MonoBehaviour
 {
     public static string Version = "v2.1.2";
-    public static int Build = 51;
+    public static int Build = 52;
     public static Lanotalium.ChartContainer ChartContainer;
     public LimTunerManager TunerManager;
     public LimEditorManager EditorManager;

diff --git a/Assets/Scripts/LimSystem/LimTuner/Managers/LimHoldNoteManager.cs b/Assets/Scripts/LimSystem/LimTuner/Managers/LimHoldNoteManager.cs
@@ -349,8 +349,6 @@ private void UpdateAllLineRenderers()
                 float currentaTime = Note.Time, currentaDegree = Note.Degree;
                 bool headPointAdded = false;
 
-                Note.LineRenderer.widthCurve = new AnimationCurve();
-
                 for (int i = 0; i < Note.Joints.Count; ++i)
                 {
                     Lanotalium.Chart.LanotaJoints Joint = Note.Joints[i];
@@ -366,7 +364,6 @@ private void UpdateAllLineRenderers()
                         if (Note.Time < Tuner.ChartTime)
                         {
                             float startDegreePercent = (Tuner.ChartTime - currentaTime) / Joint.dTime;
-                            Note.LineRenderer.widthCurve.AddKey(currentaTime, 1 / CalculateEasedCurveDirevative(startDegreePercent, Joint.Cfmi));
                             AddLineRendererPosition(positionIndex, Note.LineRenderer, CalculateLineRendererPoint(100, currentaDegree + Joint.dDegree * CalculateEasedCurve(startDegreePercent, Joint.Cfmi) + Tuner.CameraManager.CurrentRotation));
                             positionIndex++;
                         }
@@ -383,8 +380,6 @@ private void UpdateAllLineRenderers()
                         float percent = CalculateEasedPercent(CalculateMovePercent(timing));
                         lastPercent = percent;
                         if (percent == 100 && timing <= Tuner.ChartTime) continue;
-                        float direvative = CalculateEasedCurveDirevative(timingPercent, Joint.Cfmi);
-                        Note.LineRenderer.widthCurve.AddKey(timing, 1 / direvative);
                         AddLineRendererPosition(positionIndex, Note.LineRenderer, CalculateLineRendererPoint(percent, degree + Tuner.CameraManager.CurrentRotation));
                         positionIndex++;
                         if (percent <= 15) goto end;
@@ -395,8 +390,8 @@ private void UpdateAllLineRenderers()
                 }
                 end:
 
-                /*Note.LineRenderer.startWidth = Note.Percent / 100;
-                Note.LineRenderer.endWidth = lastPercent / 100;*/
+                Note.LineRenderer.startWidth = Note.Percent / 100;
+                Note.LineRenderer.endWidth = lastPercent / 100;
                 Note.LineRenderer.positionCount = positionIndex;
             }
         }

diff --git a/Lanotalium.sln b/Lanotalium.sln
@@ -5,14 +5,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schwarzer.Lanotalium", "Sch
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schwarzer.Dialogs", "Schwarzer.Dialogs.csproj", "{FAE7C25A-3B42-2C8C-AEE6-C640A827DDB4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lanotalium", "Lanotalium.csproj", "{F9FB416B-927F-614F-59BD-12E03D898691}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schwarzer.WebApi", "Schwarzer.WebApi.csproj", "{ECAECBA1-3EC5-62AB-644B-C606BB4D6731}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schwarzer.Chart", "Schwarzer.Chart.csproj", "{9CFBFEE5-30E2-390C-0671-E7343568AFBE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schwarzer.Unity", "Schwarzer.Unity.csproj", "{E7815E92-7ABE-3128-8734-4D409E8AF0EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lanotalium", "Lanotalium.csproj", "{F9FB416B-927F-614F-59BD-12E03D898691}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +27,10 @@ Global
 		{FAE7C25A-3B42-2C8C-AEE6-C640A827DDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FAE7C25A-3B42-2C8C-AEE6-C640A827DDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FAE7C25A-3B42-2C8C-AEE6-C640A827DDB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9FB416B-927F-614F-59BD-12E03D898691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9FB416B-927F-614F-59BD-12E03D898691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9FB416B-927F-614F-59BD-12E03D898691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9FB416B-927F-614F-59BD-12E03D898691}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECAECBA1-3EC5-62AB-644B-C606BB4D6731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ECAECBA1-3EC5-62AB-644B-C606BB4D6731}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECAECBA1-3EC5-62AB-644B-C606BB4D6731}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,10 +43,6 @@ Global
 		{E7815E92-7ABE-3128-8734-4D409E8AF0EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E7815E92-7ABE-3128-8734-4D409E8AF0EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7815E92-7ABE-3128-8734-4D409E8AF0EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9FB416B-927F-614F-59BD-12E03D898691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9FB416B-927F-614F-59BD-12E03D898691}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9FB416B-927F-614F-59BD-12E03D898691}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9FB416B-927F-614F-59BD-12E03D898691}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -164,7 +164,7 @@ PlayerSettings:
     Standalone: com.Schwarzer.Lanotalium
     iOS: com.Schwarzer.Lanotalium
   buildNumber:
-    Standalone: 51
+    Standalone: 52
     iOS: 31
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 16