Version vom Donnerstag um 18 Uhr

Greta/Assets/ActivateAnimals.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActivateAnimals : MonoBehaviour
+{
+
+    public int entityID;
+    public int stageID;
+  
+     // Start is called before the first frame update
+     void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Database.core.entities[SupportFunctions.core.findEntityIndexById(entityID)].entityStageId == stageID )
+        {
+            this.GetComponentInChildren<Entity>().canBeInteractedWith = true;
+        }
+        checkIfAnimal();
+    }
+
+    void checkIfAnimal()
+    {
+        if(AnimalsInInventory.core.Animals.Count == 1)
+        {
+            Database.core.entities[SupportFunctions.core.findEntityIndexById(entityID)].entityStageId = 17;
+        }
+    }
+}

Greta/Assets/PAC Engine/Graphics/AssetsGraphics.meta → Greta/Assets/ActivateAnimals.cs.meta

 fileFormatVersion: 2
-guid: bb51a6fd032c8e24e9d7f61a1538897d
-folderAsset: yes
-DefaultImporter:
+guid: 93b205402827aa64eaa19f792ce1c74b
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Greta/Assets/AtivateGame.cs

@@ -27,7 +27,7 @@ public class AtivateGame : MonoBehaviour
             RaycastHit2D h = Physics2D.Raycast(point, Vector2.zero, Mathf.Infinity, ~(1 << LayerMask.NameToLayer("MovementCatcher")));
             var player = GameObject.Find("Player");
             var follower = GameObject.Find("Follower2");
-            var follower1 = GameObject.Find("Follower1");
+            var follower1 = GameObject.Find("Follower_1");
             var menu = GameObject.Find("InventoryButton");
             var cursor = GameObject.Find("GameManager");
             if (Database.core.entities[SupportFunctions.core.findEntityIndexById(entityID)].entityStageId == stageID)

Greta/Assets/BackToGame.cs

@@ -29,20 +29,22 @@ public class BackToGame : MonoBehaviour
             var follower1 = GameObject.Find("Follower1");
             var menu = GameObject.Find("InventoryButton");
             var cursor = GameObject.Find("GameManager");
+          
 
             if (GoBack)
             {
                 if (h.collider.transform.name.Equals(gameName))
                 {
 
-                  
+
+                    player.gameObject.transform.position = new Vector3(-15.7f, -4.1f, 0);
                     player.GetComponent<MeshRenderer>().enabled = true;
                     //follower.GetComponent<MeshRenderer>().enabled = false;
                     follower1.GetComponent<MeshRenderer>().enabled = false;
                     cursor.GetComponent<CursorChanger>().normalCursorId = 0;
                     cursor.GetComponent<CursorChanger>().searchCursorId = 3;
-                    cursor.GetComponent<TestCamera>().maxX = 10.24f;
-                    cursor.GetComponent<TestCamera>().minX = -10.24f;
+
+
                     OnMouseDown();
                 }
             }

Greta/Assets/DackelAnimation.cs

@@ -11,19 +11,14 @@ public class DackelAnimation : MonoBehaviour
 	// Update is called once per frame
 	void Update()
 	{
-		/* see stevezuckt.cs for more informations
-         */
-		if (this.GetComponent<Entity>().dialogueInitiated)
-		{
-			currentAnimationState = "Fressend";
-			skeletonAnimation.AnimationName = "Fressend";
-			//Debug.Log("Dame spricht"); //Clicked " + hit.transform.gameObject.name);
-		}
-		else
+        currentAnimationState = "Spielend";
+        skeletonAnimation.AnimationName = "Spielend";
+
+        if(Database.core.entities[SupportFunctions.core.findEntityIndexById(15)].entityStageId == 3)
 		{
-			currentAnimationState = "Spielend";
-			skeletonAnimation.AnimationName = "Spielend";
-			Debug.Log("Dackel spielt"); // Clicked " + hit.transform.gameObject.name);
-		}
+            Debug.Log("Dackel spielt"); // Clicked " + hit.transform.gameObject.name);
+            currentAnimationState = "Fressend";
+            skeletonAnimation.AnimationName = "Fressend";
+        }
 	}
 }

Greta/Assets/PAC Engine/Audio/Wagon1/W1_Eiswagon/W1_schlaffendepassagier.mp3.meta → Greta/Assets/PAC Engine/Audio/Wagon1/W1_Eiswagon/W1_schlaffendepassagier.wav.meta

 fileFormatVersion: 2
-guid: ad3753e817fc73c4e813c63c129ede4b
+guid: fb27a903d11972f4984111c6ed09dabb
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Greta/Assets/PAC Engine/Graphics/AssetsGraphics/g2.png.meta

-fileFormatVersion: 2
-guid: 213342a4a56536b4c9698e829fc366ca
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 7
-  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: 30
-  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
-  - serializedVersion: 2
-    buildTarget: Android
-    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: 665f7a72515ce464081bf4747b92da9c
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Greta/Assets/PAC Engine/Graphics/AssetsGraphics/g2L.png.meta

-fileFormatVersion: 2
-guid: 20fce5cd7936fec409b5d348baae3ee9
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 7
-  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: 30
-  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
-  - serializedVersion: 2
-    buildTarget: Android
-    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: 244140631ec40dc44b995e55debf9a36
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Greta/Assets/PAC Engine/Graphics/AssetsGraphics/a.png.meta → Greta/Assets/PAC Engine/Graphics/Luftpumpe.png.meta

 fileFormatVersion: 2
-guid: 4393366a8ad3e6b419d94fa8e4f99247
+guid: d3a95407325563545809417cc2812369
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -75,7 +75,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: e79052e62edfdac44ad806a2aa835c05
+    spriteID: 024c65fdb17bd6f4f992ed463a52220f
     vertices: []
     indices: 
     edges: []