Commit fcbbfeeb authored by Marcel's avatar Marcel
Browse files

Commit to pull the fix

changed name atribute in potions
parent 68329a88
fileFormatVersion: 2
guid: 435e0ab87d10d1d46966abe3e1b854db
guid: 78380e81b80d4ba4b8fe2bf39ba75f86
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6261656428157832302
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7610592099797014572}
- component: {fileID: 6245540174503209973}
- component: {fileID: 5781967143616988328}
- component: {fileID: 1168152351263728623}
- component: {fileID: 7637985616803130080}
m_Layer: 12
m_Name: BurnableObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7610592099797014572
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6261656428157832302}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6245540174503209973
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6261656428157832302}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: eba20f56bbf44134c8f2b6ad8d7b2511, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &5781967143616988328
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6261656428157832302}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!50 &1168152351263728623
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6261656428157832302}
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!114 &7637985616803130080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6261656428157832302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 554f5796680843b4db36a7aacfb506fa, type: 3}
m_Name:
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: 1e24085edff8e4e499582d8dcf099510
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 101256476d0a2c744b3d0d5153be3b71
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -5,7 +5,7 @@ using UnityEngine;
public class FirePotion : MonoBehaviour
{
private GameManager gameManager;
private string name;
private string abilityName;
private void Awake()
{
}
......@@ -15,7 +15,7 @@ public class FirePotion : MonoBehaviour
{
gameManager = FindObjectOfType<GameManager>();
name = "Fire";
abilityName = "Fire";
......@@ -24,7 +24,7 @@ public class FirePotion : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other)
{
gameManager.UnlockAbility(name);
gameManager.UnlockAbility(abilityName);
Destroy(gameObject);
}
......
......@@ -5,7 +5,7 @@ using UnityEngine;
public class JumpPotion : MonoBehaviour
{
private GameManager gameManager;
private string name;
private string abilityName;
private void Awake()
{
}
......@@ -15,7 +15,7 @@ public class JumpPotion : MonoBehaviour
{
gameManager = FindObjectOfType<GameManager>();
name = "SuperJump";
abilityName = "SuperJump";
......@@ -25,7 +25,7 @@ public class JumpPotion : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other)
{
gameManager.UnlockAbility(name);
gameManager.UnlockAbility(abilityName);
Destroy(gameObject);
}
......
......@@ -5,7 +5,7 @@ using UnityEngine;
public class PowerPotion : MonoBehaviour
{
private GameManager gameManager;
private string name;
private string abilityName;
private void Awake()
{
......@@ -16,7 +16,7 @@ public class PowerPotion : MonoBehaviour
{
gameManager = FindObjectOfType<GameManager>();
name = "Power";
abilityName = "Power";
......@@ -25,7 +25,7 @@ public class PowerPotion : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other)
{
gameManager.UnlockAbility(name);
gameManager.UnlockAbility(abilityName);
Destroy(gameObject);
}
......
......@@ -53,4 +53,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
m_LayerCollisionMatrix: fff7ffffc9f0ffffc9f0ffffffffffffc9f0ffffc9f0ffffffffffffffffffffc9f0ffffc9fcffffc9f6ffffc8f2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: ffc7ffffc9c0ffffc9c0ffffffffffffc9c0ffffc9c0ffffffffffffffffffffc9c0ffffc9ccffffc9c6ffffc8c2ffffc8c0ffffc8c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
......@@ -20,8 +20,8 @@ TagManager:
- Player
- InteractibaleObject
- Elevator
-
-
- BurnableObject
- ExplosableObject
-
-
-
......
Supports Markdown
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