Commit f4638740 authored by mthiele2's avatar mthiele2
Browse files
parents 9d578c53 719792bc
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: af7181f404f1447c0a7a17b3070b952b, type: 3}
m_Name: SpikeProfile
m_EditorClassIdentifier:
m_Angles:
- m_Start: -180
m_End: 180
m_Order: 0
m_Sprites:
- {fileID: 21300000, guid: cac77647e27ca2f4d9ec17a51b564f22, type: 3}
m_FillTexture: {fileID: 0}
m_CornerSprites:
- m_CornerType: 0
m_Sprites:
- {fileID: 0}
- m_CornerType: 1
m_Sprites:
- {fileID: 0}
- m_CornerType: 2
m_Sprites:
- {fileID: 0}
- m_CornerType: 3
m_Sprites:
- {fileID: 0}
- m_CornerType: 4
m_Sprites:
- {fileID: 0}
- m_CornerType: 5
m_Sprites:
- {fileID: 0}
- m_CornerType: 6
m_Sprites:
- {fileID: 0}
- m_CornerType: 7
m_Sprites:
- {fileID: 0}
m_FillPixelPerUnit: 100
m_BevelSize: 0
m_BevelCutoff: 0
m_FillOffset: 0
m_WorldSpaceUV: 0
m_UseSpriteBorders: 1
fileFormatVersion: 2
guid: 14265a602850daa45a7be22c9ae20f0b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cac77647e27ca2f4d9ec17a51b564f22
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: cb6cddeca37a7ac4c80f9aff0f46991e
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -226,7 +226,7 @@ MonoBehaviour:
attackRange: 2
attackTime: 0.8
speed: 20
damage: 1
damage: 0
thrust: 30
origin: {fileID: 4001262588988459912}
--- !u!114 &1329814112
......
This diff is collapsed.
......@@ -39,9 +39,7 @@ public class Life : MonoBehaviour {
if (gameObject.CompareTag("Player"))
{
SceneManager.LoadScene("MainLevel");
//gameObject.SetActive(false);
Heal(3);
Debug.Log("Death");
return;
}
......
......@@ -158,7 +158,6 @@ public class MovementController : MonoBehaviour
m_Grounded = false;
m_TempJumpCount--;
if (r_State.GetCurrentElement() == InfusedElement.Air) r_State.ChangeCharges(-1);
print("AirJump: Charges left = " + m_TempJumpCount);
m_Rigidbody2D.velocity = Vector2.up * m_JumpForce;
OnJumpEvent.Invoke();
StartCoroutine(Wait(m_SecondsWaitToJump));
......
......@@ -74,7 +74,6 @@ public class PlayerAnimation : MonoBehaviour
switch (r_State.GetCurrentElement())
{
case InfusedElement.None:
print("RESET");
if(m_ScalingActive)ScaleReset();
if (m_RotationActive)
......@@ -85,7 +84,6 @@ public class PlayerAnimation : MonoBehaviour
break;
case InfusedElement.Air:
print("AIR");
m_CurrentAirCharges = r_State.GetCharges();
if (m_ScalingActive)
{
......
......@@ -143,7 +143,6 @@ namespace _Game.Scripts.Player
{
if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return;
print("Entered Collider of " + other.name);
_currentObject = other.gameObject;
_targetScript = _currentObject.GetComponent<InteractionObject>();
}
......@@ -153,7 +152,6 @@ namespace _Game.Scripts.Player
if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return;
if (other.gameObject != _currentObject) return;
print("Exited Collider of " + other.name);
_currentObject = null;
_targetScript = null;
}
......
......@@ -13,7 +13,7 @@ public class SavePoint : MonoBehaviour
public Button button;
private Animator anim;
private void Start()
private void Awake()
{
isUsed = false;
button.interactable = false;
......
......@@ -30,7 +30,6 @@ public class SaveSystem
FileStream stream = new FileStream(path, FileMode.Open);
SavePointData data = formatter.Deserialize(stream) as SavePointData;
Debug.Log(data.savePointIsActiv);
if (data.savePointIsActiv != null)
{
SavePointList.spl.SetIsActivList(data.savePointIsActiv);
......
......@@ -36,6 +36,8 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
......@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
m_Enabled: 0
m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment