Commit 68612963 authored by Sebastian Frey's avatar Sebastian Frey

Merge remote-tracking branch 'origin/master'

parents 6d4e1f34 79436b70
Pipeline #2923 waiting for manual action with stages
in 8 minutes and 11 seconds
fileFormatVersion: 2
guid: f7ec8ad896f47904cb7499a6425f0c4c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 100
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
  • 2-up
  • Swipe
  • Onion skin
fileFormatVersion: 2 fileFormatVersion: 2
guid: fceda3bd95cbcc34890b77ed58b7e07e guid: fceda3bd95cbcc34890b77ed58b7e07e
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName:
21300000: fire_5_0
21300002: fire_5_1
21300004: fire_5_2
21300006: fire_5_3
21300008: fire_5_4
externalObjects: {} externalObjects: {}
serializedVersion: 9 serializedVersion: 9
mipmaps: mipmaps:
...@@ -82,11 +87,111 @@ TextureImporter: ...@@ -82,11 +87,111 @@ TextureImporter:
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites:
- serializedVersion: 2
name: fire_5_0
rect:
serializedVersion: 2
x: 22
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f681a01cf01f3f541b32828838efbc82
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_1
rect:
serializedVersion: 2
x: 244
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5bf806a92fd64b64493694f7ac4f5659
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_2
rect:
serializedVersion: 2
x: 468
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8db3233c44b0e324b9bb72d620915851
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_3
rect:
serializedVersion: 2
x: 686
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bbab3b146372cbb499453e04edf11172
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_4
rect:
serializedVersion: 2
x: 910
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cb4ed6bcfe9c7df4eb47c41031b0204d
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID: fd429e4f5c3f717448192609bf7e686f
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
......
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/wasser_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_3.png
Assets/_Game/Graphics/Sprite/HUD/wasser_3.png
Assets/_Game/Graphics/Sprite/HUD/wasser_3.png
Assets/_Game/Graphics/Sprite/HUD/wasser_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/wasser_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_4.png
Assets/_Game/Graphics/Sprite/HUD/wasser_4.png
Assets/_Game/Graphics/Sprite/HUD/wasser_4.png
Assets/_Game/Graphics/Sprite/HUD/wasser_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/wasser_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_5.png
Assets/_Game/Graphics/Sprite/HUD/wasser_5.png
Assets/_Game/Graphics/Sprite/HUD/wasser_5.png
Assets/_Game/Graphics/Sprite/HUD/wasser_5.png
  • 2-up
  • Swipe
  • Onion skin
