Created Scarecrow museum art prefab for glider powerup, placed in museum

4 years ago · f0671d1693
parent b9f763090e
commit f0671d1693
11 changed files with 217 additions and 83 deletions
--- a/MuseumGame/Assets/Prefabs/Art.meta
+++ b/MuseumGame/Assets/Prefabs/Art.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7cd50c9d1f5784dd9bc638427331af27
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2
+++ b/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2
--- a/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2
+++ b/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2
--- a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab
+++ b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab
@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8843438201003174076
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8843438201003174072}
+  - component: {fileID: 8843438201003174073}
+  - component: {fileID: 8843438201003174078}
+  - component: {fileID: 8843438201003174079}
+  m_Layer: 0
+  m_Name: Scarecrow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8843438201003174072
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843438201003174076}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 15.08, y: -1.75, z: 1}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &8843438201003174073
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843438201003174076}
+  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: 71938390b65010447bd9357a6450359c, 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 &8843438201003174078
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843438201003174076}
+  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 &8843438201003174079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843438201003174076}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cd4d5b992474f984fa6c9f579b861848, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  index: 7
--- a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta
+++ b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 74bd19f26d283402f9ba1d330e1c1e96
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Prefabs/Powerups.meta
+++ b/MuseumGame/Assets/Prefabs/Powerups.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0fa95a8a5ac8f4d12ba27e1a6dfe1b3a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Prefabs/Powerups/Glider
+++ b/MuseumGame/Assets/Prefabs/Powerups/Glider
--- a/MuseumGame/Assets/Prefabs/Powerups/Glider
+++ b/MuseumGame/Assets/Prefabs/Powerups/Glider
--- a/MuseumGame/Assets/Scenes/Museum/Museum.unity
+++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity
@ -17762,79 +17762,6 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
--- !u!1001 &1783916101
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5.75
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.75
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016595, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_Name
-      value: Blackburn-Abstract#2 Pixelart
-      objectReference: {fileID: 0}
-    - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
 --- !u!1 &1935037035
 GameObject:
  m_ObjectHideFlags: 0
@ -87633,3 +87560,60 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
+--- !u!1001 &247571770440168743
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8843438201003174076, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
+      propertyPath: m_Name
+      value: Scarecrow
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
--- a/MuseumGame/Assets/Scripts/Art.cs
+++ b/MuseumGame/Assets/Scripts/Art.cs
@ -5,13 +5,15 @@ using UnityEngine;
 public class Art : MonoBehaviour
 {
    public int index;
-    public SpriteRenderer spriteRenderer;
-    public BoxCollider2D collider;
+    private SpriteRenderer spriteRenderer;
+    private BoxCollider2D collider;
    // Start is called before the first frame update
    void Start()
    {
        spriteRenderer = GetComponent<SpriteRenderer>();
        collider = GetComponent<BoxCollider2D>();
+        spriteRenderer.enabled = false;
+        collider.enabled = false;
    }

    // Update is called once per frame
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@ -12,28 +12,28 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
      flags: 0
    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
      flags: 0
    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
      flags: 0
    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
      flags: 0
    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
      flags: 0
    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
      flags: 0
    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
      flags: 0
    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
+      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
      flags: 0
    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650