mevulfmp3
/
MuseumGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

painting and powerup retrieval display complete

Browse Source
main
Matthew Kalahiki 4 years ago
parent e49ac5970e
commit e3e98ea9e3
9 changed files with 262 additions and 138 deletions
Show Stats Download Patch File Download Diff File

126
MuseumGame/Assets/Prefabs/Powerup.prefab
Unescape View File

@ -0,0 +1,126 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8891684601414002462
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 597953003524751437}
- component: {fileID: 8658958041545358138}
- component: {fileID: 5020600084413111101}
- component: {fileID: 61480157875768234}
m_Layer: 0
m_Name: Blackburn-Abstract#2 Pixelart 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &597953003524751437
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8891684601414002462}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.93, y: -2.06, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8658958041545358138
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8891684601414002462}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 7947595c5ebf72648aab3049c3c7f7bd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.28, y: 1.28}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &5020600084413111101
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8891684601414002462}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1.28, y: 1.28}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.28, y: 1.28}
m_EdgeRadius: 0
--- !u!114 &61480157875768234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8891684601414002462}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b211c5a33678e544f8a025eda8fe81eb, type: 3}
m_Name:
m_EditorClassIdentifier:
artIndex: 0
powerupIndex: 0

7
MuseumGame/Assets/Prefabs/Powerup.prefab.meta
Unescape View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7e5677f32c244b44f95cadec2a06bb8b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

186
MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity
Unescape View File

@ -175,7 +175,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8a8b91fed9500704991dba49d5e1792f, type: 2}
- {fileID: 2100000, guid: 4546e81aede4a3c47b179c8ece48a648, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -2021,129 +2021,6 @@ MonoBehaviour:
m_CropFrameX: 0
m_CropFrameY: 0
m_StretchFill: 0
--- !u!1 &1101410975
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1101410979}
- component: {fileID: 1101410978}
- component: {fileID: 1101410976}
- component: {fileID: 1101410977}
m_Layer: 0
m_Name: Square
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &1101410976
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1101410975}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &1101410977
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1101410975}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b211c5a33678e544f8a025eda8fe81eb, type: 3}
m_Name:
m_EditorClassIdentifier:
index: 3
--- !u!212 &1101410978
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1101410975}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: db750325989564987a34393247d883b4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1101410979
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1101410975}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.42, y: -1.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1173694640
GameObject:
m_ObjectHideFlags: 0
@ -5194,3 +5071,64 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1001 &1474842602506130968
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 61480157875768234, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: artIndex
value: 7
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalPosition.x
value: -4.93
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalPosition.y
value: -2.06
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 597953003524751437, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8891684601414002462, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}
propertyPath: m_Name
value: Blackburn-Abstract#2 Pixelart
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7e5677f32c244b44f95cadec2a06bb8b, type: 3}

24
MuseumGame/Assets/Scripts/GameManager.cs
Unescape View File

@ -40,6 +40,7 @@ public class GameManager : MonoBehaviour
public Sprite[] powerupSprites;
[TextArea]
public string[] powerupInfo;
private int powerIndex = 5;
public GameObject powerUps;
public GameObject gliderPowerupButton;
@ -251,6 +252,14 @@ public class GameManager : MonoBehaviour
{
hideGalleryButton.SetActive(false);
}
} else if (powerIndex != 5) {
dialogBox.SetActive(true);
dialogText.GetComponent<TextMeshProUGUI>().text = "Congratulations! You received a new powerup! Click the powerup icon on the Powerup Pallet to activate the powerup. " + powerupInfo[powerIndex];
artImage.SetActive(true);
artImage.GetComponent<Image>().sprite = powerupSprites[powerIndex];
artImage.GetComponent<RectTransform>().sizeDelta = new Vector2(300,300);
hideGalleryButton.SetActive(true);
powerIndex = 5;
}
else
{
@ -263,20 +272,17 @@ public class GameManager : MonoBehaviour
panel.SetActive(false);
healthbar.SetActive(true);
powerUps.SetActive(true);
artImage.SetActive(false);
dialogBox.SetActive(false);
}
artImage.SetActive(false);
dialogBox.SetActive(false);
}
public void PowerupReceived(int powerupIndex)
public void ArtReceived(int artIndex, int powerupIndex)
{
dialogBox.SetActive(true);
dialogText.GetComponent<TextMeshProUGUI>().text = "Congratulations! You received a new powerup! Click the powerup icon on the Powerup Pallet to activate the powerup. " + powerupInfo[powerupIndex];
artImage.SetActive(true);
artImage.GetComponent<Image>().sprite = powerupSprites[powerupIndex];
hideGalleryButton.SetActive(true);
StartDialog(artIndex);
powerIndex = powerupIndex;
/* artImage.GetComponent<Image>().SetNativeSize();
artImage.GetComponent<RectTransform>().anchoredPosition = new Vector2(-artImage.GetComponent<Image>().sprite.rect.width / 2, 0);*/
}

2
MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs
Unescape View File

@ -20,7 +20,7 @@ public class GliderPowerupPickup : MonoBehaviour
{
Debug.Log("Glider Powerup Obtained");
GameManager.Instance.enablePowerup(0);
GameManager.Instance.PowerupReceived(0);
// GameManager.Instance.PowerupReceived(0);
Destroy(gameObject);
}
}

10
MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs → MuseumGame/Assets/Scripts/PowerUp Logic/Pickup.cs
Unescape View File

@ -2,9 +2,11 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PowerupPickup : MonoBehaviour
public class Pickup : MonoBehaviour
{
public int index;
public int artIndex;
public int powerupIndex;
// Start is called before the first frame update
void Start()
{
@ -20,8 +22,8 @@ public class PowerupPickup : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
GameManager.Instance.enablePowerup(index);
GameManager.Instance.PowerupReceived(index);
GameManager.Instance.enablePowerup(powerupIndex);
GameManager.Instance.ArtReceived(artIndex, powerupIndex);
Destroy(gameObject);
}
}

0
MuseumGame/Assets/Scripts/PowerUp Logic/PowerupPickup.cs.meta → MuseumGame/Assets/Scripts/PowerUp Logic/Pickup.cs.meta
Unescape View File

37
MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart 1.mat
Unescape View File

@ -0,0 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blackburn-Abstract#2 Pixelart 1
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7947595c5ebf72648aab3049c3c7f7bd, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

8
MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart 1.mat.meta
Unescape View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4546e81aede4a3c47b179c8ece48a648
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Write Preview
Loading…
Cancel
Save