wuyu 1 anno fa
parent
commit
3056fedcdf

+ 3 - 2
Assembly-CSharp.csproj

@@ -147,7 +147,7 @@
      <Compile Include="Assets/_Packages/PaperFoldAsset/FatMachines/TapticFeedback/AndroidTaptic.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUtilities/Scripts/Character Controllers/SwipeInput.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Framework/LeanSmooth.cs" />
-     <Compile Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/PossibleCombinationBuilder.cs" />
+     <Compile Include="Assets/PaperFold/Scripts/PossibleCombinationBuilder.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/GeneralBasics2d.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/DecalToTexture/Scripts/DecalObject.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/PathSplineTrack.cs" />
@@ -161,7 +161,7 @@
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/PathSplinePerformance.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Scripts/Scriptable Objects/ColorPalette.cs" />
      <Compile Include="Assets/_Scripts/UI/UIThemesManager.cs" />
-     <Compile Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/RegexCombinationAnalyzer.cs" />
+     <Compile Include="Assets/PaperFold/Scripts/RegexCombinationAnalyzer.cs" />
      <Compile Include="Assets/Epic Toon FX/Demo/Scripts/ETFXProjectileScript.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Scripts/Core/UIManager.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Scripts/Core/AnimatedElement.cs" />
@@ -465,6 +465,7 @@
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Models/Materials" />
      <Folder Include="Assets/_Packages/GUI Mobile Hyper-Casual/Sprites/Items PSD + PNG/Bomb" />
      <Folder Include="Assets/_Scenes" />
+     <Folder Include="Assets/PaperFold/Scripts/RegexCombinationBuilder" />
      <Folder Include="Assets/Epic Toon FX/Demo/Textures/Skybox" />
      <None Include="Assets/_Packages/PaperFoldAsset/FatMachines/TapticFeedback/Plugins/Android/AndroidManifest.xml" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Settings" />

+ 2 - 8
Assets/PaperFold/Scripts/Paper.cs

@@ -3,10 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using JTFold;
-using JTFold.RegexCombinationBuilder;
+using JTFold;
 using UnityEngine;
 using JTSystems;
-using Eiko.YaSDK;
 using Testing;
 
 public class Paper : MonoBehaviour
@@ -372,10 +371,7 @@ public class Paper : MonoBehaviour
 
         _canFold = false;
 
-        if (YandexSDK.instance != null)
-        {
-            YandexSDK.instance.ShowInterstitial();
-        }
+     
 
         LeanTween.moveZ(gameObject, -20f, 0.7f).setEaseInBack().setOnComplete(() => { });
 
@@ -417,8 +413,6 @@ public class Paper : MonoBehaviour
 
         UnfoldAllFoldings();
 
-        if (YandexSDK.instance != null)
-            YandexSDK.instance.ShowInterstitial();
 
         UIManager.wrongPaperFolded?.Invoke();
         wrongPaperFolded?.Invoke();

Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/PossibleCombinationBuilder.cs → Assets/PaperFold/Scripts/PossibleCombinationBuilder.cs


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


+ 1 - 1
Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/RegexCombinationAnalyzer.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
-namespace JTFold.RegexCombinationBuilder
+namespace JTFold
 {
     [RequireComponent(typeof(Paper))]
     public class RegexCombinationAnalyzer : MonoBehaviour

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


+ 1 - 1
Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/RegexCombinationBuilder/FoldingMarker.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace JTFold.RegexCombinationBuilder
+namespace JTFold
 {
     public class FoldingMarker : MonoBehaviour
     {