This commit is contained in:
2023-02-20 15:21:58 +01:00
parent cf570640ac
commit 4ec15e928f
5 changed files with 405 additions and 129 deletions

View File

@@ -2666,6 +2666,7 @@ GameObject:
- component: {fileID: 173881570}
- component: {fileID: 173881572}
- component: {fileID: 173881571}
- component: {fileID: 173881573}
m_Layer: 5
m_Name: Aktivalva
m_TagString: Untagged
@@ -2790,6 +2791,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 173881569}
m_CullTransparentMesh: 1
--- !u!114 &173881573
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 173881569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 173881571}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: HackerCsatlakozo
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &175368060
GameObject:
m_ObjectHideFlags: 0
@@ -4374,6 +4431,13 @@ MonoBehaviour:
droidFelhasznalva: {fileID: 621696353}
matavFelhasznalva: {fileID: 515944943}
alomhozoFelhasznalva: {fileID: 636893741}
elerheto_targyak:
- Adrenalinloket
- Hacker csatlakozo
- Lathatatlan oltozet
- Droid agyu
- Matav taviranyito
- Alomhozo fustgranat
--- !u!114 &197904237
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10292,6 +10356,7 @@ GameObject:
- component: {fileID: 515944942}
- component: {fileID: 515944944}
- component: {fileID: 515944943}
- component: {fileID: 515944945}
m_Layer: 5
m_Name: Aktivalva
m_TagString: Untagged
@@ -10416,6 +10481,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 515944941}
m_CullTransparentMesh: 1
--- !u!114 &515944945
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 515944941}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 173881571}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: MatavTaviranyito
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &519159253
GameObject:
m_ObjectHideFlags: 0
@@ -11744,6 +11865,7 @@ GameObject:
- component: {fileID: 583628964}
- component: {fileID: 583628966}
- component: {fileID: 583628965}
- component: {fileID: 583628967}
m_Layer: 5
m_Name: Aktivalva
m_TagString: Untagged
@@ -11868,6 +11990,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 583628963}
m_CullTransparentMesh: 1
--- !u!114 &583628967
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 583628963}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 173881571}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: LathatatlanOltozek
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &587721240
GameObject:
m_ObjectHideFlags: 0
@@ -12188,6 +12366,7 @@ GameObject:
- component: {fileID: 621696352}
- component: {fileID: 621696354}
- component: {fileID: 621696353}
- component: {fileID: 621696355}
m_Layer: 5
m_Name: Aktivalva
m_TagString: Untagged
@@ -12312,6 +12491,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621696351}
m_CullTransparentMesh: 1
--- !u!114 &621696355
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621696351}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 173881571}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: DroidGepagyu
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &628297613
GameObject:
m_ObjectHideFlags: 0
@@ -12445,6 +12680,7 @@ GameObject:
- component: {fileID: 636893740}
- component: {fileID: 636893742}
- component: {fileID: 636893741}
- component: {fileID: 636893743}
m_Layer: 5
m_Name: Aktivalva
m_TagString: Untagged
@@ -12569,6 +12805,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636893739}
m_CullTransparentMesh: 1
--- !u!114 &636893743
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636893739}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 173881571}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 197904236}
m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
m_MethodName: FustGranat
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &638974180
GameObject:
m_ObjectHideFlags: 0

View File

@@ -179,10 +179,12 @@ public class Targyak : MonoBehaviour
//+1 elet
elet.Eletplusz();
//+1 akcio
akciopont.akciopont++;
akciopont.UpdateAkciopont(2);
hackercsatlakozo = 0; //targy elvesztese
Debug.Log("hacker felhasznalva");
//felhasznalva ui
hackerFelhasznalva.text = "X";
}
@@ -192,6 +194,8 @@ public class Targyak : MonoBehaviour
lathatatlanOltozetAktivalva = true;
lathatatlanoltozet = 0; //targy elvesztese
Debug.Log("lathatatlan felhasznalva");
//felhasznalva ui
lathatatlanFelhasznalva.text = "X";
}
@@ -201,6 +205,8 @@ public class Targyak : MonoBehaviour
ugynok.canKill = true; //barhol meg tud olni ha kattint
droidgepagyu = 0; //targy elvesztese
Debug.Log("droid felhasznalva");
//felhasznalva ui
droidFelhasznalva.text = "X";
}
@@ -209,6 +215,8 @@ public class Targyak : MonoBehaviour
matavtaviranyitoAktivalva = true;
matavtaviranyito = 0; //targy elvesztese
Debug.Log("matav felhasznalva");
//felhasznalva ui
matavFelhasznalva.text = "X";
}
@@ -216,6 +224,9 @@ public class Targyak : MonoBehaviour
public void FustGranat() {
energia.granatAktivalva = true;
fustgranat = 0; //targy elvesztese
Debug.Log("granat felhasznalva");
//felhasznalva ui
alomhozoFelhasznalva.text = "X";
}

View File

@@ -15,7 +15,7 @@ public class helyszinaktivalas : MonoBehaviour
private Ugynok ugynok;
private Energia energia;
void Awake()
private void Awake()
{
akciopont = FindObjectOfType<Akciopont>();
movement = FindObjectOfType<movement>();

File diff suppressed because one or more lines are too long