diff --git a/Assets/Customer.meta b/Assets/Customer.meta new file mode 100644 index 0000000..d8f06b1 --- /dev/null +++ b/Assets/Customer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 826b01bc8d0299546822c85ae6c455d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Customer/Customer.prefab b/Assets/Customer/Customer.prefab new file mode 100644 index 0000000..2ac2054 --- /dev/null +++ b/Assets/Customer/Customer.prefab @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3582750950399662834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6564429125302780662} + m_Layer: 0 + m_Name: Customer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6564429125302780662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582750950399662834} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4680687846769661018} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5152009883973645233 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6564429125302780662} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.49999988 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.49999988 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.50000024 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5000001 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b89594669d2f8c447924e07361919e00, + type: 3} + propertyPath: m_Name + value: Customer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b89594669d2f8c447924e07361919e00, type: 3} +--- !u!4 &4680687846769661018 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b89594669d2f8c447924e07361919e00, + type: 3} + m_PrefabInstance: {fileID: 5152009883973645233} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/SellingPedestal/SellingPedestal.prefab.meta b/Assets/Customer/Customer.prefab.meta similarity index 74% rename from Assets/SellingPedestal/SellingPedestal.prefab.meta rename to Assets/Customer/Customer.prefab.meta index d3ab28b..cb8db7d 100644 --- a/Assets/SellingPedestal/SellingPedestal.prefab.meta +++ b/Assets/Customer/Customer.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 444f68f9ec6b58f499c51c9615500930 +guid: 0f23f6d8b788d7648a02641f9f5fd337 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Customer/CustomerController.cs b/Assets/Customer/CustomerController.cs new file mode 100644 index 0000000..7a7f818 --- /dev/null +++ b/Assets/Customer/CustomerController.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.AI; + +public class CustomerController : MonoBehaviour { + NavMeshAgent _navMeshAgent; + private Transform _target; + + private void Awake() { + _navMeshAgent = GetComponent(); + } + + private void Update() { + _target = PlayerController.Instance.transform; + _navMeshAgent.SetDestination(_target.position); + } +} \ No newline at end of file diff --git a/Assets/Customer/CustomerController.cs.meta b/Assets/Customer/CustomerController.cs.meta new file mode 100644 index 0000000..71156fe --- /dev/null +++ b/Assets/Customer/CustomerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b50833c62b5f59644a29221ccb3ffb18 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Customer/CustomerModel.blend b/Assets/Customer/CustomerModel.blend new file mode 100644 index 0000000..729f41a Binary files /dev/null and b/Assets/Customer/CustomerModel.blend differ diff --git a/Assets/Customer/CustomerModel.blend.meta b/Assets/Customer/CustomerModel.blend.meta new file mode 100644 index 0000000..f659c8f --- /dev/null +++ b/Assets/Customer/CustomerModel.blend.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: b89594669d2f8c447924e07361919e00 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD.meta b/Assets/HUD.meta new file mode 100644 index 0000000..d82a6aa --- /dev/null +++ b/Assets/HUD.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0806bd4943b21a641aad715966aa14c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD/ComputerScreen.meta b/Assets/HUD/ComputerScreen.meta new file mode 100644 index 0000000..2a42e7a --- /dev/null +++ b/Assets/HUD/ComputerScreen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7b4e677e8686b6439797dddb7b0451b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD/ComputerScreen/ComputerScreen.uxml b/Assets/HUD/ComputerScreen/ComputerScreen.uxml new file mode 100644 index 0000000..f9f1086 --- /dev/null +++ b/Assets/HUD/ComputerScreen/ComputerScreen.uxml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Assets/HUD/ComputerScreen/ComputerScreen.uxml.meta b/Assets/HUD/ComputerScreen/ComputerScreen.uxml.meta new file mode 100644 index 0000000..4f403e0 --- /dev/null +++ b/Assets/HUD/ComputerScreen/ComputerScreen.uxml.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 591d97b1528d4114b8513a09921d5537 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/HUD/ComputerScreen/SellEntry.uxml b/Assets/HUD/ComputerScreen/SellEntry.uxml new file mode 100644 index 0000000..0435285 --- /dev/null +++ b/Assets/HUD/ComputerScreen/SellEntry.uxml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Assets/HUD/ComputerScreen/SellEntry.uxml.meta b/Assets/HUD/ComputerScreen/SellEntry.uxml.meta new file mode 100644 index 0000000..d28fed0 --- /dev/null +++ b/Assets/HUD/ComputerScreen/SellEntry.uxml.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 21f89b660ed43af43ae41053197365d0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/HUD/ComputerScreen/prototype.png b/Assets/HUD/ComputerScreen/prototype.png new file mode 100644 index 0000000..e215b38 Binary files /dev/null and b/Assets/HUD/ComputerScreen/prototype.png differ diff --git a/Assets/HUD/ComputerScreen/prototype.png.meta b/Assets/HUD/ComputerScreen/prototype.png.meta new file mode 100644 index 0000000..8697230 --- /dev/null +++ b/Assets/HUD/ComputerScreen/prototype.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: ad0f7eac80567534ab59a2864d336793 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD/ItemSellScreen.meta b/Assets/HUD/ItemSellScreen.meta new file mode 100644 index 0000000..3a2a81f --- /dev/null +++ b/Assets/HUD/ItemSellScreen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06355872d664ee14ca5c9bc810297be7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD/ItemSellScreen/ItemSellScreen.asset b/Assets/HUD/ItemSellScreen/ItemSellScreen.asset new file mode 100644 index 0000000..01d711a --- /dev/null +++ b/Assets/HUD/ItemSellScreen/ItemSellScreen.asset @@ -0,0 +1,39 @@ +%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: 19101, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ItemSellScreen + m_EditorClassIdentifier: + themeUss: {fileID: -4733365628477956816, guid: 63ef76e262723ce4790482d0537e3d6b, + type: 3} + m_TargetTexture: {fileID: 0} + m_ScaleMode: 0 + m_ReferenceSpritePixelsPerUnit: 100 + m_Scale: 1 + m_ReferenceDpi: 120 + m_FallbackDpi: 96 + m_ReferenceResolution: {x: 1200, y: 800} + m_ScreenMatchMode: 0 + m_Match: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 + m_ClearDepthStencil: 1 + m_ClearColor: 0 + m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0} + m_DynamicAtlasSettings: + m_MinAtlasSize: 64 + m_MaxAtlasSize: 4096 + m_MaxSubTextureSize: 64 + m_ActiveFilters: -1 + m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} + m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + textSettings: {fileID: 0} diff --git a/Assets/HUD/ItemSellScreen/ItemSellScreen.asset.meta b/Assets/HUD/ItemSellScreen/ItemSellScreen.asset.meta new file mode 100644 index 0000000..d3b4748 --- /dev/null +++ b/Assets/HUD/ItemSellScreen/ItemSellScreen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c332681d8d6ed4b43a0db286dbc9ecd8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD/ItemSellScreen/ItemSellScreen.uss b/Assets/HUD/ItemSellScreen/ItemSellScreen.uss new file mode 100644 index 0000000..e69de29 diff --git a/Assets/HUD/ItemSellScreen/ItemSellScreen.uss.meta b/Assets/HUD/ItemSellScreen/ItemSellScreen.uss.meta new file mode 100644 index 0000000..76b240c --- /dev/null +++ b/Assets/HUD/ItemSellScreen/ItemSellScreen.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 878bef87725804d40b00535fec3d61f9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/HUD/ItemSellScreen/SellItem.uxml b/Assets/HUD/ItemSellScreen/SellItem.uxml new file mode 100644 index 0000000..ab55bf5 --- /dev/null +++ b/Assets/HUD/ItemSellScreen/SellItem.uxml @@ -0,0 +1,12 @@ + +