Skip to content

GitLab

Commit 78a2e214 authored by mthiele2's avatar mthiele2
Browse files

Main-Level mini-update

parent de5c2231
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 21 deletions
Assets/_Game/Scenes/MainLevel.unity
View file @ 78a2e214
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.12731716, g: 0.13414739, b: 0.12107863, a: 1}
m_IndirectSpecularColor: {r: 0.1273174, g: 0.13414761, b: 0.12107885, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -2098,7 +2098,7 @@ Transform:
m_LocalScale: {x: 4.749867, y: 10.27617, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &117491776
GameObject:
......@@ -5262,7 +5262,7 @@ Transform:
- {fileID: 1741470320}
- {fileID: 1605852278}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &268156081
PrefabInstance:
......@@ -5734,7 +5734,7 @@ Transform:
- {fileID: 1545151162}
- {fileID: 963130624}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &320155738
GameObject:
......@@ -13324,7 +13324,7 @@ Transform:
- {fileID: 1012588892}
- {fileID: 1826291048}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &653535437 stripped
Transform:
......@@ -15194,12 +15194,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 731052799}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.09999943, y: -0.29999924, z: -10}
m_LocalPosition: {x: -22.399998, y: 84.399994, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 56322121}
m_Father: {fileID: 1949298891}
m_RootOrder: 2
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &731052803
MonoBehaviour:
......@@ -15213,7 +15213,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 53e622d25d5bf8b45be54c49c309108d, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 0}
target: {fileID: 1949298891}
smoothSpeed: 0.5
lookAt: 0
maxDistance: 5
......@@ -15404,7 +15404,7 @@ Transform:
- {fileID: 981825758}
- {fileID: 1494754517}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &785533006 stripped
Transform:
......@@ -15684,7 +15684,7 @@ PrefabInstance:
- target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
type: 3}
......@@ -17729,7 +17729,7 @@ Transform:
- {fileID: 2004137732}
- {fileID: 1548538385}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1005116690
PrefabInstance:
......@@ -24307,7 +24307,7 @@ PrefabInstance:
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_RootOrder
value: 13
value: 14
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937784, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
......@@ -24374,6 +24374,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362585431789937767, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: HUD
value:
objectReference: {fileID: 1777049078}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3}
--- !u!1001 &1428592906
......@@ -28916,7 +28921,7 @@ Transform:
- {fileID: 1927403173}
- {fileID: 1395044505}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1605852278 stripped
Transform:
......@@ -32435,7 +32440,7 @@ PrefabInstance:
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
......@@ -32569,7 +32574,7 @@ PrefabInstance:
type: 2}
- target: {fileID: 2139239323, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5703659376326297473, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
......@@ -32600,6 +32605,30 @@ PrefabInstance:
propertyPath: m_SizePerCharge
value: 0.11
objectReference: {fileID: 0}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1777049077}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: HealthUpdate
objectReference: {fileID: 0}
- target: {fileID: 1141687779, guid: 2e3528907311e438dab0d393127aa332, type: 3}
propertyPath: LostLife.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
--- !u!4 &1741470320 stripped
......@@ -32859,7 +32888,7 @@ PrefabInstance:
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
......@@ -32936,6 +32965,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: LoadSafePoint
objectReference: {fileID: 0}
- target: {fileID: 2072365874446529824, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: target
value:
objectReference: {fileID: 1949298891}
- target: {fileID: 5970381992757526481, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
......@@ -32948,6 +32982,24 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
--- !u!114 &1777049077 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1878028688071232123, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
m_PrefabInstance: {fileID: 1777049076}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 533ddb9e0598722409208acad56bd8f4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1777049078 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7766137271154010154, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
m_PrefabInstance: {fileID: 1777049076}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1792212634
GameObject:
m_ObjectHideFlags: 0
......@@ -33548,7 +33600,7 @@ Transform:
- {fileID: 1744795729}
- {fileID: 1005240270}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1826291047
GameObject:
......@@ -36286,7 +36338,7 @@ PrefabInstance:
- target: {fileID: 3962879857309384162, guid: 5ab2931e604d74039ab392b8189d5cbc,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3962879857309384162, guid: 5ab2931e604d74039ab392b8189d5cbc,
type: 3}
......@@ -40920,7 +40972,7 @@ Transform:
m_Children:
- {fileID: 1475881766}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2146625978 stripped
MonoBehaviour:
Assets/_Game/Scripts/SaveAndLoad/SavePoint.cs
View file @ 78a2e214
......@@ -10,10 +10,11 @@ public class SavePoint : MonoBehaviour
private bool isUsed;
private Transform options;
public Button button;
public Animator anim;
private Animator anim;
private void Start()
{
anim = GetComponent<Animator>();
//options = gameObject.transform.Find("Options");
}
......@@ -48,6 +49,14 @@ public class SavePoint : MonoBehaviour
public void SetIsUsed(bool var)
{
if (var)
{
anim.SetBool("IsActive", true);
}
else
{
anim.SetBool("IsActive", false);
}
button.interactable = var;
isUsed = var;
}
......
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