fileFormatVersion: 2 fileFormatVersion: 2
guid: 58d10beda6ed0de4a8aaf25af9976ee9 guid: bc43ac6a6d9af5e44b800027e40c1e84
MonoImporter: folderAsset: yes
DefaultImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
This diff is collapsed.
...@@ -105,6 +105,7 @@ GameObject: ...@@ -105,6 +105,7 @@ GameObject:
- component: {fileID: 395035932932740995} - component: {fileID: 395035932932740995}
- component: {fileID: 395035932932740993} - component: {fileID: 395035932932740993}
- component: {fileID: 26295510} - component: {fileID: 26295510}
- component: {fileID: 4164987020508732221}
m_Layer: 0 m_Layer: 0
m_Name: SavePoint m_Name: SavePoint
m_TagString: Untagged m_TagString: Untagged
...@@ -189,10 +190,10 @@ SpriteRenderer: ...@@ -189,10 +190,10 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: -480944179
m_SortingLayer: 0 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 3fc2bbd409bf34ab6af1637bab569da1, type: 3} m_Sprite: {fileID: 21300000, guid: ecc204495234d40f091d828790c56287, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -203,3 +204,18 @@ SpriteRenderer: ...@@ -203,3 +204,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!111 &4164987020508732221
Animation:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 395035932932740994}
m_Enabled: 1
serializedVersion: 3
m_Animation: {fileID: 0}
m_Animations: []
m_WrapMode: 0
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
This diff is collapsed.
...@@ -12287,19 +12287,6 @@ PrefabInstance: ...@@ -12287,19 +12287,6 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114817957, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
propertyPath: m_Name
value: Anzeige
objectReference: {fileID: 0}
- target: {fileID: 388107567, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
propertyPath: ElementBox
value:
objectReference: {fileID: 0}
- target: {fileID: 388107565, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 706d34e52b620a34abdffce7a27726a1,
type: 3}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
--- !u!1 &1046025670 --- !u!1 &1046025670
......
This diff is collapsed.
...@@ -18,20 +18,6 @@ namespace PlayerSpawnPointScript ...@@ -18,20 +18,6 @@ namespace PlayerSpawnPointScript
SetPlayerPosition(); SetPlayerPosition();
} }
// Update is called once per frame
//void Update()
//{
// if (Input.GetKeyDown(KeyCode.N))
// {
// SaveSystem.NewGame();
// }
// if (Input.GetKeyDown(KeyCode.O))
// {
// SetPlayerPosition();
// }
//}
private void SetPlayerPosition() private void SetPlayerPosition()
{ {
SavePointData savePosition = SaveSystem.LoadSavePoint(); SavePointData savePosition = SaveSystem.LoadSavePoint();
......
...@@ -28,8 +28,8 @@ public class SavePoint : MonoBehaviour ...@@ -28,8 +28,8 @@ public class SavePoint : MonoBehaviour
{ {
if (Input.GetButtonDown("Interact")) if (Input.GetButtonDown("Interact"))
{ {
SaveSystem.SavePointUpdate(this); isUsed = true;
isUsed = true; SaveSystem.SavePointUpdate(this);
} else if (Input.GetButtonDown("Teleport") && Levelauswahl.la.auswahlIsActive() == false) } else if (Input.GetButtonDown("Teleport") && Levelauswahl.la.auswahlIsActive() == false)
{ {
Levelauswahl.la.GetLevelauswahl(); Levelauswahl.la.GetLevelauswahl();
......
...@@ -2,20 +2,29 @@ using UnityEngine; ...@@ -2,20 +2,29 @@ using UnityEngine;
using System.IO; using System.IO;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using SavePointListScript; using SavePointListScript;
using System;
[System.Serializable] [System.Serializable]
public class SavePointData public class SavePointData
{ {
public float[] position; public float[] position;
public bool[] savePointIsActiv; public bool[] savePointIsActiv = null;
public SavePointData(SavePoint save) public SavePointData(SavePoint save)
{ {
position = new float[2]; position = new float[2];
position[0] = save.transform.position.x; position[0] = save.transform.position.x;
position[1] = save.transform.position.y; position[1] = save.transform.position.y;
savePointIsActiv = SavePointList.spl.GetIsActivList(); try
{
savePointIsActiv = SavePointList.spl.GetIsActivList();
}
catch (Exception e)
{
Debug.Log(e);
savePointIsActiv = null;
}
} }
public SavePointData(Vector2 save) public SavePointData(Vector2 save)
......
...@@ -9,20 +9,27 @@ namespace SavePointListScript ...@@ -9,20 +9,27 @@ namespace SavePointListScript
public static SavePointList spl; public static SavePointList spl;
public GameObject[] savePointList; public GameObject[] savePointList;
public void Start()
{
spl = this;
}
public bool[] GetIsActivList() public bool[] GetIsActivList()
{ {
bool[] savePointIsActiv = new bool[savePointList.Length]; if (savePointList.Length > 1)
int i = 0;
foreach(GameObject var in savePointList)
{ {
SavePoint temp = savePointList[i].GetComponent<SavePoint>(); bool[] savePointIsActiv = new bool[savePointList.Length -1];
savePointIsActiv[i] = temp.GetIsUsed(); int i = 0;
i++; foreach (GameObject var in savePointList)
{
SavePoint temp = savePointList[i].GetComponent<SavePoint>();
savePointIsActiv[i] = temp.GetIsUsed();
i++;
}
return savePointIsActiv;
} }
return null;
return savePointIsActiv;
} }
public void setIsActivList(bool[] savePointIsActiv) public void SetIsActivList(bool[] savePointIsActiv)
{ {
int i = 0; int i = 0;
foreach (GameObject var in savePointList) foreach (GameObject var in savePointList)
......
...@@ -2,6 +2,7 @@ using System; ...@@ -2,6 +2,7 @@ using System;
using System.IO; using System.IO;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using UnityEngine; using UnityEngine;
using SavePointListScript;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using PlayerSpawnPointScript; using PlayerSpawnPointScript;
...@@ -29,6 +30,10 @@ public class SaveSystem ...@@ -29,6 +30,10 @@ public class SaveSystem
FileStream stream = new FileStream(path, FileMode.Open); FileStream stream = new FileStream(path, FileMode.Open);
SavePointData data = formatter.Deserialize(stream) as SavePointData; SavePointData data = formatter.Deserialize(stream) as SavePointData;
if (data.savePointIsActiv != null)
{
SavePointList.spl.SetIsActivList(data.savePointIsActiv);
}
stream.Close(); stream.Close();
...@@ -50,8 +55,6 @@ public class SaveSystem ...@@ -50,8 +55,6 @@ public class SaveSystem
try try
{ {
data = new SavePointData(new Vector2(vec.x, vec.y)); data = new SavePointData(new Vector2(vec.x, vec.y));
//data = new SavePointData(new Vector2(PlayerSpawnPointScript.PlayerSpawnPoint.startPoint.transform.position.x, PlayerSpawnPointScript.PlayerSpawnPoint.startPoint.transform.position.y));
//SavePointData data = new SavePointData(new Vector2(GameObject.Find("StartPoint").transform.position.x, GameObject.Find("StartPoint").transform.position.y));
} }
catch (Exception e) catch (Exception e)
{ {
......
...@@ -8,52 +8,76 @@ public class ElementAnzeige : MonoBehaviour ...@@ -8,52 +8,76 @@ public class ElementAnzeige : MonoBehaviour
{ {
[SerializeField] private PlayerState state; [SerializeField] private PlayerState state;
public Sprite empty; public Sprite empty;
public GameObject ElementBox; public Sprite[] feuerSprites;
public Sprite[] FeuerSprites; public Sprite[] erdeSprites;
public Sprite[] ErdeSprites; public Sprite[] luftSprites;
public Sprite[] LuftSprites; public Sprite[] wasserSprites;
public Sprite[] WasserSprites; private Sprite[] currentSprites;
public Sprite[] currentSprites; private int availableCount = 0;
public int availableCount = 0; public GameObject[] textBox;
public void UpdateFeuerAnzeige()