From 4d2f8f97db47cf13a87f361f0377caa15eec556c Mon Sep 17 00:00:00 2001
From: wienholt <wienholt@uni-bremen.de>
Date: Mon, 3 Feb 2020 10:28:53 +0100
Subject: [PATCH] Changes from last week
---
Greta/Assets/DisableEntity.cs | 31 +++
Greta/Assets/DisableEntity.cs.meta | 11 +
Greta/Assets/PAC Engine/Scenes/EisWagon.unity | 104 +++++++-
.../Assets/PAC Engine/Scenes/Initiator.unity | 5 +-
.../PAC Engine/Scenes/Speisewagon.unity | 229 ++++++++++++------
.../PAC Engine/Scripts/DestroyOnStage.cs | 1 +
.../Assets/PAC Engine/Scripts/ItemActions.cs | 11 +-
7 files changed, 314 insertions(+), 78 deletions(-)
create mode 100644 Greta/Assets/DisableEntity.cs
create mode 100644 Greta/Assets/DisableEntity.cs.meta
diff --git a/Greta/Assets/DisableEntity.cs b/Greta/Assets/DisableEntity.cs
new file mode 100644
index 00000000..f64f77c1
--- /dev/null
+++ b/Greta/Assets/DisableEntity.cs
@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DisableEntity : MonoBehaviour
+{
+
+ public int EntityID;
+ public int stageID;
+ public GameObject toDisableEntity;
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ toDisable();
+ }
+ void toDisable()
+ {
+ if (Database.core.entities[SupportFunctions.core.findEntityIndexById(EntityID)].entityStageId == stageID)
+ {
+
+ toDisableEntity.GetComponent<Entity>().enabled = false;
+ //toDisableEntity.gameObject.tag = "Untagged";
+ }
+ }
+}
diff --git a/Greta/Assets/DisableEntity.cs.meta b/Greta/Assets/DisableEntity.cs.meta
new file mode 100644
index 00000000..58525eda
--- /dev/null
+++ b/Greta/Assets/DisableEntity.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 730152b2f750d644caf6e653cd87a5ca
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Greta/Assets/PAC Engine/Scenes/EisWagon.unity b/Greta/Assets/PAC Engine/Scenes/EisWagon.unity
index 64f8b61c..fcae15d6 100644
--- a/Greta/Assets/PAC Engine/Scenes/EisWagon.unity
+++ b/Greta/Assets/PAC Engine/Scenes/EisWagon.unity
@@ -1419,7 +1419,7 @@ MonoBehaviour:
nodeId: 2
displayText: 1
textTarget: {fileID: 2125052565}
- text: HAHAHAHA
+ text: HAHAHAHA!
textDuration: 0
waitForClick: 1
playerIsTalking: 0
@@ -1452,7 +1452,7 @@ MonoBehaviour:
nodeId: 3
displayText: 1
textTarget: {fileID: 2125052565}
- text: Nicht in 101 Jahren
+ text: Nicht in 101 Jahren.
textDuration: 0
waitForClick: 1
playerIsTalking: 0
@@ -2415,7 +2415,7 @@ MonoBehaviour:
nodeId: 2
displayText: 1
textTarget: {fileID: 1716720304}
- text: "\xC4hm ja...hier der Koffer"
+ text: "\xC4hm ja...hier der Koffer."
textDuration: 10
waitForClick: 1
playerIsTalking: 0
@@ -2820,6 +2820,7 @@ Transform:
- {fileID: 1264474534}
- {fileID: 1897279103}
- {fileID: 1642820718}
+ - {fileID: 936593477}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3326,6 +3327,103 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 920136033}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &936593476
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 936593477}
+ - component: {fileID: 936593479}
+ - component: {fileID: 936593478}
+ m_Layer: 8
+ m_Name: Koffer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &936593477
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 936593476}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 9.73, y: 1.87, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 637423395}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &936593478
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 936593476}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1c6955d7ea8cff049839e7775bf9ee2b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ entityID: 17
+ stageID: 7
+ ToDestroy: {fileID: 936593476}
+ ItemID: 0
+ shallReactivate: 0
+--- !u!212 &936593479
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 936593476}
+ 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: 3286f21bd7ead9f4682e93367ca9b9a9, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 2.82, y: 1.28}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &937484222
GameObject:
m_ObjectHideFlags: 0
diff --git a/Greta/Assets/PAC Engine/Scenes/Initiator.unity b/Greta/Assets/PAC Engine/Scenes/Initiator.unity
index 4cc09edd..78165db0 100644
--- a/Greta/Assets/PAC Engine/Scenes/Initiator.unity
+++ b/Greta/Assets/PAC Engine/Scenes/Initiator.unity
@@ -11588,7 +11588,7 @@ MonoBehaviour:
pickedUpInstanceIds:
- name: Leuchtstreifen
id: 333
- acquired: 1
+ acquired: 0
useFunction: KatzenAugenAction
quantity: 1
examineText:
@@ -11923,6 +11923,9 @@ MonoBehaviour:
- entityId: 701
entityStageId: 31
entityName: Kohleschauflerin
+ - entityId: 702
+ entityStageId: 32
+ entityName: Tiffany
quests:
- questName: Get the luggage to reach the Thermostat
questId: 11
diff --git a/Greta/Assets/PAC Engine/Scenes/Speisewagon.unity b/Greta/Assets/PAC Engine/Scenes/Speisewagon.unity
index d9bc8bd9..44faa606 100644
--- a/Greta/Assets/PAC Engine/Scenes/Speisewagon.unity
+++ b/Greta/Assets/PAC Engine/Scenes/Speisewagon.unity
@@ -2196,7 +2196,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &514385364
Transform:
m_ObjectHideFlags: 0
@@ -2389,19 +2389,19 @@ MonoBehaviour:
loadOriSpawnX: 0
loadOriSpawnY: 0
xPositionOfCam: 0
- - ElementName: Leer
+ - ElementName: Sprechen
nodeId: 1
- displayText: 0
- textTarget: {fileID: 0}
- text:
+ displayText: 1
+ textTarget: {fileID: 710236100}
+ text: "Ich glaube aber, dass sie mich nicht h\xF6ren kann..."
textDuration: 0
waitForClick: 1
- playerIsTalking: 0
+ playerIsTalking: 1
talkingEntityId: 0
invokeCustomEvents: 0
eventsToBeInvoked: []
- playAudioWithText: 0
- audio: {fileID: 0}
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
conditionsToCheck: []
goToNodeOnClick: 0
goToNodeId: 0
@@ -2459,7 +2459,7 @@ MonoBehaviour:
XMLExportPath:
XMLImportFileName:
XMLExportFileName:
- tab: 1
+ tab: 0
dialogueInitiated: 0
nodeIndex: 0
entityClicked: 0
@@ -2828,12 +2828,12 @@ MonoBehaviour:
playAudioWithText: 1
audio: {fileID: 8300000, guid: 41666ebaad6f8514baca095228f10ae3, type: 3}
conditionsToCheck: []
- goToNodeOnClick: 1
- goToNodeId: 4
+ goToNodeOnClick: 0
+ goToNodeId: 0
displayOptions: 0
optionsIds:
- setNewStageId: 1
- newStageId: 13
+ setNewStageId: 0
+ newStageId: 0
itemsToAdd: []
itemsToRemove: []
questsToGet:
@@ -3046,7 +3046,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 549266949}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 100702e729fa5294e9028c95e63e7910, type: 3}
m_Name:
@@ -5279,8 +5279,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1237079810}
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_LocalPosition: {x: -0.054, y: 0, z: 0}
+ m_LocalScale: {x: 1.003, y: 1, z: 1}
m_Children:
- {fileID: 1547636545}
m_Father: {fileID: 1895264270}
@@ -5968,9 +5968,10 @@ GameObject:
- component: {fileID: 1400444051}
- component: {fileID: 1400444050}
- component: {fileID: 1400444053}
+ - component: {fileID: 1400444054}
m_Layer: 8
m_Name: Regenschirm
- m_TagString: Item
+ m_TagString: Entity
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5996,7 +5997,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400444048}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0c47c8a394c62274ab6680867cca4418, type: 3}
m_Name:
@@ -6085,14 +6086,109 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1400444048}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb15279b71eeff04c97b1054114815b6, type: 3}
m_Name:
m_EditorClassIdentifier:
Item: {fileID: 1400444048}
entityID: 21
- stageID: 11
+ stageID: 12
+--- !u!114 &1400444054
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1400444048}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2b088c10f9e478c42a1ee8719e182f9d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ entityId: 702
+ canBeInteractedWith: 1
+ stages:
+ - stageId: 32
+ startingNodeId: 0
+ - stageId: 33
+ startingNodeId: 1
+ options: []
+ nodes:
+ - ElementName: vjsav
+ nodeId: 0
+ displayText: 1
+ textTarget: {fileID: 2109888214}
+ text: Ein Regenschirm....wahrscheinlich komme ich so an das Fenster heran!
+ textDuration: 0
+ waitForClick: 1
+ playerIsTalking: 1
+ talkingEntityId: 0
+ invokeCustomEvents: 0
+ eventsToBeInvoked: []
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
+ conditionsToCheck: []
+ goToNodeOnClick: 0
+ goToNodeId: 0
+ displayOptions: 0
+ optionsIds:
+ setNewStageId: 0
+ newStageId: 0
+ itemsToAdd: []
+ itemsToRemove: []
+ questsToGet:
+ questsToComplete:
+ endDialogueOnClick: 1
+ loadLevel: 0
+ loadLevelId: 0
+ loadSpawnX: 0
+ loadSpawnY: 0
+ WillOriSpawn: 0
+ loadOriSpawnX: 0
+ loadOriSpawnY: 0
+ xPositionOfCam: 0
+ - ElementName: vjsav
+ nodeId: 1
+ displayText: 0
+ textTarget: {fileID: 2109888214}
+ text:
+ textDuration: 0
+ waitForClick: 0
+ playerIsTalking: 0
+ talkingEntityId: 0
+ invokeCustomEvents: 0
+ eventsToBeInvoked: []
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
+ conditionsToCheck: []
+ goToNodeOnClick: 0
+ goToNodeId: 0
+ displayOptions: 0
+ optionsIds:
+ setNewStageId: 0
+ newStageId: 0
+ itemsToAdd: []
+ itemsToRemove: []
+ questsToGet:
+ questsToComplete:
+ endDialogueOnClick: 1
+ loadLevel: 0
+ loadLevelId: 0
+ loadSpawnX: 0
+ loadSpawnY: 0
+ WillOriSpawn: 0
+ loadOriSpawnX: 0
+ loadOriSpawnY: 0
+ xPositionOfCam: 0
+ XMLImportPath:
+ XMLExportPath:
+ XMLImportFileName:
+ XMLExportFileName:
+ tab: 2
+ dialogueInitiated: 0
+ nodeIndex: 0
+ entityClicked: 0
--- !u!1001 &1436071324
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6974,8 +7070,8 @@ GameObject:
- component: {fileID: 1779623580}
- component: {fileID: 1779623583}
- component: {fileID: 1779623582}
- - component: {fileID: 1779623581}
- component: {fileID: 1779623584}
+ - component: {fileID: 1779623581}
m_Layer: 8
m_Name: Rauch
m_TagString: Entity
@@ -7018,24 +7114,24 @@ MonoBehaviour:
- stageId: 8
startingNodeId: 0
- stageId: 9
- startingNodeId: 0
- - stageId: 0
- startingNodeId: 0
+ startingNodeId: 1
+ - stageId: 10
+ startingNodeId: 2
options: []
nodes:
- - ElementName: Betrachtung von Greta
+ - ElementName: Betrachtung
nodeId: 0
displayText: 1
textTarget: {fileID: 69609159}
- text: Hier komme ich nicht durch, der Rauch schadte mir!
+ text: Hier komme ich nicht durch...der Rauch ist nicht gesund.
textDuration: 0
waitForClick: 1
playerIsTalking: 1
talkingEntityId: 0
invokeCustomEvents: 0
eventsToBeInvoked: []
- playAudioWithText: 0
- audio: {fileID: 0}
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
conditionsToCheck: []
goToNodeOnClick: 1
goToNodeId: 1
@@ -7047,7 +7143,7 @@ MonoBehaviour:
itemsToRemove: []
questsToGet:
questsToComplete:
- endDialogueOnClick: 0
+ endDialogueOnClick: 1
loadLevel: 0
loadLevelId: 0
loadSpawnX: 0
@@ -7067,28 +7163,15 @@ MonoBehaviour:
talkingEntityId: 0
invokeCustomEvents: 0
eventsToBeInvoked: []
- playAudioWithText: 0
- audio: {fileID: 0}
- conditionsToCheck:
- - checkQuestExists: 0
- questExistsId: 0
- redirectNodeIfExistsFails: 0
- checkQuestCompleted: 0
- questCompletedId: 0
- redirectNodeIfCompletedFails: 0
- checkItemAcquired: 1
- acquiredItemId: 219
- redirectNodeIfAcquiredFails: 2
- checkItemQuantity: 0
- quantityItemId: 0
- requiredQuantity: 0
- redirectNodeIfQuantityFails: 0
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
+ conditionsToCheck: []
goToNodeOnClick: 0
goToNodeId: 0
displayOptions: 0
optionsIds:
- setNewStageId: 1
- newStageId: 10
+ setNewStageId: 0
+ newStageId: 0
itemsToAdd: []
itemsToRemove: []
questsToGet:
@@ -7102,19 +7185,19 @@ MonoBehaviour:
loadOriSpawnX: 0
loadOriSpawnY: 0
xPositionOfCam: 0
- - ElementName: Endlich
+ - ElementName: Ende
nodeId: 2
displayText: 1
textTarget: {fileID: 69609159}
- text: Endlich kann ich hier wieder atmen!
+ text: Endlich kann ich wieder atmen.
textDuration: 0
waitForClick: 1
playerIsTalking: 1
talkingEntityId: 0
invokeCustomEvents: 0
eventsToBeInvoked: []
- playAudioWithText: 0
- audio: {fileID: 0}
+ playAudioWithText: 1
+ audio: {fileID: 8300000, guid: eaa6f845f1c828d4c9e50a527cf056d4, type: 3}
conditionsToCheck: []
goToNodeOnClick: 0
goToNodeId: 0
@@ -7139,7 +7222,7 @@ MonoBehaviour:
XMLExportPath:
XMLImportFileName:
XMLExportFileName:
- tab: 0
+ tab: 2
dialogueInitiated: 0
nodeIndex: 0
entityClicked: 0
@@ -7349,7 +7432,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1817360745}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b088c10f9e478c42a1ee8719e182f9d, type: 3}
m_Name:
@@ -8630,7 +8713,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2123074963}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b088c10f9e478c42a1ee8719e182f9d, type: 3}
m_Name:
@@ -8945,11 +9028,13 @@ MonoBehaviour:
- stageId: 9
startingNodeId: 0
- stageId: 10
- startingNodeId: 2
+ startingNodeId: 1
- stageId: 11
startingNodeId: 4
- stageId: 12
- startingNodeId: 5
+ startingNodeId: 4
+ - stageId: 13
+ startingNodeId: 2
options: []
nodes:
- ElementName: Betrachtung
@@ -9005,7 +9090,7 @@ MonoBehaviour:
displayOptions: 0
optionsIds:
setNewStageId: 1
- newStageId: 10
+ newStageId: 13
itemsToAdd: []
itemsToRemove: []
questsToGet:
@@ -9033,8 +9118,8 @@ MonoBehaviour:
playAudioWithText: 0
audio: {fileID: 0}
conditionsToCheck: []
- goToNodeOnClick: 1
- goToNodeId: 3
+ goToNodeOnClick: 0
+ goToNodeId: 0
displayOptions: 0
optionsIds:
setNewStageId: 0
@@ -9043,7 +9128,7 @@ MonoBehaviour:
itemsToRemove: []
questsToGet: 15000000
questsToComplete:
- endDialogueOnClick: 0
+ endDialogueOnClick: 1
loadLevel: 0
loadLevelId: 0
loadSpawnX: 0
@@ -9087,24 +9172,24 @@ MonoBehaviour:
xPositionOfCam: 0
- ElementName: Loop
nodeId: 4
- displayText: 0
- textTarget: {fileID: 0}
- text: 0
+ displayText: 1
+ textTarget: {fileID: 2109888214}
+ text: Hatschi, ich brauche jetzt erstmal ein Taschentuch.
textDuration: 0
waitForClick: 1
playerIsTalking: 0
- talkingEntityId: 0
+ talkingEntityId: 21
invokeCustomEvents: 0
eventsToBeInvoked: []
playAudioWithText: 0
audio: {fileID: 0}
conditionsToCheck: []
- goToNodeOnClick: 0
- goToNodeId: 0
+ goToNodeOnClick: 1
+ goToNodeId: 5
displayOptions: 0
optionsIds:
- setNewStageId: 0
- newStageId: 0
+ setNewStageId: 1
+ newStageId: 12
itemsToAdd: []
itemsToRemove: []
questsToGet:
@@ -9155,7 +9240,7 @@ MonoBehaviour:
XMLExportPath:
XMLImportFileName:
XMLExportFileName:
- tab: 1
+ tab: 0
dialogueInitiated: 0
nodeIndex: 0
entityClicked: 0
@@ -9286,10 +9371,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2128340667}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 100702e729fa5294e9028c95e63e7910, type: 3}
+ m_Script: {fileID: 11500000, guid: 730152b2f750d644caf6e653cd87a5ca, type: 3}
m_Name:
m_EditorClassIdentifier:
- core: {fileID: 0}
+ EntityID: 21
+ stageID: 13
+ toDisableEntity: {fileID: 2128340667}
--- !u!1 &2140995933
GameObject:
m_ObjectHideFlags: 0
diff --git a/Greta/Assets/PAC Engine/Scripts/DestroyOnStage.cs b/Greta/Assets/PAC Engine/Scripts/DestroyOnStage.cs
index 79562aee..f8de70f5 100644
--- a/Greta/Assets/PAC Engine/Scripts/DestroyOnStage.cs
+++ b/Greta/Assets/PAC Engine/Scripts/DestroyOnStage.cs
@@ -31,6 +31,7 @@ public class DestroyOnStage : MonoBehaviour
void Update()
{
destroy();
+ Debug.Log(Database.core.entities[SupportFunctions.core.findEntityIndexById(26)].entityStageId);
}
void destroy()
diff --git a/Greta/Assets/PAC Engine/Scripts/ItemActions.cs b/Greta/Assets/PAC Engine/Scripts/ItemActions.cs
index 93b84de6..ee37daf0 100644
--- a/Greta/Assets/PAC Engine/Scripts/ItemActions.cs
+++ b/Greta/Assets/PAC Engine/Scripts/ItemActions.cs
@@ -29,7 +29,7 @@ public class ItemActions : MonoBehaviour {
void Update()
{
-
+
if (Input.GetMouseButtonDown(0) && currentUsingItem != -1)
{
@@ -48,7 +48,7 @@ public class ItemActions : MonoBehaviour {
ReferenceHolder.core.ClickCatcher.SetActive(false);
if (h.transform.gameObject.name.Equals(interactiveObjectName))
{
-
+ ReferenceHolder.core.ClickCatcher.SetActive(false);
TriggerItemAction(currentUsingItem);
}
else
@@ -265,14 +265,19 @@ public class ItemActions : MonoBehaviour {
break;
case 7:
- //Debug.Log("Oma angeklickt");
+ var toDisable = GameObject.Find(interactiveObjectName);
+ toDisable.GetComponent<Entity>().canBeInteractedWith = false;
GameObject Item = GameObject.Find("Regenschirm");
var test = GameObject.Find("Test");
+ Item.gameObject.tag = "Item";
+ Item.GetComponent<Entity>().enabled = false;
+ Item.GetComponent<Item>().enabled = true;
Item.GetComponent<Item>().canBePickedUp = true;
print(Item.GetComponent<Item>().canBePickedUp);
Database.core.entities[SupportFunctions.core.findEntityIndexById(21)].entityStageId = 12;
Database.core.items[SupportFunctions.core.findItemIndexById(21)].acquired = false;
Database.core.items[SupportFunctions.core.findItemIndexById(21)].quantity = 0;
+ ReferenceHolder.core.ClickCatcher.SetActive(true);
--
GitLab