From 6bead995ca9c17b97352650182e6801a7dc47201 Mon Sep 17 00:00:00 2001 From: FredTheNoob Date: Fri, 23 Apr 2021 15:22:56 +0200 Subject: [PATCH 1/3] Imported NPC sprites --- Assets/Assets/Sprites/NPCs/New.meta | 8 + Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png | 3 + .../Sprites/NPCs/New/NPC-guys_1.png.meta | 308 ++++++++++++++++++ Assets/Prefabs/NPCs/Howard Jackson.prefab | 236 ++++++++++++++ .../Prefabs/NPCs/Howard Jackson.prefab.meta | 7 + 5 files changed, 562 insertions(+) create mode 100644 Assets/Assets/Sprites/NPCs/New.meta create mode 100644 Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png create mode 100644 Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png.meta create mode 100644 Assets/Prefabs/NPCs/Howard Jackson.prefab create mode 100644 Assets/Prefabs/NPCs/Howard Jackson.prefab.meta diff --git a/Assets/Assets/Sprites/NPCs/New.meta b/Assets/Assets/Sprites/NPCs/New.meta new file mode 100644 index 0000000..b6062f7 --- /dev/null +++ b/Assets/Assets/Sprites/NPCs/New.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56e064962d562884fbbd628e68bc226e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png b/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png new file mode 100644 index 0000000..b5f4c00 --- /dev/null +++ b/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb78c32de061209cec98fbeeaedc8ce6fc8473cb296d93ec9c26c024dd849dd9 +size 3495 diff --git a/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png.meta b/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png.meta new file mode 100644 index 0000000..f4cc9eb --- /dev/null +++ b/Assets/Assets/Sprites/NPCs/New/NPC-guys_1.png.meta @@ -0,0 +1,308 @@ +fileFormatVersion: 2 +guid: 048b6a0437a1ec04b93183c74efa27d5 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1277984280957195404 + second: NPC-guys_1_0 + - first: + 213: 7680281804631263809 + second: NPC-guys_1_1 + - first: + 213: -3844898317935213836 + second: NPC-guys_1_2 + - first: + 213: -7910554759072263136 + second: NPC-guys_1_3 + - first: + 213: 5585967936376783418 + second: NPC-guys_1_4 + - first: + 213: -431921959235597646 + second: NPC-guys_1_5 + - first: + 213: 4335028576032019868 + second: NPC-guys_1_6 + - first: + 213: 107347068805488130 + second: NPC-guys_1_7 + 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 + 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: 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: NPC-guys_1_0 + rect: + serializedVersion: 2 + x: 0 + y: 96 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c849cf6beef4cb110800000000000000 + internalID: 1277984280957195404 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_1 + rect: + serializedVersion: 2 + x: 32 + y: 96 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 14a41f30c97d59a60800000000000000 + internalID: 7680281804631263809 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_2 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f289f9d95d24aac0800000000000000 + internalID: -3844898317935213836 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_3 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 024d839cb50183290800000000000000 + internalID: -7910554759072263136 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_4 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a32c57e0e38558d40800000000000000 + internalID: 5585967936376783418 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_5 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2ba42193441810af0800000000000000 + internalID: -431921959235597646 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_6 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c955e8d958d192c30800000000000000 + internalID: 4335028576032019868 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: NPC-guys_1_7 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 20e94df179f5d7100800000000000000 + internalID: 107347068805488130 + vertices: [] + indices: + edges: [] + weights: [] + 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/NPCs/Howard Jackson.prefab b/Assets/Prefabs/NPCs/Howard Jackson.prefab new file mode 100644 index 0000000..3c496f9 --- /dev/null +++ b/Assets/Prefabs/NPCs/Howard Jackson.prefab @@ -0,0 +1,236 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8869736918704472830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736918704472803} + - component: {fileID: 8869736918704472802} + - component: {fileID: 8869736918704472801} + - component: {fileID: 8869736918704472800} + - component: {fileID: 8869736918704472831} + m_Layer: 0 + m_Name: Howard Jackson + m_TagString: NPC + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736918704472803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.71, y: -4.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8869736919006412014} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736918704472802 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: -6407856728415304752, guid: e431a57911ccd404cafe6b3f0b9ae23a, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 4.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &8869736918704472801 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.02513504, y: 0.37012482} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.4375, y: 0.96875} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.049114, y: 3.3409462} + m_EdgeRadius: 0 +--- !u!61 &8869736918704472800 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.002152443, y: 0.04667616} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.4375, y: 0.96875} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31277657, y: 0.09272671} + m_EdgeRadius: 0 +--- !u!114 &8869736918704472831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53c988d41ce465c428b8577f9032cfca, type: 3} + m_Name: + m_EditorClassIdentifier: + speakerName: + dialogue: + - {fileID: 0} +--- !u!1 &8869736919006412013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736919006412014} + - component: {fileID: 8869736919006412015} + m_Layer: 0 + m_Name: PlayerShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736919006412014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004, y: 0.022, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_Children: [] + m_Father: {fileID: 8869736918704472803} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736919006412015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4f22b1add8652a6418b89553654d884d, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/NPCs/Howard Jackson.prefab.meta b/Assets/Prefabs/NPCs/Howard Jackson.prefab.meta new file mode 100644 index 0000000..1430641 --- /dev/null +++ b/Assets/Prefabs/NPCs/Howard Jackson.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46c4bc39840c0d342b17b8185d980b87 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From a1be9cbd58299c189536b1497ccd256e5f11e2b6 Mon Sep 17 00:00:00 2001 From: FredTheNoob Date: Fri, 23 Apr 2021 16:03:43 +0200 Subject: [PATCH 2/3] Added faction and gang leaders and made prefabs of them --- .../Materials.meta => NPCs/Faction.meta} | 2 +- .../Sprites/NPCs/Faction/Fraction_guys_2.png | 3 + .../NPCs/Faction/Fraction_guys_2.png.meta | 212 ++++++++++++++++ Assets/Prefabs/NPCs/Factions.meta | 8 + .../Prefabs/NPCs/Factions/The Red Wolves.meta | 8 + .../The Red Wolves/Felix Keith.prefab | 236 ++++++++++++++++++ .../The Red Wolves/Felix Keith.prefab.meta | 7 + .../The Red Wolves}/Howard Jackson.prefab | 6 +- .../Howard Jackson.prefab.meta | 0 .../Prefabs/NPCs/Factions/The Whitelaws.meta | 8 + .../The Whitelaws/Glenn McConnell.prefab | 235 +++++++++++++++++ .../The Whitelaws/Glenn McConnell.prefab.meta | 7 + .../The Whitelaws/Norman Wilcox.prefab | 236 ++++++++++++++++++ .../The Whitelaws/Norman Wilcox.prefab.meta | 7 + 14 files changed, 971 insertions(+), 4 deletions(-) rename Assets/Assets/Sprites/{Trees/New Trees/Materials.meta => NPCs/Faction.meta} (77%) create mode 100644 Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png create mode 100644 Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png.meta create mode 100644 Assets/Prefabs/NPCs/Factions.meta create mode 100644 Assets/Prefabs/NPCs/Factions/The Red Wolves.meta create mode 100644 Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab create mode 100644 Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab.meta rename Assets/Prefabs/NPCs/{ => Factions/The Red Wolves}/Howard Jackson.prefab (97%) rename Assets/Prefabs/NPCs/{ => Factions/The Red Wolves}/Howard Jackson.prefab.meta (100%) create mode 100644 Assets/Prefabs/NPCs/Factions/The Whitelaws.meta create mode 100644 Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab create mode 100644 Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab.meta create mode 100644 Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab create mode 100644 Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab.meta diff --git a/Assets/Assets/Sprites/Trees/New Trees/Materials.meta b/Assets/Assets/Sprites/NPCs/Faction.meta similarity index 77% rename from Assets/Assets/Sprites/Trees/New Trees/Materials.meta rename to Assets/Assets/Sprites/NPCs/Faction.meta index 7743879..c66e606 100644 --- a/Assets/Assets/Sprites/Trees/New Trees/Materials.meta +++ b/Assets/Assets/Sprites/NPCs/Faction.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8de0e920bf431eb48b29835029649602 +guid: 736f73c442ee514428773fa94d135306 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png b/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png new file mode 100644 index 0000000..fa45baf --- /dev/null +++ b/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:810b3fb5ef8beeb34caf133ab1d1c50c3cbea4b0852b53326681d70c7396bdcb +size 2370 diff --git a/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png.meta b/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png.meta new file mode 100644 index 0000000..f9f74a0 --- /dev/null +++ b/Assets/Assets/Sprites/NPCs/Faction/Fraction_guys_2.png.meta @@ -0,0 +1,212 @@ +fileFormatVersion: 2 +guid: 67545d8ee9eadf144b5b51d0842047af +TextureImporter: + internalIDToNameTable: + - first: + 213: -599526959103216316 + second: Fraction_guys_2_0 + - first: + 213: 8383160043679203915 + second: Fraction_guys_2_1 + - first: + 213: -775823654674050781 + second: Fraction_guys_2_2 + - first: + 213: 261045557953935233 + second: Fraction_guys_2_3 + 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 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Fraction_guys_2_0 + rect: + serializedVersion: 2 + x: 0 + y: 32 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 445f169386d0ea7f0800000000000000 + internalID: -599526959103216316 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fraction_guys_2_1 + rect: + serializedVersion: 2 + x: 32 + y: 32 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b424fb2d4a7f65470800000000000000 + internalID: 8383160043679203915 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fraction_guys_2_2 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 321dece1f78bb35f0800000000000000 + internalID: -775823654674050781 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fraction_guys_2_3 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 187b9084d8b6f9300800000000000000 + internalID: 261045557953935233 + vertices: [] + indices: + edges: [] + weights: [] + 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/NPCs/Factions.meta b/Assets/Prefabs/NPCs/Factions.meta new file mode 100644 index 0000000..c52ce57 --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69aa314be220b4846b1b76ae21e1c9f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPCs/Factions/The Red Wolves.meta b/Assets/Prefabs/NPCs/Factions/The Red Wolves.meta new file mode 100644 index 0000000..5e50c1c --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Red Wolves.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5a1901504d856c4d9f96eb110611ef5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab new file mode 100644 index 0000000..18612c6 --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab @@ -0,0 +1,236 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8869736918704472830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736918704472803} + - component: {fileID: 8869736918704472802} + - component: {fileID: 8869736918704472801} + - component: {fileID: 8869736918704472800} + - component: {fileID: 8869736918704472831} + m_Layer: 0 + m_Name: Felix Keith + m_TagString: NPC + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736918704472803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.71, y: -4.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8869736919006412014} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736918704472802 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: -5208492080999914422, guid: 106579823e5e4dc43ab969f2012047a2, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 4.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &8869736918704472801 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.02513504, y: 0.37012482} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.049114, y: 3.3409462} + m_EdgeRadius: 0 +--- !u!61 &8869736918704472800 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.002152443, y: 0.04667616} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31277657, y: 0.09272671} + m_EdgeRadius: 0 +--- !u!114 &8869736918704472831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53c988d41ce465c428b8577f9032cfca, type: 3} + m_Name: + m_EditorClassIdentifier: + speakerName: + dialogue: + - {fileID: 0} +--- !u!1 &8869736919006412013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736919006412014} + - component: {fileID: 8869736919006412015} + m_Layer: 0 + m_Name: PlayerShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736919006412014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004, y: 0.022, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_Children: [] + m_Father: {fileID: 8869736918704472803} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736919006412015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4f22b1add8652a6418b89553654d884d, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab.meta b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab.meta new file mode 100644 index 0000000..1b33b4b --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Felix Keith.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f40f5271cf2aae94eb1f4bc0d5fc0393 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPCs/Howard Jackson.prefab b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Howard Jackson.prefab similarity index 97% rename from Assets/Prefabs/NPCs/Howard Jackson.prefab rename to Assets/Prefabs/NPCs/Factions/The Red Wolves/Howard Jackson.prefab index 3c496f9..f03cde5 100644 --- a/Assets/Prefabs/NPCs/Howard Jackson.prefab +++ b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Howard Jackson.prefab @@ -74,7 +74,7 @@ SpriteRenderer: m_SortingLayerID: -171121271 m_SortingLayer: 4 m_SortingOrder: 0 - m_Sprite: {fileID: -6407856728415304752, guid: e431a57911ccd404cafe6b3f0b9ae23a, + m_Sprite: {fileID: 8383160043679203915, guid: 67545d8ee9eadf144b5b51d0842047af, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -103,7 +103,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0} - oldSize: {x: 0.4375, y: 0.96875} + oldSize: {x: 1, y: 1} newSize: {x: 3.45, y: 4.48} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -129,7 +129,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0} - oldSize: {x: 0.4375, y: 0.96875} + oldSize: {x: 1, y: 1} newSize: {x: 3.45, y: 4.48} adaptiveTilingThreshold: 0.5 drawMode: 0 diff --git a/Assets/Prefabs/NPCs/Howard Jackson.prefab.meta b/Assets/Prefabs/NPCs/Factions/The Red Wolves/Howard Jackson.prefab.meta similarity index 100% rename from Assets/Prefabs/NPCs/Howard Jackson.prefab.meta rename to Assets/Prefabs/NPCs/Factions/The Red Wolves/Howard Jackson.prefab.meta diff --git a/Assets/Prefabs/NPCs/Factions/The Whitelaws.meta b/Assets/Prefabs/NPCs/Factions/The Whitelaws.meta new file mode 100644 index 0000000..b018851 --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Whitelaws.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811f30b27df0c8b45923e556e27c36f7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab new file mode 100644 index 0000000..09b8bd0 --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab @@ -0,0 +1,235 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8869736918704472830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736918704472803} + - component: {fileID: 8869736918704472802} + - component: {fileID: 8869736918704472801} + - component: {fileID: 8869736918704472800} + - component: {fileID: 8869736918704472831} + m_Layer: 0 + m_Name: Glenn McConnell + m_TagString: NPC + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736918704472803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.71, y: -4.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8869736919006412014} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736918704472802 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 261045557953935233, guid: 67545d8ee9eadf144b5b51d0842047af, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 4.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &8869736918704472801 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.02513504, y: 0.37012482} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.049114, y: 3.3409462} + m_EdgeRadius: 0 +--- !u!61 &8869736918704472800 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.002152443, y: 0.04667616} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31277657, y: 0.09272671} + m_EdgeRadius: 0 +--- !u!114 &8869736918704472831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53c988d41ce465c428b8577f9032cfca, type: 3} + m_Name: + m_EditorClassIdentifier: + speakerName: + dialogue: + - {fileID: 0} +--- !u!1 &8869736919006412013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736919006412014} + - component: {fileID: 8869736919006412015} + m_Layer: 0 + m_Name: PlayerShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736919006412014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004, y: 0.022, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_Children: [] + m_Father: {fileID: 8869736918704472803} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736919006412015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4f22b1add8652a6418b89553654d884d, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab.meta b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab.meta new file mode 100644 index 0000000..0c1259e --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Glenn McConnell.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 101772989c3083049bdaa29dad496ed5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab new file mode 100644 index 0000000..1e000d8 --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab @@ -0,0 +1,236 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8869736918704472830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736918704472803} + - component: {fileID: 8869736918704472802} + - component: {fileID: 8869736918704472801} + - component: {fileID: 8869736918704472800} + - component: {fileID: 8869736918704472831} + m_Layer: 0 + m_Name: Norman Wilcox + m_TagString: NPC + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736918704472803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.71, y: -4.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8869736919006412014} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736918704472802 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 2818839909832254381, guid: 106579823e5e4dc43ab969f2012047a2, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 4.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &8869736918704472801 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.02513504, y: 0.37012482} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.049114, y: 3.3409462} + m_EdgeRadius: 0 +--- !u!61 &8869736918704472800 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.002152443, y: 0.04667616} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31277657, y: 0.09272671} + m_EdgeRadius: 0 +--- !u!114 &8869736918704472831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736918704472830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53c988d41ce465c428b8577f9032cfca, type: 3} + m_Name: + m_EditorClassIdentifier: + speakerName: + dialogue: + - {fileID: 0} +--- !u!1 &8869736919006412013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869736919006412014} + - component: {fileID: 8869736919006412015} + m_Layer: 0 + m_Name: PlayerShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8869736919006412014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004, y: 0.022, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_Children: [] + m_Father: {fileID: 8869736918704472803} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8869736919006412015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8869736919006412013} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4f22b1add8652a6418b89553654d884d, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab.meta b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab.meta new file mode 100644 index 0000000..b9ddccc --- /dev/null +++ b/Assets/Prefabs/NPCs/Factions/The Whitelaws/Norman Wilcox.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f14eba1a7daa8dc40bff686e550ab119 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 0dfa79f1dc4a079fd993a023290ba02851c42281 Mon Sep 17 00:00:00 2001 From: BenjaminHvidberg Date: Fri, 23 Apr 2021 16:05:14 +0200 Subject: [PATCH 3/3] More quests added --- Assets/Prefabs/NPCs/Johhan.prefab | 235 +++++++++++++ Assets/Prefabs/NPCs/Johhan.prefab.meta | 7 + .../Quest Icons/exclamation-mark.prefab | 6 +- .../Prefabs/Quest Icons/question-mark.prefab | 6 +- Assets/Prefabs/Tent.prefab | 151 +++++++++ Assets/Prefabs/Tent.prefab.meta | 7 + ...KUP.unity => Game World ---- BACKUP.unity} | 319 +++++++++--------- ...meta => Game World ---- BACKUP.unity.meta} | 2 +- Assets/Scenes/Game World.unity | 310 +++++++++-------- .../Scriptable Objects/Quests/01Quest/1.asset | 4 +- .../Scriptable Objects/Quests/02Quest/1.asset | 6 +- .../Scriptable Objects/Quests/03Quest/1.asset | 4 +- .../Scriptable Objects/Quests/04Quest/1.asset | 17 +- .../Quests/04Quest/Dialogue/1_01.asset | 12 +- .../Scriptable Objects/Quests/05Quest/1.asset | 23 ++ .../Quests/05Quest/1.asset.meta | 8 + .../Quests/05Quest/Dialogue.meta | 8 + .../Quests/05Quest/Dialogue/1_01.asset | 15 + .../Quests/05Quest/Dialogue/1_01.asset.meta | 8 + .../Scriptable Objects/Quests/06Quest/1.asset | 26 ++ .../Quests/06Quest/1.asset.meta | 8 + .../Quests/06Quest/Dialogue.meta | 8 + .../Quests/06Quest/Dialogue/1_01.asset | 33 ++ .../Quests/06Quest/Dialogue/1_01.asset.meta | 8 + Assets/Scripts/Inventory/Controller.cs | 1 + Assets/Scripts/Quest/QuestManager.cs | 13 +- Assets/Scripts/Quest/Types/DialogueQuest.cs | 5 +- Assets/Scripts/Quest/Types/Quest.cs | 2 + Assets/Scripts/Quest/Types/TurnInQuest.cs | 25 ++ .../Scripts/Quest/Types/TurnInQuest.cs.meta | 11 + ProjectSettings/TagManager.asset | 3 + 31 files changed, 944 insertions(+), 347 deletions(-) create mode 100644 Assets/Prefabs/NPCs/Johhan.prefab create mode 100644 Assets/Prefabs/NPCs/Johhan.prefab.meta create mode 100644 Assets/Prefabs/Tent.prefab create mode 100644 Assets/Prefabs/Tent.prefab.meta rename Assets/Scenes/{Game World ----- BACKUP.unity => Game World ---- BACKUP.unity} (99%) rename Assets/Scenes/{Game World ----- BACKUP.unity.meta => Game World ---- BACKUP.unity.meta} (74%) create mode 100644 Assets/Scriptable Objects/Quests/05Quest/1.asset create mode 100644 Assets/Scriptable Objects/Quests/05Quest/1.asset.meta create mode 100644 Assets/Scriptable Objects/Quests/05Quest/Dialogue.meta create mode 100644 Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset create mode 100644 Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset.meta create mode 100644 Assets/Scriptable Objects/Quests/06Quest/1.asset create mode 100644 Assets/Scriptable Objects/Quests/06Quest/1.asset.meta create mode 100644 Assets/Scriptable Objects/Quests/06Quest/Dialogue.meta create mode 100644 Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset create mode 100644 Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset.meta create mode 100644 Assets/Scripts/Quest/Types/TurnInQuest.cs create mode 100644 Assets/Scripts/Quest/Types/TurnInQuest.cs.meta diff --git a/Assets/Prefabs/NPCs/Johhan.prefab b/Assets/Prefabs/NPCs/Johhan.prefab new file mode 100644 index 0000000..3cffa25 --- /dev/null +++ b/Assets/Prefabs/NPCs/Johhan.prefab @@ -0,0 +1,235 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &363026534015779117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 363026534015779118} + - component: {fileID: 363026534015779119} + m_Layer: 0 + m_Name: PlayerShadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &363026534015779118 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534015779117} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.004, y: 0.022, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1.6} + m_Children: [] + m_Father: {fileID: 363026534250479395} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &363026534015779119 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534015779117} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4f22b1add8652a6418b89553654d884d, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &363026534250479422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 363026534250479395} + - component: {fileID: 363026534250479394} + - component: {fileID: 363026534250479393} + - component: {fileID: 363026534250479392} + - component: {fileID: 363026534250479423} + m_Layer: 0 + m_Name: Johhan + m_TagString: NPC + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &363026534250479395 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534250479422} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 59.54, y: -44.66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 363026534015779118} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &363026534250479394 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534250479422} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 2818839909832254381, guid: 106579823e5e4dc43ab969f2012047a2, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.45, y: 4.48} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &363026534250479393 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534250479422} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.02513504, y: 0.37012482} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.049114, y: 3.3409462} + m_EdgeRadius: 0 +--- !u!61 &363026534250479392 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534250479422} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0022594929, y: 0.07455444} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 3.45, y: 4.48} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.31386423, y: 0.15475178} + m_EdgeRadius: 0 +--- !u!114 &363026534250479423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363026534250479422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53c988d41ce465c428b8577f9032cfca, type: 3} + m_Name: + m_EditorClassIdentifier: + speakerName: Johhan + dialogue: [] diff --git a/Assets/Prefabs/NPCs/Johhan.prefab.meta b/Assets/Prefabs/NPCs/Johhan.prefab.meta new file mode 100644 index 0000000..a25cdd7 --- /dev/null +++ b/Assets/Prefabs/NPCs/Johhan.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6d1d7a0433a64a845bcaf78c335b92e0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Quest Icons/exclamation-mark.prefab b/Assets/Prefabs/Quest Icons/exclamation-mark.prefab index 38cde82..4a304b1 100644 --- a/Assets/Prefabs/Quest Icons/exclamation-mark.prefab +++ b/Assets/Prefabs/Quest Icons/exclamation-mark.prefab @@ -150,9 +150,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 - m_SortingOrder: 0 + m_SortingLayerID: -1479296743 + m_SortingLayer: 7 + m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: e2b7575909e60584d831d68a09c1addc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Quest Icons/question-mark.prefab b/Assets/Prefabs/Quest Icons/question-mark.prefab index acc3d60..69ca823 100644 --- a/Assets/Prefabs/Quest Icons/question-mark.prefab +++ b/Assets/Prefabs/Quest Icons/question-mark.prefab @@ -150,9 +150,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 - m_SortingOrder: 0 + m_SortingLayerID: -1479296743 + m_SortingLayer: 7 + m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: e8417ce4bf626354ea53490f770cbc6e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Tent.prefab b/Assets/Prefabs/Tent.prefab new file mode 100644 index 0000000..4aeba32 --- /dev/null +++ b/Assets/Prefabs/Tent.prefab @@ -0,0 +1,151 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1177651255775636475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1177651255775636478} + - component: {fileID: 1177651255775636479} + - component: {fileID: 1177651255775636472} + - component: {fileID: 1177651255775636473} + - component: {fileID: 1177651255775636474} + m_Layer: 0 + m_Name: Tent + m_TagString: Tent + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1177651255775636478 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177651255775636475} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 28.9, y: 136.64, z: 0} + m_LocalScale: {x: 3, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1177651255775636479 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177651255775636475} + 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_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: -171121271 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 2a28d28517a525349803e6b8868de8f8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!61 &1177651255775636472 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177651255775636475} + 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.12536308} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.64, y: 0.64} + newSize: {x: 0.64, y: 0.64} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5289657, y: 0.25072616} + m_EdgeRadius: 0 +--- !u!61 &1177651255775636473 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177651255775636475} + 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.07283567} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.64, y: 0.64} + newSize: {x: 0.64, y: 0.64} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.33784014, y: 0.33432862} + m_EdgeRadius: 0 +--- !u!114 &1177651255775636474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177651255775636475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 462d75607c031254aaa74299d6d84411, type: 3} + m_Name: + m_EditorClassIdentifier: + sleepDark: {fileID: 0} diff --git a/Assets/Prefabs/Tent.prefab.meta b/Assets/Prefabs/Tent.prefab.meta new file mode 100644 index 0000000..e83ee44 --- /dev/null +++ b/Assets/Prefabs/Tent.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d565bd0a56c30674abdac795927fc8ee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game World ----- BACKUP.unity b/Assets/Scenes/Game World ---- BACKUP.unity similarity index 99% rename from Assets/Scenes/Game World ----- BACKUP.unity rename to Assets/Scenes/Game World ---- BACKUP.unity index 034e509..bda7865 100644 --- a/Assets/Scenes/Game World ----- BACKUP.unity +++ b/Assets/Scenes/Game World ---- BACKUP.unity @@ -1536,8 +1536,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: 2961308609734862752, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -118843,155 +118843,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 356782405} m_PrefabAsset: {fileID: 0} ---- !u!1 &360566320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 360566325} - - component: {fileID: 360566324} - - component: {fileID: 360566323} - - component: {fileID: 360566322} - - component: {fileID: 360566321} - m_Layer: 0 - m_Name: Tent - m_TagString: Tent - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &360566321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 462d75607c031254aaa74299d6d84411, type: 3} - m_Name: - m_EditorClassIdentifier: - sleepDark: {fileID: 1440379816} ---- !u!61 &360566322 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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.07283567} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.33784014, y: 0.33432862} - m_EdgeRadius: 0 ---- !u!61 &360566323 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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.12536308} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.5289657, y: 0.25072616} - m_EdgeRadius: 0 ---- !u!212 &360566324 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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_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: -171121271 - m_SortingLayer: 4 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 2a28d28517a525349803e6b8868de8f8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.64, y: 0.64} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 1 ---- !u!4 &360566325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 28.9, y: 136.64, z: 0} - m_LocalScale: {x: 3, y: 3, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &363683428 PrefabInstance: m_ObjectHideFlags: 0 @@ -254341,8 +254192,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: -5276079345572088469, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -581629,8 +581480,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: -1524488722481930940, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -584715,8 +584566,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: 5721401630156375268, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -1164355,6 +1164206,9 @@ MonoBehaviour: - {fileID: 11400000, guid: 58f304c353e879445b339dfe65bbf8b3, type: 2} - {fileID: 11400000, guid: 3cfe0f8411500d247b31222fa69850d4, type: 2} - {fileID: 11400000, guid: c30271e6a75555a41aa6d29f8fc69346, type: 2} + - {fileID: 11400000, guid: a626fbe50b28a374493f472d35c02128, type: 2} + - {fileID: 11400000, guid: 4761827e5dd69c146a252e95dde13d75, type: 2} + - {fileID: 11400000, guid: 42aaf27d12222194b90edf07b4dad9a8, type: 2} isStoryComplete: 0 --- !u!4 &2037259303 Transform: @@ -1166933,6 +1166787,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d4c613f3e064b04681d2a6e7b57a9a5, type: 3} +--- !u!1001 &1177651256092616139 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1177651255775636474, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: sleepDark + value: + objectReference: {fileID: 1440379816} + - target: {fileID: 1177651255775636475, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_Name + value: Tent + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.x + value: 28.9 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.y + value: 136.64 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d565bd0a56c30674abdac795927fc8ee, type: 3} --- !u!1001 &4346921440313474169 PrefabInstance: m_ObjectHideFlags: 0 @@ -1167197,17 +1167125,17 @@ PrefabInstance: - target: {fileID: 7151649308056299379, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} propertyPath: m_RootOrder - value: 22 + value: 21 objectReference: {fileID: 0} - target: {fileID: 7151649308056299379, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} propertyPath: m_LocalPosition.x - value: 12.89 + value: 24.02 objectReference: {fileID: 0} - target: {fileID: 7151649308056299379, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} propertyPath: m_LocalPosition.y - value: 111.54 + value: 116.44 objectReference: {fileID: 0} - target: {fileID: 7151649308056299379, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} @@ -1167251,6 +1167179,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} +--- !u!1001 &8351095695727392148 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_RootOrder + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 59.54 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.y + value: -44.66 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479422, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_Name + value: Johhan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6d1d7a0433a64a845bcaf78c335b92e0, type: 3} --- !u!1001 &8869736918794422448 PrefabInstance: m_ObjectHideFlags: 0 @@ -1167296,7 +1167293,7 @@ PrefabInstance: - target: {fileID: 8869736918704472803, guid: d3ca4b56c31c1c04a943cc9b57d7a653, type: 3} propertyPath: m_RootOrder - value: 21 + value: 22 objectReference: {fileID: 0} - target: {fileID: 8869736918704472803, guid: d3ca4b56c31c1c04a943cc9b57d7a653, type: 3} diff --git a/Assets/Scenes/Game World ----- BACKUP.unity.meta b/Assets/Scenes/Game World ---- BACKUP.unity.meta similarity index 74% rename from Assets/Scenes/Game World ----- BACKUP.unity.meta rename to Assets/Scenes/Game World ---- BACKUP.unity.meta index 9c8c04e..95e3708 100644 --- a/Assets/Scenes/Game World ----- BACKUP.unity.meta +++ b/Assets/Scenes/Game World ---- BACKUP.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ca011ebd058094418a4511137dd5431 +guid: 0180b25aa915e0e448a8eb2e7adede66 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Game World.unity b/Assets/Scenes/Game World.unity index 8f0854c..bda7865 100644 --- a/Assets/Scenes/Game World.unity +++ b/Assets/Scenes/Game World.unity @@ -1536,8 +1536,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: 2961308609734862752, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -118843,155 +118843,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 356782405} m_PrefabAsset: {fileID: 0} ---- !u!1 &360566320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 360566325} - - component: {fileID: 360566324} - - component: {fileID: 360566323} - - component: {fileID: 360566322} - - component: {fileID: 360566321} - m_Layer: 0 - m_Name: Tent - m_TagString: Tent - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &360566321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 462d75607c031254aaa74299d6d84411, type: 3} - m_Name: - m_EditorClassIdentifier: - sleepDark: {fileID: 1440379816} ---- !u!61 &360566322 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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.07283567} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.33784014, y: 0.33432862} - m_EdgeRadius: 0 ---- !u!61 &360566323 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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.12536308} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0} - oldSize: {x: 0.64, y: 0.64} - newSize: {x: 0.64, y: 0.64} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.5289657, y: 0.25072616} - m_EdgeRadius: 0 ---- !u!212 &360566324 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - 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_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: -171121271 - m_SortingLayer: 4 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 2a28d28517a525349803e6b8868de8f8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.64, y: 0.64} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 1 ---- !u!4 &360566325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360566320} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 28.9, y: 136.64, z: 0} - m_LocalScale: {x: 3, y: 3, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &363683428 PrefabInstance: m_ObjectHideFlags: 0 @@ -254341,8 +254192,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: -5276079345572088469, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -581629,8 +581480,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: -1524488722481930940, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -584715,8 +584566,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -357847345 - m_SortingLayer: 6 + m_SortingLayerID: 198962491 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: 5721401630156375268, guid: 9eb2a546f707a514589d334d6ece787e, type: 3} @@ -1164356,6 +1164207,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 3cfe0f8411500d247b31222fa69850d4, type: 2} - {fileID: 11400000, guid: c30271e6a75555a41aa6d29f8fc69346, type: 2} - {fileID: 11400000, guid: a626fbe50b28a374493f472d35c02128, type: 2} + - {fileID: 11400000, guid: 4761827e5dd69c146a252e95dde13d75, type: 2} + - {fileID: 11400000, guid: 42aaf27d12222194b90edf07b4dad9a8, type: 2} isStoryComplete: 0 --- !u!4 &2037259303 Transform: @@ -1166934,6 +1166787,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d4c613f3e064b04681d2a6e7b57a9a5, type: 3} +--- !u!1001 &1177651256092616139 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1177651255775636474, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: sleepDark + value: + objectReference: {fileID: 1440379816} + - target: {fileID: 1177651255775636475, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_Name + value: Tent + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.x + value: 28.9 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.y + value: 136.64 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1177651255775636478, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d565bd0a56c30674abdac795927fc8ee, type: 3} --- !u!1001 &4346921440313474169 PrefabInstance: m_ObjectHideFlags: 0 @@ -1167252,6 +1167179,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} +--- !u!1001 &8351095695727392148 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_RootOrder + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 59.54 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.y + value: -44.66 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479395, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 363026534250479422, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + propertyPath: m_Name + value: Johhan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6d1d7a0433a64a845bcaf78c335b92e0, type: 3} --- !u!1001 &8869736918794422448 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scriptable Objects/Quests/01Quest/1.asset b/Assets/Scriptable Objects/Quests/01Quest/1.asset index 3176de9..da274d5 100644 --- a/Assets/Scriptable Objects/Quests/01Quest/1.asset +++ b/Assets/Scriptable Objects/Quests/01Quest/1.asset @@ -16,9 +16,11 @@ MonoBehaviour: Description: Objective: Use your 'Intereact' button RewardMoney: 10 - NPC: {fileID: 3218615963001515889, guid: 9f565a371242136498da1a7475150932, type: 3} + rewardItem: {fileID: 0} QuestIcon: {fileID: 2600030651870002690, guid: 5c3f7d2c29861c243a9807cb729b3731, type: 3} + questLocation: {fileID: 3218615963001515889, guid: 9f565a371242136498da1a7475150932, + type: 3} dialogue: - {fileID: 11400000, guid: ffdb7f49536c7c141a585822d71f29ab, type: 2} sfxClip: greeting1b diff --git a/Assets/Scriptable Objects/Quests/02Quest/1.asset b/Assets/Scriptable Objects/Quests/02Quest/1.asset index b873424..a9f2872 100644 --- a/Assets/Scriptable Objects/Quests/02Quest/1.asset +++ b/Assets/Scriptable Objects/Quests/02Quest/1.asset @@ -14,11 +14,13 @@ MonoBehaviour: m_EditorClassIdentifier: Name: An old friend Description: - Objective: Go to Rustpass and speek with Joseph + Objective: Go to Rustpass and speek with Frank RewardMoney: 500 - NPC: {fileID: 7151649308056299374, guid: 738f328b548460d4c9c2883a0d2358a2, type: 3} + rewardItem: {fileID: 0} QuestIcon: {fileID: 2600030651870002690, guid: 5c3f7d2c29861c243a9807cb729b3731, type: 3} + questLocation: {fileID: 7151649308056299374, guid: 738f328b548460d4c9c2883a0d2358a2, + type: 3} dialogue: - {fileID: 11400000, guid: c36d21dc02879644f9c822431498facc, type: 2} sfxClip: greeting1a diff --git a/Assets/Scriptable Objects/Quests/03Quest/1.asset b/Assets/Scriptable Objects/Quests/03Quest/1.asset index 63df040..c888506 100644 --- a/Assets/Scriptable Objects/Quests/03Quest/1.asset +++ b/Assets/Scriptable Objects/Quests/03Quest/1.asset @@ -16,7 +16,9 @@ MonoBehaviour: Description: Objective: Hunt for a bear in a nearby forest RewardMoney: 450 - rewardItem: {fileID: 0} + rewardItem: {fileID: 11400000, guid: cedffd5d71c218649a1e293f99580616, type: 2} + QuestIcon: {fileID: 2600030651870002690, guid: 5c3f7d2c29861c243a9807cb729b3731, + type: 3} target: {fileID: 9219011335627013502, guid: e97ef96c656d2604eb1262022113373b, type: 3} followUpDialogue: - {fileID: 11400000, guid: 4e422f9453d7eee45bb2535da6e1d36f, type: 2} diff --git a/Assets/Scriptable Objects/Quests/04Quest/1.asset b/Assets/Scriptable Objects/Quests/04Quest/1.asset index df7469b..9ba2b62 100644 --- a/Assets/Scriptable Objects/Quests/04Quest/1.asset +++ b/Assets/Scriptable Objects/Quests/04Quest/1.asset @@ -9,15 +9,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55fbe4534e5a4c65ba7e618b0c863782, type: 3} + m_Script: {fileID: 11500000, guid: ad6fcab5af39d974c94eabe4350b2f8a, type: 3} m_Name: 1 m_EditorClassIdentifier: Name: A decent sale Description: - Objective: 'Sell your bear skin ' - RewardMoney: 0 + Objective: Sell your bear skin to the Butcher + RewardMoney: 150 rewardItem: {fileID: 0} - NPC: {fileID: 0} - QuestIcon: {fileID: 0} - dialogue: [] - sfxClip: + QuestIcon: {fileID: 8169610128998381828, guid: 3992dee08b9089e4c9afe5677dfb4676, + type: 3} + questLocation: {fileID: 8869736918704472830, guid: d3ca4b56c31c1c04a943cc9b57d7a653, + type: 3} + TurnInItem: {fileID: 11400000, guid: cedffd5d71c218649a1e293f99580616, type: 2} + followUpDialogue: + - {fileID: 11400000, guid: 29bb07d583b8d0a4a82a4b6ad5b62599, type: 2} diff --git a/Assets/Scriptable Objects/Quests/04Quest/Dialogue/1_01.asset b/Assets/Scriptable Objects/Quests/04Quest/Dialogue/1_01.asset index 033a2d7..04c3d1e 100644 --- a/Assets/Scriptable Objects/Quests/04Quest/Dialogue/1_01.asset +++ b/Assets/Scriptable Objects/Quests/04Quest/Dialogue/1_01.asset @@ -12,4 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8310a2ec8d9cd944bac84067caefb102, type: 3} m_Name: 1_01 m_EditorClassIdentifier: - dialogueSegments: [] + dialogueSegments: + - speakerName: Butcher + dialogueText: That skin looks pretty rough, did you shoot it with a shotgun or + something? + choices: [] + - speakerName: Will + dialogueText: Do I look like a full time hunter to you? + choices: [] + - speakerName: Butcher + dialogueText: "I suppose not, I\u2019ll give you $150 for that crap" + choices: [] diff --git a/Assets/Scriptable Objects/Quests/05Quest/1.asset b/Assets/Scriptable Objects/Quests/05Quest/1.asset new file mode 100644 index 0000000..6df1b8e --- /dev/null +++ b/Assets/Scriptable Objects/Quests/05Quest/1.asset @@ -0,0 +1,23 @@ +%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: 1e3ad25c5b317af499541a7b9921b142, type: 3} + m_Name: 1 + m_EditorClassIdentifier: + Name: Rest in place + Description: + Objective: Sleep through the night in your tent + RewardMoney: 50 + rewardItem: {fileID: 0} + QuestIcon: {fileID: 2600030651870002690, guid: 5c3f7d2c29861c243a9807cb729b3731, + type: 3} + questLocation: {fileID: 1177651255775636475, guid: d565bd0a56c30674abdac795927fc8ee, + type: 3} diff --git a/Assets/Scriptable Objects/Quests/05Quest/1.asset.meta b/Assets/Scriptable Objects/Quests/05Quest/1.asset.meta new file mode 100644 index 0000000..f40d6eb --- /dev/null +++ b/Assets/Scriptable Objects/Quests/05Quest/1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4761827e5dd69c146a252e95dde13d75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Quests/05Quest/Dialogue.meta b/Assets/Scriptable Objects/Quests/05Quest/Dialogue.meta new file mode 100644 index 0000000..bd14bed --- /dev/null +++ b/Assets/Scriptable Objects/Quests/05Quest/Dialogue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abcc32e7a32dc2b4d90fbf4c8014391a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset b/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset new file mode 100644 index 0000000..033a2d7 --- /dev/null +++ b/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset @@ -0,0 +1,15 @@ +%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: 8310a2ec8d9cd944bac84067caefb102, type: 3} + m_Name: 1_01 + m_EditorClassIdentifier: + dialogueSegments: [] diff --git a/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset.meta b/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset.meta new file mode 100644 index 0000000..fa12d0e --- /dev/null +++ b/Assets/Scriptable Objects/Quests/05Quest/Dialogue/1_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9325fd6a0645a6a4e8601d67d66f4160 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Quests/06Quest/1.asset b/Assets/Scriptable Objects/Quests/06Quest/1.asset new file mode 100644 index 0000000..54a9356 --- /dev/null +++ b/Assets/Scriptable Objects/Quests/06Quest/1.asset @@ -0,0 +1,26 @@ +%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: 55fbe4534e5a4c65ba7e618b0c863782, type: 3} + m_Name: 1 + m_EditorClassIdentifier: + Name: A new Start + Description: + Objective: Visit Johhan in Crooksnag + RewardMoney: 250 + rewardItem: {fileID: 0} + QuestIcon: {fileID: 2600030651870002690, guid: 5c3f7d2c29861c243a9807cb729b3731, + type: 3} + questLocation: {fileID: 363026534250479422, guid: 6d1d7a0433a64a845bcaf78c335b92e0, + type: 3} + dialogue: + - {fileID: 11400000, guid: eee5399fc5088cd4c988679b5ab97b7d, type: 2} + sfxClip: greeting2b diff --git a/Assets/Scriptable Objects/Quests/06Quest/1.asset.meta b/Assets/Scriptable Objects/Quests/06Quest/1.asset.meta new file mode 100644 index 0000000..7f06bc8 --- /dev/null +++ b/Assets/Scriptable Objects/Quests/06Quest/1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42aaf27d12222194b90edf07b4dad9a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Quests/06Quest/Dialogue.meta b/Assets/Scriptable Objects/Quests/06Quest/Dialogue.meta new file mode 100644 index 0000000..1040f16 --- /dev/null +++ b/Assets/Scriptable Objects/Quests/06Quest/Dialogue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b33959aaa37641d4b9f1b54eb77bdc0c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset b/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset new file mode 100644 index 0000000..db47480 --- /dev/null +++ b/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset @@ -0,0 +1,33 @@ +%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: 8310a2ec8d9cd944bac84067caefb102, type: 3} + m_Name: 1_01 + m_EditorClassIdentifier: + dialogueSegments: + - speakerName: Johhan + dialogueText: So, you made it to Crooksnag. + choices: [] + - speakerName: Will + dialogueText: Yea, was a though road down here. + choices: [] + - speakerName: Johhan + dialogueText: Anyway. We need you to head out into the Desert. + choices: [] + - speakerName: Johhan + dialogueText: Find Oxriver, and speak with Felix Keith + choices: [] + - speakerName: + dialogueText: + choices: [] + - speakerName: + dialogueText: + choices: [] diff --git a/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset.meta b/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset.meta new file mode 100644 index 0000000..4b5b9ef --- /dev/null +++ b/Assets/Scriptable Objects/Quests/06Quest/Dialogue/1_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eee5399fc5088cd4c988679b5ab97b7d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Inventory/Controller.cs b/Assets/Scripts/Inventory/Controller.cs index 5a59c59..79e5597 100644 --- a/Assets/Scripts/Inventory/Controller.cs +++ b/Assets/Scripts/Inventory/Controller.cs @@ -122,6 +122,7 @@ public void AddItem(Item item) //// NON Stackable items Inventory[FindFirstEmpty()] = new ItemStack(item); } + RefreshUI(); } /// diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs index 6907689..517dad7 100644 --- a/Assets/Scripts/Quest/QuestManager.cs +++ b/Assets/Scripts/Quest/QuestManager.cs @@ -41,7 +41,7 @@ private void Awake() public void CompleteActive() { - if (IsDialogueQuest()) Destroy(CurrQuestIcon); + if (AllQuests[ActiveQuest].QuestIcon != null) Destroy(CurrQuestIcon); if (AllQuests[ActiveQuest].RewardMoney != 0) MoneyManager.instance.AddMoney(AllQuests[ActiveQuest].RewardMoney); if (AllQuests[ActiveQuest].rewardItem != null) Inventory.Controller.instance.AddItem(AllQuests[ActiveQuest].rewardItem); ActiveQuest++; @@ -77,12 +77,13 @@ private void SetUI() { try { - var questToDisplay = (dynamic) AllQuests[ActiveQuest]; - - if (IsDialogueQuest()) + Quest questToDisplay = AllQuests[ActiveQuest]; + + if (questToDisplay.QuestIcon != null && questToDisplay.questLocation != null) { - GameObject g = Instantiate(questToDisplay.QuestIcon, questToDisplay.NPC.transform.position, questToDisplay.NPC.transform.rotation); - g.transform.parent = GameObject.Find(questToDisplay.NPC.name).transform; + GameObject g = Instantiate(questToDisplay.QuestIcon, questToDisplay.questLocation.transform.position, questToDisplay.questLocation.transform.rotation); + g.transform.parent = GameObject.Find(questToDisplay.questLocation.name).transform; + CurrQuestIcon = g; } diff --git a/Assets/Scripts/Quest/Types/DialogueQuest.cs b/Assets/Scripts/Quest/Types/DialogueQuest.cs index a127c30..efdfea4 100644 --- a/Assets/Scripts/Quest/Types/DialogueQuest.cs +++ b/Assets/Scripts/Quest/Types/DialogueQuest.cs @@ -10,9 +10,6 @@ namespace QuestSystem public class DialogueQuest : Quest { // - - - PROPERTIES - - - - public GameObject NPC; - - public GameObject QuestIcon; public Dialogue[] dialogue; public string sfxClip; @@ -22,7 +19,7 @@ public class DialogueQuest : Quest public override void CheckCompleteConditions(Collider2D _trigger, GameObject _caller) { if (_trigger == null) return; - if (_trigger.name == NPC.name) NPC.GetComponent().TriggerDialogue(null); + if (_trigger.name == base.questLocation.name) base.questLocation.GetComponent().TriggerDialogue(null); } } } \ No newline at end of file diff --git a/Assets/Scripts/Quest/Types/Quest.cs b/Assets/Scripts/Quest/Types/Quest.cs index dc15456..3b8a8ab 100644 --- a/Assets/Scripts/Quest/Types/Quest.cs +++ b/Assets/Scripts/Quest/Types/Quest.cs @@ -10,6 +10,8 @@ public class Quest : ScriptableObject public string Objective; public int RewardMoney = 0; public Item rewardItem; + public GameObject QuestIcon; + public GameObject questLocation; public virtual void CheckCompleteConditions(Collider2D _trigger, GameObject _caller) {} } diff --git a/Assets/Scripts/Quest/Types/TurnInQuest.cs b/Assets/Scripts/Quest/Types/TurnInQuest.cs new file mode 100644 index 0000000..e167b61 --- /dev/null +++ b/Assets/Scripts/Quest/Types/TurnInQuest.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Inventory; + +namespace QuestSystem +{ + [System.Serializable] + [CreateAssetMenu(fileName = "TurnInQuest", menuName = "Quest/TurnInQuest", order = 0)] + public class TurnInQuest : Quest + { + // - - - PROPERTIES - - - + public Item TurnInItem; + public Dialogue[] followUpDialogue; + + public override void CheckCompleteConditions(Collider2D _trigger, GameObject _caller) + { + if (TurnInItem != null) + { + Inventory.Controller.instance.RemoveItems(1, TurnInItem.name); + QuestManager.instance.CompleteActive(); + } + } + } +} diff --git a/Assets/Scripts/Quest/Types/TurnInQuest.cs.meta b/Assets/Scripts/Quest/Types/TurnInQuest.cs.meta new file mode 100644 index 0000000..c76942d --- /dev/null +++ b/Assets/Scripts/Quest/Types/TurnInQuest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad6fcab5af39d974c94eabe4350b2f8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 47a4eea..132d493 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -69,3 +69,6 @@ TagManager: - name: Particles uniqueID: 3937119951 locked: 0 + - name: Quest Icons + uniqueID: 2815670553 + locked: 0