Beyond fixy, warps, dogi, scroll

Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Rock6/Rock9 1.mat

@@ -111,11 +111,11 @@ Material:
     - FresnelPower: 2.8
     - Metalness: 0
     - NormalStrength: 0.86
-    - Smoothness: 0.34
+    - Smoothness: 0
     - USEDISSOLVE: 0
     - USEDISSOLVEMASK: 0
     - USEFRESNEL: 1
-    - Vector1_473704f964214ae2bc68475022d1524b: 0.01
+    - Vector1_473704f964214ae2bc68475022d1524b: 0
     - _AlphaClip: 1
     - _AlphaToMask: 0
     - _BendEffect: 0
@@ -154,7 +154,7 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 5
     - _Surface: 1
-    - _Threshold: 0.226
+    - _Threshold: 0.091
     - _USEDISTANCEFADE: 0
     - _USESCANWAVE: 0
     - _WaveTrail: 4

Assets/Meshes/scroll/scrollMat2D.mat

@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Texture2D_37fb532d63a84494b37265ae923f74c5:
-        m_Texture: {fileID: 2800000, guid: 8c38d2e72ca280f4783343ec9c4418f7, type: 3}
+        m_Texture: {fileID: 2800000, guid: 76c2dc2f9774cfe4e8cdd6e4532fda87, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Texture2D_9b21227ff652458c9f58ca601fa250b0:
@@ -138,7 +138,7 @@ Material:
     - _MaxBrightness: 1
     - _Metallic: 0
     - _MinBrightness: 0
-    - _NoiseScale: 0.71705186
+    - _NoiseScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.005
     - _QueueControl: 0
@@ -157,7 +157,7 @@ Material:
     - _StencilWriteMask: 255
     - _Strength: 0.2
     - _Surface: 0
-    - _Threshold: 1
+    - _Threshold: 0
     - _UIMaskSoftnessX: 1
     - _UIMaskSoftnessY: 1
     - _UseUIAlphaClip: 0

Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset

@@ -16,5 +16,5 @@ MonoBehaviour:
   playmakerVersion: 
   showWelcomeScreen: 0
   showUpgradeGuide: 0
-  lastAutoUpdateSignature: 6000.0.39f1__/Users/marcin/projects/beyondGit/Assets__0.0.0.0
+  lastAutoUpdateSignature: 6000.0.39f1__G:/PROJEKTY/BEYOND/BeyonGit/Assets__0.0.0.0
   useLegacyNetworking: 0

Assets/Scenes/Land_01/Land_Of_Death_Demo/ReflectionProbe-28.exr.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 47bddba45ed03e84fbdcb5de060b5b73
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Tutorial/InteractionStep.cs

@@ -11,6 +11,7 @@ namespace Beyond
         public List<GameObject> objectsToInteractwith = new();
         [SerializeField]
         private bool interactedWithFruit = false, interactedWithFlower = false;
+        private bool disableInteractableOnEnd = false;
         public List<bEquipSlot> hpSlots, faithSlots, gemstoneSlots;
         public bEquipArea consumablesArea;
 
@@ -21,16 +22,19 @@ namespace Beyond
             if (objectsToInteractwith != null && objectsToInteractwith.Count > 0)
             {
                 baseStepController.OnEvaluationStart += () => objectsToInteractwith.ForEach(obj => obj.SetActive(true));
-                baseStepController.OnCompleted += () =>
+                if (disableInteractableOnEnd)
                 {
-                    objectsToInteractwith.ForEach(obj =>
+                    baseStepController.OnCompleted += () =>
                     {
-                        if (obj != null)
+                        objectsToInteractwith.ForEach(obj =>
                         {
-                            obj.SetActive(false);
-                        }
-                    });
-                };
+                            if (obj != null)
+                            {
+                                obj.SetActive(false);
+                            }
+                        });
+                    };
+                }
                 // baseStepController.EvaluateInputs += () => !interacted.Exists(inter => inter == false);
                 baseStepController.ConditionsAreMet = () => interactedWithFlower && interactedWithFruit;
             }