diff --git a/Assets/Import/ShopItems.meta b/Assets/Import/ShopItems.meta
new file mode 100644
index 0000000000000000000000000000000000000000..aa63fa0321df29ec1e1f45e99b4284dfae870a4d
--- /dev/null
+++ b/Assets/Import/ShopItems.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0fa86256944d45fd80ee68b09861e74
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Import/ShopItems/Materials.meta b/Assets/Import/ShopItems/Materials.meta
new file mode 100644
index 0000000000000000000000000000000000000000..16c127596ef12c6b7865d18847c0032d4fbafdaa
--- /dev/null
+++ b/Assets/Import/ShopItems/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8839b9c9d6e7d4f5ab87b285eeaf7ef9
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Import/ShopItems/Materials/tent.mat b/Assets/Import/ShopItems/Materials/tent.mat
new file mode 100644
index 0000000000000000000000000000000000000000..2dfa815b23e28f07c8009ef9bd076d5d1ab5d21b
--- /dev/null
+++ b/Assets/Import/ShopItems/Materials/tent.mat
@@ -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: tent
+ 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: 298871ba85dfb4f438691211390e7233, 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: []
diff --git a/Assets/Import/ShopItems/Materials/tent.mat.meta b/Assets/Import/ShopItems/Materials/tent.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2e6db7e0b66c8a902473d5721b39c8812bceeef0
--- /dev/null
+++ b/Assets/Import/ShopItems/Materials/tent.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fcb19921ffb90470a84bb3c4c2cafa09
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Import/ShopItems/boot.png b/Assets/Import/ShopItems/boot.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1b9934b351d397607f615487a219ab16110f4ad
Binary files /dev/null and b/Assets/Import/ShopItems/boot.png differ
diff --git a/Assets/Import/ShopItems/boot.png.meta b/Assets/Import/ShopItems/boot.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0fa9400f1f014d646ac22c960db0b43eeee0f80c
--- /dev/null
+++ b/Assets/Import/ShopItems/boot.png.meta
@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 57d725b4e29e741e394213c45d3b534f
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ 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
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 0
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 16
+ 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
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Import/ShopItems/tent.png b/Assets/Import/ShopItems/tent.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a868a434c9cd4cfb82803e2fbf460b04d44e077
Binary files /dev/null and b/Assets/Import/ShopItems/tent.png differ
diff --git a/Assets/Import/ShopItems/tent.png.meta b/Assets/Import/ShopItems/tent.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0c536f2dc4c876b3277b7c7e2bb549b41ff83c6a
--- /dev/null
+++ b/Assets/Import/ShopItems/tent.png.meta
@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 298871ba85dfb4f438691211390e7233
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ 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
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 0
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 16
+ 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
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index 6446a754944001a3a6f48ab0f939f96932463fff..111bc3d985e6bc1fa1fa25274f1d4a09a2448b7e 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -71,8 +71,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 1477538445
+ m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: -5665453922479426850, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -162,3 +162,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
inventory: {fileID: 0}
sellItem: {fileID: 0}
+ itemForSale: []
diff --git a/Assets/Prefabs/boot.prefab b/Assets/Prefabs/boot.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..3bb7a2638ecb14bd01c415303d72895505cf1ab2
--- /dev/null
+++ b/Assets/Prefabs/boot.prefab
@@ -0,0 +1,116 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2774278137072603174
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5279711519346267970}
+ - component: {fileID: 2626598804687612988}
+ - component: {fileID: -6447971014712979970}
+ m_Layer: 0
+ m_Name: boot
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5279711519346267970
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2774278137072603174}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -1.38, y: -1.28, z: 0}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2626598804687612988
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2774278137072603174}
+ 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: 2045603605
+ m_SortingLayer: 3
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 57d725b4e29e741e394213c45d3b534f, 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!60 &-6447971014712979970
+PolygonCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2774278137072603174}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ 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: 2, y: 2}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Points:
+ m_Paths:
+ - - {x: -0.1875, y: 0.875}
+ - {x: -1, y: 0.0625}
+ - {x: -1, y: -0.875}
+ - {x: 1, y: -0.875}
+ - {x: 1, y: 0.75}
+ - {x: 0.875, y: 0.875}
diff --git a/Assets/Prefabs/boot.prefab.meta b/Assets/Prefabs/boot.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8fc5e80d7599b5b876c470d8396301bd376cdb67
--- /dev/null
+++ b/Assets/Prefabs/boot.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf11893c496404d8292ea5623a2a0f32
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/tent.prefab b/Assets/Prefabs/tent.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..5230643859e96cd08fbf0f7031b57f4a1054d089
--- /dev/null
+++ b/Assets/Prefabs/tent.prefab
@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5026905876964516861
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2594227356551208515}
+ - component: {fileID: 7604435187626042244}
+ - component: {fileID: 3737178317091432126}
+ m_Layer: 0
+ m_Name: tent
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2594227356551208515
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5026905876964516861}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -24.63, y: 1.39, z: 0}
+ m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7604435187626042244
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5026905876964516861}
+ 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: 2045603605
+ m_SortingLayer: 3
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 298871ba85dfb4f438691211390e7233, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 10, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!60 &3737178317091432126
+PolygonCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5026905876964516861}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ 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: 10, y: 10}
+ newSize: {x: 10, y: 10}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Points:
+ m_Paths:
+ - - {x: 4.625, y: -3.6875}
+ - {x: 4.125, y: -3.5}
+ - {x: 4.625, y: 0.4375}
+ - {x: 4.625, y: 2.75}
+ - {x: 3.5625, y: 2.6875}
+ - {x: 0.5, y: 5}
+ - {x: -0.3125, y: 5}
+ - {x: -3.9375, y: 2.625}
+ - {x: -4.4375, y: 2.5625}
+ - {x: -4.625, y: 2.375}
+ - {x: -4.625, y: 1.125}
+ - {x: -4.125, y: 0.9375}
+ - {x: -4.625, y: -2.5625}
+ - {x: -4.625, y: -5}
+ - {x: 4.625, y: -5}
diff --git a/Assets/Prefabs/tent.prefab.meta b/Assets/Prefabs/tent.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..05098fbd51f66a26b44f97781cf870029d42330a
--- /dev/null
+++ b/Assets/Prefabs/tent.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7bc98558919f34933bf9602e33e1bead
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity
index 0cc81851dd84b57c6724bf59157779adccc1c447..23bbba4f5dead25383aa59a0b6bd8cf5b3c651ff 100644
--- a/Assets/Scenes/Valentin.unity
+++ b/Assets/Scenes/Valentin.unity
@@ -165,7 +165,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &461386753
GameObject:
@@ -267,6 +267,11 @@ MonoBehaviour:
smoothing: 0.9
maxPosition: {x: 21, y: 6}
minPosition: {x: -20, y: -9}
+--- !u!4 &534957867 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ m_PrefabInstance: {fileID: 8964184068704032841}
+ m_PrefabAsset: {fileID: 0}
--- !u!114 &571909601 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1778026432316727230, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
@@ -1885,7 +1890,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_AnchorMax.x
@@ -1969,6 +1974,136 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+--- !u!1001 &919370876
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 534957867}
+ m_Modifications:
+ - target: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_Name
+ value: boot
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1.1991286
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.4369512
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+--- !u!1001 &1002429038
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_Name
+ value: TentShop
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 11.31
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -7.23
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: sellItem
+ value:
+ objectReference: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: inventory
+ value:
+ objectReference: {fileID: 145845055}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.data[0]
+ value:
+ objectReference: {fileID: 1829571093}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
--- !u!114 &1624355757 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9185901236199156311, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
@@ -1980,6 +2115,63 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f33cf3cdc7d9b2043bb8287db4107514, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &1692888187
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 534957867}
+ m_Modifications:
+ - target: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_Name
+ value: boot (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.4369512
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5279711519346267970, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
--- !u!1 &1733108886
GameObject:
m_ObjectHideFlags: 0
@@ -2031,7 +2223,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: fcb19921ffb90470a84bb3c4c2cafa09, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -17223,6 +17415,11 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
m_PrefabInstance: {fileID: 892848102}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1829571093 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5026905876964516861, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ m_PrefabInstance: {fileID: 2108906282564238190}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1883734374
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17248,7 +17445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 1206561506436264879, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_LocalPosition.x
@@ -17340,8 +17537,70 @@ Transform:
- {fileID: 749746676}
- {fileID: 1733108887}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1947323023 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ m_PrefabInstance: {fileID: 1002429038}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2108906282564238190
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1947323023}
+ m_Modifications:
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -4.4299984
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2594227356551208515, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5026905876964516861, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
+ propertyPath: m_Name
+ value: tent
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
--- !u!1001 &8964184068704032841
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17383,7 +17642,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_Name
- value: Shop
+ value: ShoeShop
objectReference: {fileID: 0}
- target: {fileID: 6595684778732623722, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_Points.m_Paths.Array.data[0].Array.size
@@ -17431,15 +17690,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_LocalPosition.x
- value: -15.07
+ value: 7.15
objectReference: {fileID: 0}
- target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_LocalPosition.y
- value: 2.21
+ value: 7.53
objectReference: {fileID: 0}
- target: {fileID: 6996933207471714739, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_LocalPosition.z
@@ -17481,5 +17740,17 @@ PrefabInstance:
propertyPath: inventory
value:
objectReference: {fileID: 145845055}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.data[0]
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.data[1]
+ value:
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index b231183c15417beeae016d578dde2466712bbaa0..02688f57e16e72b3b437debae7baf7a355a2a25a 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -7,6 +7,7 @@ public class Shopping : MonoBehaviour
private bool playerInRange;
public Inventory inventory;
public Item sellItem;
+ public GameObject[] itemForSale;
// Start is called before the first frame update
void Start()
@@ -21,6 +22,7 @@ public class Shopping : MonoBehaviour
{
Dialog.instance.setSituation("Marchand");
inventory.addItem(sellItem);
+ Destroy(itemForSale[0]);
Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire");
}
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 3a7049d9a50add3781b7b978afd037cd354c0e5f..e3d9edbb39f9585c259ba05b6f79335e6a18076b 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -47,3 +47,6 @@ TagManager:
- name: Player
uniqueID: 2491136167
locked: 0
+ - name: Item
+ uniqueID: 2045603605
+ locked: 0