diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png new file mode 100644 index 00000000..6b2813bf Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png differ diff --git a/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png.meta b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png.meta new file mode 100644 index 00000000..397dd636 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/CementFactory/Placeholder/machine.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: ea3e0df8c84f4b943bbdb92a19b352a9 +TextureImporter: + internalIDToNameTable: + - first: + 213: -4627874047666434002 + second: machine_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: machine_0 + rect: + serializedVersion: 2 + x: 10 + y: 10 + width: 974 + height: 331 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e20d79bb21d76cfb0800000000000000 + internalID: -4627874047666434002 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + machine_0: -4627874047666434002 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory.meta b/Assets/Data/Items/CementFactory.meta new file mode 100644 index 00000000..663accf8 --- /dev/null +++ b/Assets/Data/Items/CementFactory.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebbaf25194508a04ab8e54146c835661 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Belt_Pickup.asset b/Assets/Data/Items/CementFactory/Belt_Pickup.asset new file mode 100644 index 00000000..6ed3d292 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Belt_Pickup.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: Belt_Pickup + m_EditorClassIdentifier: AppleHillsScripts::PickupItemData + _itemId: FancyBelt + itemName: FancyBelt + description: + mapSprite: {fileID: 2081361776707230073, guid: 1bcede31ffabad64a8867a05b4d648c9, type: 3} + pickUpSound: {fileID: 0} + dropSound: {fileID: 0} diff --git a/Assets/Data/Items/CementFactory/Belt_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Belt_Pickup.asset.meta new file mode 100644 index 00000000..e445091b --- /dev/null +++ b/Assets/Data/Items/CementFactory/Belt_Pickup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45c190ffad50b994ba53f64a9838751d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset b/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset new file mode 100644 index 00000000..1e18de90 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: Card_Printing_Machine_Slot + m_EditorClassIdentifier: AppleHillsScripts::PickupItemData + _itemId: CardPrintingMachine + itemName: CardPrintingMachine + description: + mapSprite: {fileID: -4627874047666434002, guid: ea3e0df8c84f4b943bbdb92a19b352a9, type: 3} + pickUpSound: {fileID: 0} + dropSound: {fileID: 0} diff --git a/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset.meta b/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset.meta new file mode 100644 index 00000000..29ffab42 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Card_Printing_Machine_Slot.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea20e322caf6eb441b580775bf1bf2c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Cookie_Pickup.asset b/Assets/Data/Items/CementFactory/Cookie_Pickup.asset new file mode 100644 index 00000000..9b1bfff6 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Cookie_Pickup.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: Cookie_Pickup + m_EditorClassIdentifier: AppleHillsScripts::PickupItemData + _itemId: CookieGear + itemName: CookieGear + description: + mapSprite: {fileID: -3814864888780597609, guid: 635837bba54c842489bfb7995d1f8060, type: 3} + pickUpSound: {fileID: 0} + dropSound: {fileID: 0} diff --git a/Assets/Data/Items/CementFactory/Cookie_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Cookie_Pickup.asset.meta new file mode 100644 index 00000000..d8fc5a67 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Cookie_Pickup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f94d1cbd3735424ea37b6125154ed37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Flower_Pickup.asset b/Assets/Data/Items/CementFactory/Flower_Pickup.asset new file mode 100644 index 00000000..06b015dc --- /dev/null +++ b/Assets/Data/Items/CementFactory/Flower_Pickup.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: Flower_Pickup + m_EditorClassIdentifier: AppleHillsScripts::PickupItemData + _itemId: FlowerPropeller + itemName: FlowerPropeller + description: + mapSprite: {fileID: -5181623569918797395, guid: 8c07a6d07f45e0e4ca47e70270b14ce6, type: 3} + pickUpSound: {fileID: 0} + dropSound: {fileID: 0} diff --git a/Assets/Data/Items/CementFactory/Flower_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Flower_Pickup.asset.meta new file mode 100644 index 00000000..e51c5976 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Flower_Pickup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0e8554a0463a924e803732e9209c92a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Items/CementFactory/Wheel_Pickup.asset b/Assets/Data/Items/CementFactory/Wheel_Pickup.asset new file mode 100644 index 00000000..75635778 --- /dev/null +++ b/Assets/Data/Items/CementFactory/Wheel_Pickup.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3} + m_Name: Wheel_Pickup + m_EditorClassIdentifier: AppleHillsScripts::PickupItemData + _itemId: MachineWheel + itemName: MachineWheel + description: + mapSprite: {fileID: 4161055586114662636, guid: d1b842e0ffc3ba941b0fd8984ad389da, type: 3} + pickUpSound: {fileID: 0} + dropSound: {fileID: 0} diff --git a/Assets/Data/Items/CementFactory/Wheel_Pickup.asset.meta b/Assets/Data/Items/CementFactory/Wheel_Pickup.asset.meta new file mode 100644 index 00000000..a477d10d --- /dev/null +++ b/Assets/Data/Items/CementFactory/Wheel_Pickup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5a6df00a3840924a8e5b5052a8c9b05 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory.meta b/Assets/Data/Puzzles/Cement Factory.meta new file mode 100644 index 00000000..74ac4ff9 --- /dev/null +++ b/Assets/Data/Puzzles/Cement Factory.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32856818d0cbfdd41bbe500f2b0e9c67 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/BeltPuzzle.meta b/Assets/Data/Puzzles/Cement Factory/BeltPuzzle.meta new file mode 100644 index 00000000..2e078ce5 --- /dev/null +++ b/Assets/Data/Puzzles/Cement Factory/BeltPuzzle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 730a63f42d6327f45887e734ee3d74df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/CookiePuzzle.meta b/Assets/Data/Puzzles/Cement Factory/CookiePuzzle.meta new file mode 100644 index 00000000..e14f83d3 --- /dev/null +++ b/Assets/Data/Puzzles/Cement Factory/CookiePuzzle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a50ba6c907b9ff4bac7dcfc34e4cf15 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/FlowerPuzzle.meta b/Assets/Data/Puzzles/Cement Factory/FlowerPuzzle.meta new file mode 100644 index 00000000..f02c24f6 --- /dev/null +++ b/Assets/Data/Puzzles/Cement Factory/FlowerPuzzle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 643b866897d4cd849825d2b17f01952f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Puzzles/Cement Factory/WheelPuzzle.meta b/Assets/Data/Puzzles/Cement Factory/WheelPuzzle.meta new file mode 100644 index 00000000..928d7cf2 --- /dev/null +++ b/Assets/Data/Puzzles/Cement Factory/WheelPuzzle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ddbd80b9db8e434e99e41bc7469f15a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/CementFactory.unity b/Assets/Scenes/Levels/CementFactory.unity index 60626a95..0e14231e 100644 --- a/Assets/Scenes/Levels/CementFactory.unity +++ b/Assets/Scenes/Levels/CementFactory.unity @@ -179,9 +179,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: 0f94d1cbd3735424ea37b6125154ed37, type: 2} + - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 2.34 + objectReference: {fileID: 0} + - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 2.26 + objectReference: {fileID: 0} + - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -3814864888780597609, guid: 635837bba54c842489bfb7995d1f8060, type: 3} - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Name - value: StaleCookie + value: CookieGear objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -248,6 +268,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: 45c190ffad50b994ba53f64a9838751d, type: 2} + - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2081361776707230073, guid: 1bcede31ffabad64a8867a05b4d648c9, type: 3} - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Name value: FancyBelt @@ -427,6 +459,189 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &472112131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 472112135} + - component: {fileID: 472112134} + - component: {fileID: 472112133} + - component: {fileID: 472112132} + m_Layer: 10 + m_Name: CardMAchine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &472112132 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472112131} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 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: 9.74, y: 3.31} + newSize: {x: 9.74, y: 3.31} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 11.72, y: 6.15} + m_EdgeRadius: 0 +--- !u!212 &472112133 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472112131} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -4627874047666434002, guid: ea3e0df8c84f4b943bbdb92a19b352a9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.74, y: 3.31} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &472112134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472112131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.ItemSlot + isOneTime: 0 + cooldown: -1 + characterToInteract: 2 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] + itemData: {fileID: 0} + iconRenderer: {fileID: 472112133} + slottedItemRenderers: [] + onItemSlotted: + m_PersistentCalls: + m_Calls: [] + onItemSlotRemoved: + m_PersistentCalls: + m_Calls: [] + onCorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onIncorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onForbiddenItemSlotted: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &472112135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472112131} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -40.47, y: -29.24, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &478035408 PrefabInstance: m_ObjectHideFlags: 0 @@ -487,9 +702,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: f5a6df00a3840924a8e5b5052a8c9b05, type: 2} + - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 4161055586114662636, guid: d1b842e0ffc3ba941b0fd8984ad389da, type: 3} - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Name - value: BikeWheel + value: MachineWheel objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -429102,6 +429329,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: itemData + value: + objectReference: {fileID: 11400000, guid: d0e8554a0463a924e803732e9209c92a, type: 2} + - target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5181623569918797395, guid: 8c07a6d07f45e0e4ca47e70270b14ce6, type: 3} - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3} propertyPath: m_Name value: FlowerPropeller @@ -429463,3 +429702,4 @@ SceneRoots: - {fileID: 136289266} - {fileID: 1639315574} - {fileID: 478035408} + - {fileID: 472112135} diff --git a/Assets/Settings/InteractionSettings.asset b/Assets/Settings/InteractionSettings.asset index 1eac67e5..049b12e8 100644 --- a/Assets/Settings/InteractionSettings.asset +++ b/Assets/Settings/InteractionSettings.asset @@ -56,3 +56,11 @@ MonoBehaviour: - {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} forbiddenItems: [] requiredItemCount: 0 + - slotItem: {fileID: 11400000, guid: ea20e322caf6eb441b580775bf1bf2c8, type: 2} + allowedItems: + - {fileID: 11400000, guid: 45c190ffad50b994ba53f64a9838751d, type: 2} + - {fileID: 11400000, guid: 0f94d1cbd3735424ea37b6125154ed37, type: 2} + - {fileID: 11400000, guid: d0e8554a0463a924e803732e9209c92a, type: 2} + - {fileID: 11400000, guid: f5a6df00a3840924a8e5b5052a8c9b05, type: 2} + forbiddenItems: [] + requiredItemCount: 4