Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Wintersemester 2018-2019
Unity
Suck It
Commits
1b211137
Commit
1b211137
authored
Mar 29, 2019
by
Isa
Browse files
MainMenu Sprites geaddet
parent
479aad87
Changes
11
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Graphics/Sprite/HUD/FeuerBox.png
deleted
100644 → 0
LFS
View file @
479aad87
131 Bytes
Assets/_Game/Graphics/Sprite/HUD/FeuerBox.png.meta
deleted
100644 → 0
View file @
479aad87
fileFormatVersion: 2
guid: c1e3ffb5baa9daa44a8e96a1707f043f
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/
ErdeBox
.png
→
Assets/_Game/Graphics/Sprite/HUD/
MainMenue
.png
LFS
View replaced file @
479aad87
View file @
1b211137
131 Bytes
|
W:
|
H:
131 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/_Game/Graphics/Sprite/HUD/
LuftBox
.png.meta
→
Assets/_Game/Graphics/Sprite/HUD/
MainMenue
.png.meta
View file @
1b211137
fileFormatVersion: 2
guid:
ed602ea5cd2f2824e9c01e116a1d7787
guid:
327b7295867d04a409011baf97cc325c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
...
...
Assets/_Game/Graphics/Sprite/HUD/WasserBox.png
deleted
100644 → 0
LFS
View file @
479aad87
131 Bytes
Assets/_Game/Graphics/Sprite/HUD/WasserBox.png.meta
deleted
100644 → 0
View file @
479aad87
fileFormatVersion: 2
guid: c5088d79e0ded2e45a653b76e584ce41
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/
LuftBox
.png
→
Assets/_Game/Graphics/Sprite/HUD/
logo
.png
LFS
View replaced file @
479aad87
View file @
1b211137
131 Bytes
|
W:
|
H:
131 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
Assets/_Game/Graphics/Sprite/HUD/
ErdeBox
.png.meta
→
Assets/_Game/Graphics/Sprite/HUD/
logo
.png.meta
View file @
1b211137
fileFormatVersion: 2
guid:
df22061a1ae2ea04da52179196f747a4
guid:
e72783143bb9534459fa57abf198a023
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
...
...
Assets/_Game/Scenes/MainLevel-Isa.unity
View file @
1b211137
...
...
@@ -18395,6 +18395,12 @@ PrefabInstance:
propertyPath: m_GroundedOffset.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: r_State
value:
objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
type: 2}
- target: {fileID: 52145075018362284, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GravityScale
...
...
Assets/_Game/Scenes/MainMenu.unity
View file @
1b211137
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0.127317
1
5
,
g
:
0.134147
36
,
b
:
0.121078
52
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.127317
2
5
,
g
:
0.134147
45
,
b
:
0.121078
73
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
LightmapSettings
:
...
...
@@ -125,6 +125,8 @@ GameObject:
-
component
:
{
fileID
:
67646351
}
-
component
:
{
fileID
:
67646350
}
-
component
:
{
fileID
:
67646354
}
-
component
:
{
fileID
:
67646356
}
-
component
:
{
fileID
:
67646355
}
m_Layer
:
5
m_Name
:
"
Men
\xFC
"
m_TagString
:
Untagged
...
...
@@ -226,6 +228,43 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
startPointObject
:
{
fileID
:
11400000
,
guid
:
54e03e86b8009b54f8d532f93b1f4339
,
type
:
2
}
---
!u!114
&67646355
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
67646349
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
21300000
,
guid
:
327b7295867d04a409011baf97cc325c
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
---
!u!222
&67646356
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
67646349
}
m_CullTransparentMesh
:
0
---
!u!1
&153273652
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -263,7 +302,7 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
2.9439087
,
y
:
184
}
m_AnchoredPosition
:
{
x
:
2.9439087
,
y
:
-36.000015
}
m_SizeDelta
:
{
x
:
650
,
y
:
100
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&153273654
...
...
@@ -523,7 +562,7 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
2.9439087
,
y
:
7
5
}
m_AnchoredPosition
:
{
x
:
2.9439087
,
y
:
-14
5
}
m_SizeDelta
:
{
x
:
650
,
y
:
100
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&711920176
...
...
@@ -809,6 +848,80 @@ Transform:
m_Father
:
{
fileID
:
67646353
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&1692724905
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1692724906
}
-
component
:
{
fileID
:
1692724908
}
-
component
:
{
fileID
:
1692724907
}
m_Layer
:
0
m_Name
:
Image
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&1692724906
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1692724905
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
0.74343
,
y
:
0.74343
,
z
:
0.74343
}
m_Children
:
[]
m_Father
:
{
fileID
:
1834203559
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
-269
,
y
:
185
}
m_SizeDelta
:
{
x
:
1920
,
y
:
1080
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&1692724907
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1692724905
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
21300000
,
guid
:
e72783143bb9534459fa57abf198a023
,
type
:
3
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
---
!u!222
&1692724908
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1692724905
}
m_CullTransparentMesh
:
0
---
!u!1
&1834203558
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -838,6 +951,7 @@ Transform:
m_Children
:
-
{
fileID
:
153273653
}
-
{
fileID
:
711920175
}
-
{
fileID
:
1692724906
}
m_Father
:
{
fileID
:
67646353
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
Assets/_Game/Scripts/UI/ElementAnzeige.cs
View file @
1b211137
...
...
@@ -39,6 +39,7 @@ public class ElementAnzeige : MonoBehaviour
public
void
GetRemainingCharges
()
{
availableCount
=
state
.
GetCharges
();
Debug
.
Log
(
availableCount
);
switch
(
availableCount
)
{
case
5
:
GetComponent
<
Image
>().
sprite
=
currentSprites
[
4
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment