diff --git a/.gitignore b/.gitignore index c345fe0..e1d4125 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,5 @@ sysinfo.txt ._* .Spotlight-V100 .Trashes -Icon? ehthumbs.db Thumbs.db \ No newline at end of file diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm deleted file mode 100644 index d3ccba9..0000000 Binary files a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm and /dev/null differ diff --git a/Assets/Models/ammo_box.blend.meta b/Assets/Models/ammo_box.blend.meta index 7762fe3..c8c5a01 100644 --- a/Assets/Models/ammo_box.blend.meta +++ b/Assets/Models/ammo_box.blend.meta @@ -1,5 +1,4 @@ fileFormatVersion: 2 -guid: 05f9e7c8dc10f7641bb783f57e00471b ModelImporter: serializedVersion: 19300 internalIDToNameTable: [] diff --git a/Assets/Models/cabin.blend b/Assets/Models/cabin.blend index 3814dcb..aa12cdc 100644 Binary files a/Assets/Models/cabin.blend and b/Assets/Models/cabin.blend differ diff --git a/Assets/Models/cabin.blend1 b/Assets/Models/cabin.blend1 index 4785078..3814dcb 100644 Binary files a/Assets/Models/cabin.blend1 and b/Assets/Models/cabin.blend1 differ diff --git a/Assets/Models/hammer.blend b/Assets/Models/hammer.blend new file mode 100644 index 0000000..064af1e Binary files /dev/null and b/Assets/Models/hammer.blend differ diff --git a/Assets/Models/hammer.blend.meta b/Assets/Models/hammer.blend.meta new file mode 100644 index 0000000..2d10545 --- /dev/null +++ b/Assets/Models/hammer.blend.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 88f7f4632151cd5459f7ecc28fa722d4 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sun.prefab b/Assets/Prefabs/Sun.prefab new file mode 100644 index 0000000..f7d341e --- /dev/null +++ b/Assets/Prefabs/Sun.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8150345748488139401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8150345748488139403} + - component: {fileID: 8150345748488139402} + - component: {fileID: 5536355216553759363} + m_Layer: 0 + m_Name: Sun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8150345748488139403 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8150345748488139401} + m_LocalRotation: {x: 0.843895, y: -0.22584268, z: 0.1264212, w: 0.46995115} + m_LocalPosition: {x: -112.32495, y: 76.357414, z: 2.6889114} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!108 &8150345748488139402 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8150345748488139401} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &5536355216553759363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8150345748488139401} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19bf5b78376a3b94882c1e26afe7c633, type: 3} + m_Name: + m_EditorClassIdentifier: + sunSpeed: 5 diff --git a/Assets/Prefabs/Sun.prefab.meta b/Assets/Prefabs/Sun.prefab.meta new file mode 100644 index 0000000..726a448 --- /dev/null +++ b/Assets/Prefabs/Sun.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5bdffdb5058d5e458831042023d3abc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test-JonatanRek.unity b/Assets/Scenes/Test-JonatanRek.unity index d37d030..d061c3e 100644 --- a/Assets/Scenes/Test-JonatanRek.unity +++ b/Assets/Scenes/Test-JonatanRek.unity @@ -237,10 +237,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: -112.32495, y: 66.41281, z: -37.77597} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1649308860} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &827899963 stripped @@ -317,7 +317,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453, type: 3} @@ -425,7 +425,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1272265849 GameObject: @@ -457,6 +457,51 @@ Transform: m_Father: {fileID: 827899965} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1649308858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649308860} + - component: {fileID: 1649308859} + m_Layer: 0 + m_Name: Sun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1649308859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649308858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19bf5b78376a3b94882c1e26afe7c633, type: 3} + m_Name: + m_EditorClassIdentifier: + sunSpeed: 30 +--- !u!4 &1649308860 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649308858} + 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_Children: + - {fileID: 705507995} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1753935063 GameObject: m_ObjectHideFlags: 0 @@ -531,7 +576,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1838907804 PrefabInstance: @@ -578,7 +623,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 18a9d16f45ee7544190e7437a99f97de, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 18a9d16f45ee7544190e7437a99f97de, type: 3} @@ -687,7 +732,7 @@ PrefabInstance: - target: {fileID: 5004747464968674621, guid: b4e392e2cdb417b4c8bdf8e683bceb9b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5004747464968674621, guid: b4e392e2cdb417b4c8bdf8e683bceb9b, type: 3} @@ -931,7 +976,7 @@ PrefabInstance: - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} @@ -1035,7 +1080,7 @@ PrefabInstance: - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} diff --git a/Assets/Scripts/DayManager.cs b/Assets/Scripts/DayManager.cs new file mode 100644 index 0000000..42b75b6 --- /dev/null +++ b/Assets/Scripts/DayManager.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DayManager : MonoBehaviour +{ + public int sunSpeed = 30; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + this.gameObject.transform.Rotate(new Vector3(sunSpeed * Time.deltaTime, 0, 0)); + } + +} diff --git a/Assets/Scripts/DayManager.cs.meta b/Assets/Scripts/DayManager.cs.meta new file mode 100644 index 0000000..35a0af8 --- /dev/null +++ b/Assets/Scripts/DayManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19bf5b78376a3b94882c1e26afe7c633 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Icons/Ammo.png b/Assets/Sprites/Icons/Ammo.png new file mode 100644 index 0000000..140a299 Binary files /dev/null and b/Assets/Sprites/Icons/Ammo.png differ diff --git a/Assets/Sprites/Icons/Wood.png b/Assets/Sprites/Icons/Wood.png new file mode 100644 index 0000000..1e9dbc4 Binary files /dev/null and b/Assets/Sprites/Icons/Wood.png differ diff --git a/Assets/Sprites/Icons/interaction.png b/Assets/Sprites/Icons/interaction.png new file mode 100644 index 0000000..598f4db Binary files /dev/null and b/Assets/Sprites/Icons/interaction.png differ diff --git a/Assets/Sprites/Icons/interaction.png.meta b/Assets/Sprites/Icons/interaction.png.meta new file mode 100644 index 0000000..a8c268d --- /dev/null +++ b/Assets/Sprites/Icons/interaction.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 53484c385de7af24a87aa73334775b28 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: