Skip to content
This repository has been archived by the owner on Dec 28, 2019. It is now read-only.

Commit

Permalink
Einige Optimierungen und einen "Beenden-Button"
Browse files Browse the repository at this point in the history
  • Loading branch information
@pklaschka
pklaschka committed May 29, 2017
1 parent c3b7032 commit 094205e
Show file tree
Hide file tree
Showing 5 changed files with 363 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Platformer_001/Assets/Scenes (Level)/MenuSystem/Bestenliste.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "Ihr Ergebnis: \n122354 (#3367)"
m_Text: "Ihr Ergebnis: \n... (#...)"
--- !u!222 &104631840
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
343 changes: 343 additions & 0 deletions Platformer_001/Assets/Scenes (Level)/MenuSystem/Hauptmenue.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,149 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 23342933}
--- !u!1 &35509339
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 1395037609657554, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 35509340}
- component: {fileID: 35509344}
- component: {fileID: 35509343}
- component: {fileID: 35509342}
- component: {fileID: 35509341}
m_Layer: 5
m_Name: btnBeenden
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &35509340
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 224394758047748418, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 35509339}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0000603, y: 1.0000603, z: 1.0000603}
m_Children:
- {fileID: 954924933}
m_Father: {fileID: 789453630}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 105, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &35509341
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 114994239107799454, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 35509339}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f69fb25dbf029542b0e2c55abd312cb, type: 3}
m_Name:
m_EditorClassIdentifier:
NameSceneToLoad: Bestenliste
BackgroundImage: {fileID: 2056605746}
ProgressBar: {fileID: 323856350}
--- !u!114 &35509342
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 114709332942617730, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 35509339}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.47843137, g: 0.47843137, b: 0.47843137, a: 1}
m_PressedColor: {r: 0.5882353, g: 0, b: 0, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 35509343}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 35509341}
m_MethodName: CloseGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &35509343
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 114688315258566334, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 35509339}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 9012cf27380dac94da15b50118e7db93, type: 3}
m_Type: 2
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &35509344
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 222077949913665932, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 35509339}
--- !u!1001 &184535170
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1322,6 +1465,8 @@ RectTransform:
- {fileID: 2002959835}
- {fileID: 1040255711}
- {fileID: 1541251497}
- {fileID: 1287285305}
- {fileID: 35509340}
m_Father: {fileID: 1890847562}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1528,6 +1673,84 @@ Transform:
m_PrefabParentObject: {fileID: 4099865118784658, guid: 6e9a9ca797e19409ab4a57e3e2514158,
type: 2}
m_PrefabInternal: {fileID: 877992406}
--- !u!1 &954924932
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 1941232782347588, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 954924933}
- component: {fileID: 954924935}
- component: {fileID: 954924934}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &954924933
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 224892731018406752, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 954924932}
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_Children: []
m_Father: {fileID: 35509340}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &954924934
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 114447268820350038, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 954924932}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 10
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Beenden
--- !u!222 &954924935
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 222634344987931754, guid: 0ae1ace1c4c0e4e7bb640d920ddb1920,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 954924932}
--- !u!1 &980042916
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1774,6 +1997,126 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 6e9a9ca797e19409ab4a57e3e2514158, type: 2}
m_IsPrefabParent: 0
--- !u!1001 &1287285304
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 789453630}
m_Modifications:
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 159.62134
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -212.94481
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_SizeDelta.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: f6748a010e46d4334a2b9717aa34b24d, type: 2}
m_IsPrefabParent: 0
--- !u!224 &1287285305 stripped
RectTransform:
m_PrefabParentObject: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
type: 2}
m_PrefabInternal: {fileID: 1287285304}
--- !u!1001 &1295702321
Prefab:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Platformer_001/Assets/Scripts/Bestenliste/Bestenliste.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ private IEnumerator GetRank()

private IEnumerator SetupBestenliste()
{
bestenliste.text = "<b>Die Besten:</b>\n";
bestenliste.text = "<b>Die Besten:</b>\nWird geladen.";
var myWr = UnityWebRequest.Get(serverAdress + "/" + best5Adress);
yield return myWr.Send();

if(myWr.isError) {
Debug.LogError(myWr.error);
}
else {
bestenliste.text = "<b>Die Besten:</b>\n" + myWr.downloadHandler.text;
bestenliste.text = "<b>Die Besten:</b>" + myWr.downloadHandler.text;
}
}

Expand Down
Loading

0 comments on commit 094205e

Please sign in to comment.