diff --git a/Assets/Images/buy.png b/Assets/Images/buy.png new file mode 100644 index 0000000000000000000000000000000000000000..b84f3b4d83e2e8c39921d5083c2d5cc20f56fa11 --- /dev/null +++ b/Assets/Images/buy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:723ec6268056a9f69ab04919c5193a115fd2231b86e783e95daa68aca6389f6b +size 218956 diff --git a/Assets/Images/buy.png.meta b/Assets/Images/buy.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..0aab64a6926502ffb7c0e832ad9217b63ab3ae1f --- /dev/null +++ b/Assets/Images/buy.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 874c2a5804c6ba74594a37fc0ebe4cb3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/indomaret.png b/Assets/Images/indomaret.png new file mode 100644 index 0000000000000000000000000000000000000000..8df7f646cd3e2bd27e73d93706601e5e3dd74c41 --- /dev/null +++ b/Assets/Images/indomaret.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baa11570433641e582df685397d426acda7ec3b513d72d970cdce2b99ac3e750 +size 1251940 diff --git a/Assets/Images/indomaret.png.meta b/Assets/Images/indomaret.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..6078517b4c255498d1be7c0dcfc6c8852c89f259 --- /dev/null +++ b/Assets/Images/indomaret.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 0b17ba3c1a5ccd84188d612b4c3bf88e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 8392b4d682cd5f63d384d56e9b003d0a05c30c1d..46ea7fda04320badb059c03ae5cccdbabd080d9e 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -453,7 +453,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 0.24705882} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -651,7 +651,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_AnchorMin.x @@ -659,7 +659,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_SizeDelta.x @@ -699,11 +699,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 104.55594 + value: 116.849 objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.0000030994 + value: -144.2668 objectReference: {fileID: 0} - target: {fileID: 7089227631265515529, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8417,7 +8417,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 10} + m_SizeDelta: {x: 233.698, y: 288.5336} m_Pivot: {x: 0, y: 0.5} --- !u!114 &611172472 MonoBehaviour: @@ -9143,12 +9143,12 @@ RectTransform: m_Children: - {fileID: 611172471} m_Father: {fileID: 1600989857} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -76.13869} - m_SizeDelta: {x: 0, y: -152.2774} + m_AnchorMax: {x: 0.66133004, y: 1} + m_AnchoredPosition: {x: 183.39, y: -76.786} + m_SizeDelta: {x: 366.78, y: -153.57} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &664980413 MonoBehaviour: @@ -9163,7 +9163,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 0.047058824} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9392,8 +9392,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 291, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 308.0229, y: 0.4668} + m_SizeDelta: {x: 277.6392, y: 49.0664} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &687750044 MonoBehaviour: @@ -9418,7 +9418,7 @@ MonoBehaviour: m_text: 'Gold : xxx' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9442,14 +9442,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 4 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -10297,8 +10297,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 9, y: -6.558} + m_SizeDelta: {x: 288.0306, y: 63.116} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &957799695 MonoBehaviour: @@ -10320,10 +10320,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Pet Shop + m_text: Indomaret m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10347,13 +10347,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 @@ -15980,7 +15980,7 @@ RectTransform: m_Children: - {fileID: 2033943899} m_Father: {fileID: 1600989857} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16498,6 +16498,79 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201325882} m_CullTransparentMesh: 1 +--- !u!1 &1236001609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1236001610} + - component: {fileID: 1236001612} + - component: {fileID: 1236001611} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1236001610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236001609} + 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: [] + m_Father: {fileID: 1600989857} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 392, y: 35} + m_SizeDelta: {x: 283.4091, y: 419.0659} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1236001611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236001609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 874c2a5804c6ba74594a37fc0ebe4cb3, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1236001612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236001609} + m_CullTransparentMesh: 1 --- !u!1 &1239888141 GameObject: m_ObjectHideFlags: 0 @@ -17750,8 +17823,8 @@ GameObject: m_Component: - component: {fileID: 1600989857} - component: {fileID: 1600989859} - - component: {fileID: 1600989858} - component: {fileID: 1600989860} + - component: {fileID: 1600989861} m_Layer: 5 m_Name: Shop m_TagString: Untagged @@ -17772,6 +17845,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 50798760} + - {fileID: 1236001610} - {fileID: 664980412} - {fileID: 1037602979} m_Father: {fileID: 1712252398} @@ -17782,36 +17856,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1600989858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600989856} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!222 &1600989859 CanvasRenderer: m_ObjectHideFlags: 0 @@ -17867,6 +17911,33 @@ MonoBehaviour: - {fileID: 1318841538} playerGold: {fileID: 624092177} player: {fileID: 624092162} +--- !u!114 &1600989861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600989856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 0b17ba3c1a5ccd84188d612b4c3bf88e, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &1602500900 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ScriptableObject/Bow.asset b/Assets/ScriptableObject/Bow.asset index 1c356ae25bafc75f58021ef495e07b82bbd18149..3524de0507b0833f5e19309a313b0a1af305a476 100644 --- a/Assets/ScriptableObject/Bow.asset +++ b/Assets/ScriptableObject/Bow.asset @@ -13,6 +13,5 @@ MonoBehaviour: m_Name: Bow m_EditorClassIdentifier: title: Bow - description: A long range weapon that increases its range based on amount of time - charged. + description: '"This is a good bow" - Legolas' price: 150 diff --git a/Assets/ScriptableObject/DPS Pet.asset b/Assets/ScriptableObject/DPS Pet.asset index e73aa4c3abb0f73cbcecb7d10e3b9c5968363a5e..b851df81b2da198916b163216605b74642a53a9f 100644 --- a/Assets/ScriptableObject/DPS Pet.asset +++ b/Assets/ScriptableObject/DPS Pet.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 578e1698ee6e8684fa5252488060b9fd, type: 3} m_Name: DPS Pet m_EditorClassIdentifier: - title: DPS Pet + title: Robo description: This Pet Can Attack Bruh price: 200 diff --git a/Assets/ScriptableObject/Healer Pet.asset b/Assets/ScriptableObject/Healer Pet.asset index 82ac18421aacbf2a1597af372ee65c839338192e..752ca88e11fbce24807301e8c2e29e4be44d7500 100644 --- a/Assets/ScriptableObject/Healer Pet.asset +++ b/Assets/ScriptableObject/Healer Pet.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 578e1698ee6e8684fa5252488060b9fd, type: 3} m_Name: Healer Pet m_EditorClassIdentifier: - title: Healer Pet + title: Okami description: This pet can heal, what a good boy price: 100 diff --git a/Assets/ScriptableObject/ShotGun.asset b/Assets/ScriptableObject/ShotGun.asset index 52117f943113f3d1757c7040d250dce01f4b4b84..1a59978a05db955df554f39065c20774f9120c40 100644 --- a/Assets/ScriptableObject/ShotGun.asset +++ b/Assets/ScriptableObject/ShotGun.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: ShotGun m_EditorClassIdentifier: title: Shotgun - description: A range gun that increases it's damage the closer you are to the target. + description: The closer you are, the harder they fall.. price: 100 diff --git a/Assets/ScriptableObject/Support Pet.asset b/Assets/ScriptableObject/Support Pet.asset index 4e7c9370027d120fb9552d6cc99134984cf72ada..3d4dcd3c066411abc830249f868cde5c97d79a85 100644 --- a/Assets/ScriptableObject/Support Pet.asset +++ b/Assets/ScriptableObject/Support Pet.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 578e1698ee6e8684fa5252488060b9fd, type: 3} m_Name: Support Pet m_EditorClassIdentifier: - title: Support Pet + title: Babang description: This pet can buff me, wtff price: 150 diff --git a/Assets/ScriptableObject/Sword.asset b/Assets/ScriptableObject/Sword.asset index 8b0764bb9312929e607dc81677a47e73830970ff..b2a869422022b8a3bcbd276a90658d181bfa5d5b 100644 --- a/Assets/ScriptableObject/Sword.asset +++ b/Assets/ScriptableObject/Sword.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: Sword m_EditorClassIdentifier: title: Sword - description: Meele Weapon, woosh. + description: Stab and they will die. price: 50 diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs index 17dc33c780cfa0e0ac0231238ab2a4d40a974b26..4fdb030894786beccfb8d08f67b3842a62c3c78d 100644 --- a/Assets/Scripts/Quest/QuestManager.cs +++ b/Assets/Scripts/Quest/QuestManager.cs @@ -54,7 +54,7 @@ public class QuestManager : MonoBehaviour QuestItem.QuestType.KILL, new List<float> { 5f, 4f }, new List<MonsterType> { MonsterType.ZOMBUNNY, MonsterType.ZOMBEAR }, - 100 + 150 )); questItems.Add(new QuestItem( "Kill 10 Zombunnies and 3 Hellephant", @@ -62,7 +62,7 @@ public class QuestManager : MonoBehaviour QuestItem.QuestType.KILL, new List<float> { 10f, 3f }, new List<MonsterType> { MonsterType.ZOMBUNNY, MonsterType.HELLEPHANT }, - 100 + 300 )); questItems.Add(new QuestItem( "Earn 500 Scores", @@ -70,7 +70,7 @@ public class QuestManager : MonoBehaviour QuestItem.QuestType.SCORE, new List<float> { 500f }, new List<MonsterType>(), - 100 + 1000 )); questItems.Add(new QuestItem( "Kill the Soul Eater", @@ -78,7 +78,7 @@ public class QuestManager : MonoBehaviour QuestItem.QuestType.KILL, new List<float> { 1f }, new List<MonsterType>() { MonsterType.SOULEATER }, - 100 + 0 )); if (activeQuestIdx == 0) {