wuyu 1 år sedan
förälder
incheckning
cab4c51fce

+ 1 - 1
Assembly-CSharp.csproj

@@ -168,7 +168,7 @@
      <Compile Include="Assets/_Packages/PaperFoldAsset/GDPR Panel/_Scripts/GDPR.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Sounds Button/_Scripts/SoundsButton.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetGameplay/Object Placer/ObjectPlacer.cs" />
-     <Compile Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/FoldingMarker.cs" />
+     <Compile Include="Assets/PaperFold/Scripts/FoldingMarker.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/GeneralBasic.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Archived/TestingRigidbodyCS.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/Following.cs" />

Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/FoldingMarker.cs → Assets/PaperFold/Scripts/FoldingMarker.cs


Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/FoldingMarker.cs.meta → Assets/PaperFold/Scripts/FoldingMarker.cs.meta


+ 11 - 10
Assets/PaperFold/Scripts/Paper.cs

@@ -68,7 +68,7 @@ public class Paper : MonoBehaviour
         Vector3 startPosition = transform.position;
         startPosition.z = 10;
         transform.position = startPosition;
-
+    
         transform.DOMoveZ(toPositionZ, 1f);
     }
 
@@ -361,9 +361,7 @@ public class Paper : MonoBehaviour
 
         _canFold = false;
 
-     
-
-        LeanTween.moveZ(gameObject, -20f, 0.7f).setEaseInBack().setOnComplete(() => { });
+        transform.DOMoveZ(-20f, 0.7f).SetEase(Ease.InBack).OnComplete(() => { });
 
         if (effect.StickerEffect != null)
         {
@@ -378,7 +376,6 @@ public class Paper : MonoBehaviour
             Destroy(stickerEffect.gameObject);
         }
 
-        UIManager.setLevelCompleteDelegate?.Invoke();
         levelCompleteCallBack?.Invoke();
         yield break;
     }
@@ -388,12 +385,17 @@ public class Paper : MonoBehaviour
         bool animationComplete = false;
 
         Debug.Log("Wrong!");
-
-        LeanTween.moveLocalX(gameObject, transform.position.x + 0.1f, 0.1f).setEaseShake().setOnComplete(() =>
+        
+        transform.DOLocalMoveX(transform.position.x + 0.1f, 0.1f).SetEase(Ease.InBounce).OnComplete(() =>
         {
-            LeanTween.moveLocalX(gameObject, transform.position.x - 0.1f, 0.1f).setEaseShake()
-                .setOnComplete(() => { animationComplete = true; });
+            transform.DOLocalMoveX(transform.position.x - 0.1f, 0.1f).SetEase(Ease.InBounce)
+                .OnComplete(() => { animationComplete = true; });
         });
+        // LeanTween.moveLocalX(gameObject, transform.position.x + 0.1f, 0.1f).setEaseShake().setOnComplete(() =>
+        // {
+        //     LeanTween.moveLocalX(gameObject, transform.position.x - 0.1f, 0.1f).setEaseShake()
+        //         .setOnComplete(() => { animationComplete = true; });
+        // });
 
         yield return new WaitUntil(() => animationComplete);
         animationComplete = false;
@@ -404,7 +406,6 @@ public class Paper : MonoBehaviour
         UnfoldAllFoldings();
 
 
-        UIManager.wrongPaperFolded?.Invoke();
         wrongPaperFolded?.Invoke();
         yield break;
     }

+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -21,10 +21,10 @@ EditorUserSettings:
       value: 224247031146466b0c1e0930362c531459241b2f222d691e283e5d00e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241823eee12d76f7e93ffdfe
+      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
+      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241823eee12d76f7e93ffdfe
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7