From 78fd19675f472aa6c9705559fbfdd2fb3ce8a6e4 Mon Sep 17 00:00:00 2001 From: AliIbnAbiTalib Date: Mon, 20 Feb 2023 21:54:26 +0100 Subject: [PATCH] My Bad lol unity push vergessen...huch --- FlufflParty/Assets/Scenes/WesternMap.unity | 228 ++++++++++++++++++++- 1 file changed, 224 insertions(+), 4 deletions(-) diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 6353b11..52a6c5e 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -2002,6 +2002,7 @@ RectTransform: - {fileID: 98175702} - {fileID: 1462787853} - {fileID: 1115580908} + - {fileID: 1235522789} m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4142,6 +4143,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &938479507 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 170780389760954996, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + m_PrefabInstance: {fileID: 2092590529} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87be2f31745a56643883eec0eb73919d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &944703997 GameObject: m_ObjectHideFlags: 0 @@ -5166,7 +5178,7 @@ GameObject: - component: {fileID: 1139560686} - component: {fileID: 1139560685} m_Layer: 5 - m_Name: Button (1) + m_Name: MoveOnButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5236,7 +5248,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1139560686} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 938479507} + m_TargetAssemblyTypeName: ItemShop, Assembly-CSharp + m_MethodName: buttonMoveOn + 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 --- !u!114 &1139560686 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5498,6 +5522,43 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1235522788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1235522789} + m_Layer: 5 + m_Name: Layout-ITShop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1235522789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235522788} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1558878906} + m_Father: {fileID: 335464105} + m_RootOrder: 3 + 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: 0.000015259, y: 0.2262} + m_SizeDelta: {x: 800, y: 384.37} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1257267486 GameObject: m_ObjectHideFlags: 0 @@ -6792,6 +6853,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1558878905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1558878906} + - component: {fileID: 1558878908} + - component: {fileID: 1558878907} + m_Layer: 5 + m_Name: Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1558878906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558878905} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1235522789} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1558878907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558878905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Test Erfolgreich + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1558878908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558878905} + m_CullTransparentMesh: 1 --- !u!1 &1584314259 GameObject: m_ObjectHideFlags: 0 @@ -9559,7 +9755,7 @@ GameObject: - component: {fileID: 2064695034} - component: {fileID: 2064695033} m_Layer: 5 - m_Name: Button + m_Name: EnterButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9629,7 +9825,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2064695034} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 938479507} + m_TargetAssemblyTypeName: ItemShop, Assembly-CSharp + m_MethodName: buttonEnter + 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 --- !u!114 &2064695034 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9753,6 +9961,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 170780389760954996, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: client + value: + objectReference: {fileID: 47812148} + - target: {fileID: 170780389760954996, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: Layout2 + value: + objectReference: {fileID: 1115580907} + - target: {fileID: 170780389760954996, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: LayoutItemShop + value: + objectReference: {fileID: 1235522788} - target: {fileID: 3663925849651850792, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_Name value: ItemShop