Merge branch 'master' of git.fslab.de:mwagne2s/forellenforderung3

This commit is contained in:
Maximilian Wagner
2023-06-19 10:43:04 +02:00
37 changed files with 1007 additions and 260 deletions

BIN
Assets/AssetsFORELLE/Sprites/.DS_Store vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

View File

@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

View File

@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

View File

@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

View File

@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

View File

@@ -42,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -103,7 +103,91 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: "br\xF6ckelige platform_0"
rect:
serializedVersion: 2
x: 0
y: 0
width: 24
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 825a74a4f7c0c45019a2451028b7fb46
internalID: -687893808
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: "br\xF6ckelige platform_1"
rect:
serializedVersion: 2
x: 24
y: 0
width: 24
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 695e6cb044daf4197b22b602703c5c60
internalID: 140603622
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: "br\xF6ckelige platform_2"
rect:
serializedVersion: 2
x: 48
y: 0
width: 24
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cf861b35e385947a797c2d1eec421acf
internalID: 2058888311
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: "br\xF6ckelige platform_3"
rect:
serializedVersion: 2
x: 72
y: 0
width: 24
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1162e6cf5dcd8453aaa5ddec2a78291e
internalID: -2124331528
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@@ -114,7 +198,11 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
nameFileIdTable:
"br\xF6ckelige platform_0": -687893808
"br\xF6ckelige platform_1": 140603622
"br\xF6ckelige platform_2": 2058888311
"br\xF6ckelige platform_3": -2124331528
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

View File

@@ -42,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -103,7 +103,91 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: presurePlate_Anderswelt_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dcf44a3007afd43bf966be7a245b7b8f
internalID: -1987804592
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: presurePlate_Anderswelt_1
rect:
serializedVersion: 2
x: 16
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1f9cf62e505184dc6a472e09b5c8f6c8
internalID: 651973053
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: presurePlate_Anderswelt_2
rect:
serializedVersion: 2
x: 32
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5134e4a33a6f64a969786767f42b2485
internalID: 948987427
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: presurePlate_Anderswelt_3
rect:
serializedVersion: 2
x: 48
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1324087ddb6fa44d4b55fe936b31b041
internalID: -1020334382
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@@ -114,7 +198,11 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
nameFileIdTable:
presurePlate_Anderswelt_0: -1987804592
presurePlate_Anderswelt_1: 651973053
presurePlate_Anderswelt_2: 948987427
presurePlate_Anderswelt_3: -1020334382
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0