diff --git a/Assets/Prefabs/craftable.prefab b/Assets/Prefabs/craftable.prefab new file mode 100644 index 0000000..7a6c564 --- /dev/null +++ b/Assets/Prefabs/craftable.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1447051553155802074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1447051553155802073} + - component: {fileID: 1447051553155802079} + - component: {fileID: 1447051553155802072} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1447051553155802073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553155802074} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1447051553851155087} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1447051553155802079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553155802074} + m_CullTransparentMesh: 1 +--- !u!114 &1447051553155802072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553155802074} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &1447051553616085063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1447051553616085062} + - component: {fileID: 1447051553616085060} + - component: {fileID: 1447051553616085061} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1447051553616085062 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553616085063} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1447051553851155087} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1447051553616085060 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553616085063} + m_CullTransparentMesh: 1 +--- !u!114 &1447051553616085061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553616085063} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &1447051553851155080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1447051553851155087} + m_Layer: 5 + m_Name: craftable + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1447051553851155087 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447051553851155080} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1447051553616085062} + - {fileID: 1447051553155802073} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: 0} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/craftable.prefab.meta b/Assets/Prefabs/craftable.prefab.meta new file mode 100644 index 0000000..9a0abbe --- /dev/null +++ b/Assets/Prefabs/craftable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9897f5d0e84917342828166d8fce361c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/pnlRow.prefab b/Assets/Prefabs/pnlRow.prefab new file mode 100644 index 0000000..636ae47 --- /dev/null +++ b/Assets/Prefabs/pnlRow.prefab @@ -0,0 +1,695 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &446751357112826781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446751357112826780} + - component: {fileID: 446751357112826770} + - component: {fileID: 446751357112826771} + m_Layer: 5 + m_Name: pnlRow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &446751357112826780 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446751357112826781} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 446751358458768031} + - {fileID: 1308252015215422576} + - {fileID: 1308252015087236655} + - {fileID: 1308252015330383217} + - {fileID: 1308252014669242144} + - {fileID: 1308252015176588512} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &446751357112826770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446751357112826781} + m_CullTransparentMesh: 1 +--- !u!114 &446751357112826771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446751357112826781} + 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: 0.392} + 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!1001 &446751357218930095 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable (4) + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.65 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &1308252014669242144 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 446751357218930095} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &446751357338064032 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable (2) + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &1308252015087236655 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 446751357338064032} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &446751358671747070 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable (3) + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.65 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &1308252015330383217 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 446751358671747070} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &446751358819962623 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable (1) + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &1308252015215422576 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 446751358819962623} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &446751358858804847 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable (5) + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.95 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &1308252015176588512 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 446751358858804847} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1308252016113485840 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 446751357112826780} + m_Modifications: + - target: {fileID: 1447051553851155080, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Name + value: craftable + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9897f5d0e84917342828166d8fce361c, type: 3} +--- !u!224 &446751358458768031 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1447051553851155087, guid: 9897f5d0e84917342828166d8fce361c, type: 3} + m_PrefabInstance: {fileID: 1308252016113485840} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/pnlRow.prefab.meta b/Assets/Prefabs/pnlRow.prefab.meta new file mode 100644 index 0000000..a7d9c98 --- /dev/null +++ b/Assets/Prefabs/pnlRow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 251de64efdce3a94db298feacc9b5f87 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/craftables.json b/Assets/Resources/craftables.json new file mode 100644 index 0000000..25dc430 --- /dev/null +++ b/Assets/Resources/craftables.json @@ -0,0 +1,90 @@ +{ + "0":{ + "name":"Weapon", + "icon":"Items/Craft_Weapon", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":2 + }, + "1":{ + "name":"Wood", + "amount":2 + }, + "2":{ + "name":"Stone", + "amount":3 + } + } + }, + "1":{ + "name":"Shield", + "icon":"Items/Craft_Shield", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":2 + }, + "1":{ + "name":"Wood", + "amount":4 + } + } + }, + "2":{ + "name":"Helmet", + "icon":"Items/Craft_Helmet", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":2 + }, + "1":{ + "name":"Wood", + "amount":3 + } + } + }, + "3":{ + "name":"Chestplate", + "icon":"Items/Craft_Chestplate", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":4 + }, + "1":{ + "name":"Wood", + "amount":4 + } + } + }, + "4":{ + "name":"Shoulders", + "icon":"Items/Craft_Shoulders", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":2 + }, + "1":{ + "name":"Wood", + "amount":2 + } + } + }, + "5":{ + "name":"Boots", + "icon":"Items/Craft_Boots", + "recipe":{ + "0":{ + "name":"Slimeball", + "amount":2 + }, + "1":{ + "name":"Wood", + "amount":2 + } + } + } +} \ No newline at end of file diff --git a/Assets/Resources/craftables.json.meta b/Assets/Resources/craftables.json.meta new file mode 100644 index 0000000..88ab59f --- /dev/null +++ b/Assets/Resources/craftables.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 089eb0a90946fb646a44915c4d219f9a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 256a600..37a0394 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -5905,7 +5905,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1456932137} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6877,6 +6877,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476405302} m_CullTransparentMesh: 1 +--- !u!1 &482051291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482051292} + - component: {fileID: 482051295} + - component: {fileID: 482051294} + - component: {fileID: 482051293} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &482051292 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482051291} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1519684670} + m_Father: {fileID: 2029777068} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &482051293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482051291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &482051294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482051291} + 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: 10917, 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 &482051295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482051291} + m_CullTransparentMesh: 1 --- !u!1 &490276337 GameObject: m_ObjectHideFlags: 0 @@ -7399,6 +7489,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 521488630} m_CullTransparentMesh: 1 +--- !u!1 &535653091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535653092} + - component: {fileID: 535653094} + - component: {fileID: 535653093} + m_Layer: 5 + m_Name: txtTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &535653092 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535653091} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 542158800} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.9} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &535653093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535653091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Crafting +--- !u!222 &535653094 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535653091} + m_CullTransparentMesh: 1 --- !u!1 &536741946 GameObject: m_ObjectHideFlags: 0 @@ -7477,6 +7646,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 536741946} m_CullTransparentMesh: 1 +--- !u!1 &542158799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542158800} + - component: {fileID: 542158802} + - component: {fileID: 542158801} + m_Layer: 5 + m_Name: Crafting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &542158800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542158799} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 535653092} + - {fileID: 2029777068} + m_Father: {fileID: 1456932137} + m_RootOrder: 15 + 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: 0} + m_SizeDelta: {x: -200, y: -100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &542158801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542158799} + 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: 0, g: 0, b: 0, a: 0.78431374} + 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 &542158802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542158799} + m_CullTransparentMesh: 1 --- !u!1001 &559319199 PrefabInstance: m_ObjectHideFlags: 0 @@ -9946,6 +10192,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681295928} m_CullTransparentMesh: 1 +--- !u!1 &681710643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 681710644} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &681710644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681710643} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 913100740} + m_Father: {fileID: 1398167257} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &690840410 GameObject: m_ObjectHideFlags: 0 @@ -13468,6 +13750,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &913100739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 913100740} + - component: {fileID: 913100742} + - component: {fileID: 913100741} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &913100740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913100739} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 681710644} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &913100741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913100739} + 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: 10905, 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 &913100742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913100739} + m_CullTransparentMesh: 1 --- !u!1 &913225257 GameObject: m_ObjectHideFlags: 0 @@ -19179,6 +19536,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389413515} m_CullTransparentMesh: 1 +--- !u!1 &1398167256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1398167257} + - component: {fileID: 1398167260} + - component: {fileID: 1398167259} + - component: {fileID: 1398167258} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1398167257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398167256} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 681710644} + m_Father: {fileID: 2029777068} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1398167258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398167256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 913100741} + m_HandleRect: {fileID: 913100740} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1398167259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398167256} + 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 &1398167260 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398167256} + m_CullTransparentMesh: 1 --- !u!1 &1400711198 GameObject: m_ObjectHideFlags: 0 @@ -19698,6 +20181,7 @@ RectTransform: - {fileID: 426763427} - {fileID: 718596642} - {fileID: 66523172} + - {fileID: 542158800} - {fileID: 395851980} m_Father: {fileID: 0} m_RootOrder: 3 @@ -20584,6 +21068,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1510172559} m_CullTransparentMesh: 1 +--- !u!1 &1519684669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519684670} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1519684670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519684669} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 482051292} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 300} + m_Pivot: {x: 0, y: 1} --- !u!1 &1521636293 GameObject: m_ObjectHideFlags: 0 @@ -26074,6 +26593,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025004927} m_CullTransparentMesh: 1 +--- !u!1 &2029777067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029777068} + - component: {fileID: 2029777071} + - component: {fileID: 2029777070} + - component: {fileID: 2029777069} + m_Layer: 5 + m_Name: craftingRecipies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2029777068 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029777067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 482051292} + - {fileID: 1398167257} + m_Father: {fileID: 542158800} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2029777069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029777067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1519684670} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 482051292} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1398167258} + m_HorizontalScrollbarVisibility: 1 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2029777070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029777067} + 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: 0.392} + 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 &2029777071 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029777067} + m_CullTransparentMesh: 1 --- !u!1 &2030075369 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ButtonHandler.cs b/Assets/Scripts/ButtonHandler.cs index 74859be..a8614da 100644 --- a/Assets/Scripts/ButtonHandler.cs +++ b/Assets/Scripts/ButtonHandler.cs @@ -127,7 +127,8 @@ namespace Assets.Scripts string saveString = "{\r\n"; saveString = saveString + "\"player\": {\r\n" + player.saveGame() + "\r\n},\r\n"; saveString = saveString + "\"world\": {\r\n" + worldGenerator.saveGame() + "\r\n},\r\n"; - saveString = saveString + "\"inventory\": {\r\n" + GameObject.Find("Inventory").GetComponent().saveGame() + "\r\n}\r\n"; + saveString = saveString + "\"inventory\": {\r\n" + GameObject.Find("Inventory").GetComponent().saveGame() + "\r\n},\r\n"; + saveString = saveString + "\"questlog\": {\r\n" + GameObject.Find("QuestLog").GetComponent().saveGame() + "\r\n}\r\n"; saveString = saveString + "\r\n}"; FileHandler.saveGame(saveString, "./save.json"); } diff --git a/Assets/Scripts/FileHandler.cs b/Assets/Scripts/FileHandler.cs index 13d6406..c2b3451 100644 --- a/Assets/Scripts/FileHandler.cs +++ b/Assets/Scripts/FileHandler.cs @@ -22,7 +22,7 @@ namespace Assets.Scripts sw.Close(); } - public static void loadGame(Player player, WorldGenerator worldGenerator, Inventory inventory) + public static void loadGame(Player player, WorldGenerator worldGenerator, Inventory inventory, QuestLog questLog) { if (hasSaveFile()) { @@ -36,6 +36,7 @@ namespace Assets.Scripts player.loadPlayer(json["player"]); worldGenerator.loadWorld(json["world"]); inventory.loadInventory(json["inventory"]); + questLog.loadQuests(json["questlog"]); } } diff --git a/Assets/Scripts/QuestLog.cs b/Assets/Scripts/QuestLog.cs index f896dec..9ef7223 100644 --- a/Assets/Scripts/QuestLog.cs +++ b/Assets/Scripts/QuestLog.cs @@ -1,5 +1,7 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -18,13 +20,14 @@ namespace Assets.Scripts // Start is called before the first frame update void Start() { - quests = new Dictionary>(); - quests.Add("find", new List()); - GameObject newQuest = Instantiate(quest); - newQuest.transform.SetParent(content.transform, false); - FindQuest main = new FindQuest(newQuest); - main.generateCityQuest(); - quests["find"].Add(main); + if (quests == null) + { + quests = new Dictionary>(); + quests.Add("find", new List()); + FindQuest main = new FindQuest(createQuestDisplay()); + main.generateCityQuest(); + quests["find"].Add(main); + } } // Update is called once per frame @@ -46,8 +49,7 @@ namespace Assets.Scripts public void addQuest() { - GameObject newQuest = Instantiate(quest); - newQuest.transform.SetParent(content.transform, false); + int index = rand.Next(4); string type = ""; Quest questItem; @@ -55,25 +57,25 @@ namespace Assets.Scripts { case 0: type = "collect"; - questItem = new CollectQuest(newQuest); + questItem = new CollectQuest(createQuestDisplay()); break; case 1: type = "kill"; - questItem = new KillQuest(newQuest); + questItem = new KillQuest(createQuestDisplay()); break; case 2: type = "find"; - questItem = new FindQuest(newQuest); + questItem = new FindQuest(createQuestDisplay()); break; /*case 3: type = "craft"; break;*/ case 3: type = "explore"; - questItem = new ExploreQuest(newQuest); + questItem = new ExploreQuest(createQuestDisplay()); break; default: - questItem = new Quest(newQuest); + questItem = new Quest(createQuestDisplay()); break; } if (!quests.ContainsKey(type)) @@ -83,6 +85,13 @@ namespace Assets.Scripts quests[type].Add(questItem); } + private GameObject createQuestDisplay() + { + GameObject newQuest = Instantiate(quest); + newQuest.transform.SetParent(content.transform, false); + return newQuest; + } + public void showQuests() { content.GetComponent().sizeDelta = new Vector2(0, 10); @@ -135,6 +144,81 @@ namespace Assets.Scripts } } } + + public string saveGame() + { + string result = ""; + int counter = 0; + int count = 0; + foreach (string key in quests.Keys) + { + counter = 0; + result = result + "\""+key+"\": {\r\n"; + foreach (Quest quest in quests[key]) + { + result = result + "\"quest" + counter + "\": {\r\n"; + result = result + quest.saveQuest(); + result = result + "\r\n}"; + if (counter < quests[key].Count - 1) + { + result = result + ",\r\n"; + } + counter++; + } + result = result + "\r\n}"; + if (count < quests.Keys.Count - 1) + { + result = result + ",\r\n"; + } + count++; + } + return result; + } + + public void loadQuests(JToken json) + { + var jsonData = JObject.Parse(json.ToString()).Children(); + List keywords = jsonData.Children().ToList(); + List quests; + string key = ""; + Quest questItem; + if (this.quests == null) + { + this.quests = new Dictionary>(); + } + foreach (JToken keyword in keywords) + { + jsonData = JObject.Parse(keyword.ToString()).Children(); + quests = jsonData.Children().ToList(); + foreach (JToken quest in quests) + { + key = quest["questname"].ToString().Split(' ')[0].ToLower(); + if (!this.quests.ContainsKey(key)) + { + this.quests.Add(key, new List()); + } + switch (key) + { + case "collect": + questItem = new CollectQuest(quest, createQuestDisplay()); + break; + case "kill": + questItem = new KillQuest(quest, createQuestDisplay()); + break; + case "find": + questItem = new FindQuest(quest, createQuestDisplay()); + break; + case "explore": + questItem = new ExploreQuest(quest, createQuestDisplay()); + break; + default: + questItem = new Quest(quest, createQuestDisplay()); + break; + } + this.quests[key].Add(questItem); + } + } + } } } diff --git a/Assets/Scripts/Quests/CollectQuest.cs b/Assets/Scripts/Quests/CollectQuest.cs index 7e22218..814ac44 100644 --- a/Assets/Scripts/Quests/CollectQuest.cs +++ b/Assets/Scripts/Quests/CollectQuest.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -45,6 +46,8 @@ namespace Assets.Scripts } } + public CollectQuest(JToken token, GameObject display) : base(token, display) { } + override public void update(object obj, int amount) { diff --git a/Assets/Scripts/Quests/ExploreQuest.cs b/Assets/Scripts/Quests/ExploreQuest.cs index 9d6caf8..23c3df7 100644 --- a/Assets/Scripts/Quests/ExploreQuest.cs +++ b/Assets/Scripts/Quests/ExploreQuest.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -15,6 +16,8 @@ namespace Assets.Scripts questname = "Travel to " + Mathf.Floor(coordinates.x) + "/" + Mathf.Floor(coordinates.z) + "(X/Z)"; } + public ExploreQuest(JToken token, GameObject display) : base(token, display) { } + override public void update(object obj, int amount) { diff --git a/Assets/Scripts/Quests/FindQuest.cs b/Assets/Scripts/Quests/FindQuest.cs index db0b6ab..e951dfb 100644 --- a/Assets/Scripts/Quests/FindQuest.cs +++ b/Assets/Scripts/Quests/FindQuest.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -37,6 +38,8 @@ namespace Assets.Scripts } } + public FindQuest(JToken token, GameObject display) : base(token, display) { } + public void generateCityQuest() { questname = "Find all cities"; diff --git a/Assets/Scripts/Quests/KillQuest.cs b/Assets/Scripts/Quests/KillQuest.cs index 01e1116..b3d740f 100644 --- a/Assets/Scripts/Quests/KillQuest.cs +++ b/Assets/Scripts/Quests/KillQuest.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -29,6 +30,8 @@ namespace Assets.Scripts } } + public KillQuest(JToken token, GameObject display) : base(token, display) { } + override public void update(object obj, int amount) { diff --git a/Assets/Scripts/Quests/Quest.cs b/Assets/Scripts/Quests/Quest.cs index c6c3f58..f7e989e 100644 --- a/Assets/Scripts/Quests/Quest.cs +++ b/Assets/Scripts/Quests/Quest.cs @@ -1,3 +1,4 @@ +using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -20,6 +21,17 @@ namespace Assets.Scripts this.display = display; } + public Quest(JToken token, GameObject display) + { + this.display = display; + questname = token["questname"].ToString(); + keyword = token["keyword"].ToString(); + current = int.Parse(token["current"].ToString()); + goal = int.Parse(token["goal"].ToString()); + isFinished = bool.Parse(token["isFinished"].ToString()); + coordinates = new Vector3(float.Parse(token["coordinates"].ToString().Split('/')[0]), 0, float.Parse(token["coordinates"].ToString().Split('/')[1])) ; + } + public virtual void update(object obj, int amount) { //empty @@ -61,6 +73,18 @@ namespace Assets.Scripts { GameObject.Destroy(display); } + + public string saveQuest() + { + string result = ""; + result = result + FileHandler.generateJSON("questname", "\"" + questname + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("keyword", "\"" + keyword + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("current", current) + ",\r\n"; + result = result + FileHandler.generateJSON("goal", goal) + ",\r\n"; + result = result + FileHandler.generateJSON("isFinished", "\"" + isFinished + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("coordinates", "\"" + coordinates.x + "/" + coordinates.z + "\"") + "\r\n"; + return result; + } } } \ No newline at end of file diff --git a/Assets/Scripts/UIHandler.cs b/Assets/Scripts/UIHandler.cs index 4de5b5f..9cb6b2b 100644 --- a/Assets/Scripts/UIHandler.cs +++ b/Assets/Scripts/UIHandler.cs @@ -231,9 +231,9 @@ namespace Assets.Scripts public void openQuestLog() { + questlog.GetComponent().showQuests(); state = UIState.QUEST; hideOtherElements(questlog); - questlog.GetComponent().showQuests(); } public void closeQuestLog() @@ -516,7 +516,7 @@ namespace Assets.Scripts } else { - FileHandler.loadGame(GameObject.Find("Player").GetComponent(), GameObject.Find("WorldGenerator").GetComponent(), GameObject.Find("Inventory").GetComponent()); + FileHandler.loadGame(GameObject.Find("Player").GetComponent(), GameObject.Find("WorldGenerator").GetComponent(), GameObject.Find("Inventory").GetComponent(), GameObject.Find("QuestLog").GetComponent()); hideOtherElements(introduction); introduction.transform.localScale = new Vector3(0, 0, 0); tutorial.transform.localScale = new Vector3(0,0,0); diff --git a/save.json b/save.json index 7f71d1f..fdbf40c 100644 --- a/save.json +++ b/save.json @@ -1,6 +1,6 @@ { "player": { -"playername": "Nicola", +"playername": "Finnchen", "maxHealth": 110, "maxSecondary": 10, "secondary": 10, @@ -8,26 +8,28 @@ "strength": 7, "dexterity": 5, "intelligence": 3, -"level": 3, -"experience": 6, -"maxExperience": 80, +"level": 0, +"experience": 0, +"maxExperience": 10, "race": "Human", "role": "Warrior", -"points": 9, +"points": 0, "healthRegen": 30, "secondaryRegen": 5, "isDodging": "False", -"killcount": 4, -"luck": 26, +"killcount": 0, +"luck": 20, "difficulty": 0 }, "world": { "cityAmount": 5, "maxCityAmount": 5, -"currentTile": "-1/0/1", +"currentTile": "-2/0/2", "map": { "tile0": "./save/tile0.json", -"tile1": "./save/tile1.json" +"tile1": "./save/tile1.json", +"tile2": "./save/tile2.json", +"tile3": "./save/tile3.json" } }, "inventory": { @@ -43,12 +45,7 @@ }, "bags": { "slot0": { -"bag1": { -"rarity": "COMMON", -"place": "BOOTS", -"itemName": "Common boots of mana", -"MP": 12 -}, +"bag1": "empty", "bag2": "empty", "bag3": "empty" }, @@ -136,6 +133,232 @@ "bag1": "empty", "bag2": "empty", "bag3": "empty" +} +} +}, +"questlog": { +"find": { +"quest0": { +"questname": "Find all cities", +"keyword": "City", +"current": 0, +"goal": 5, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest1": { +"questname": "Find 6 planes", +"keyword": "Plane", +"current": 0, +"goal": 6, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest2": { +"questname": "Find 9 lakes", +"keyword": "Lake", +"current": 0, +"goal": 9, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest3": { +"questname": "Find 7 forests", +"keyword": "Forest", +"current": 0, +"goal": 7, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest4": { +"questname": "Find 5 forests", +"keyword": "Forest", +"current": 0, +"goal": 5, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest5": { +"questname": "Find 10 rivers", +"keyword": "River", +"current": 0, +"goal": 10, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest6": { +"questname": "Find 7 mountains", +"keyword": "Mountain", +"current": 0, +"goal": 7, +"isFinished": "False", +"coordinates": "0/0" + +} +}, +"kill": { +"quest0": { +"questname": "Kill 8 boss slimes", +"keyword": "boss", +"current": 0, +"goal": 8, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest1": { +"questname": "Kill 11 mini boss slimes", +"keyword": "miniboss", +"current": 0, +"goal": 11, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest2": { +"questname": "Kill 18 mini boss slimes", +"keyword": "miniboss", +"current": 0, +"goal": 18, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest3": { +"questname": "Kill 6 boss slimes", +"keyword": "boss", +"current": 0, +"goal": 6, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest4": { +"questname": "Kill 6 slimes", +"keyword": "slime", +"current": 0, +"goal": 6, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest5": { +"questname": "Kill 9 slimes", +"keyword": "slime", +"current": 0, +"goal": 9, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest6": { +"questname": "Kill 11 boss slimes", +"keyword": "boss", +"current": 0, +"goal": 11, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest7": { +"questname": "Kill 2 mini boss slimes", +"keyword": "miniboss", +"current": 0, +"goal": 2, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest8": { +"questname": "Kill 9 slimes", +"keyword": "slime", +"current": 0, +"goal": 9, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest9": { +"questname": "Kill 17 mini boss slimes", +"keyword": "miniboss", +"current": 0, +"goal": 17, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest10": { +"questname": "Kill 17 slimes", +"keyword": "slime", +"current": 0, +"goal": 17, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest11": { +"questname": "Kill 5 slimes", +"keyword": "slime", +"current": 0, +"goal": 5, +"isFinished": "False", +"coordinates": "0/0" + +} +}, +"explore": { +"quest0": { +"questname": "Travel to 298/498(X/Z)", +"keyword": "", +"current": 0, +"goal": 0, +"isFinished": "False", +"coordinates": "298.7234/498.0156" + +}, +"quest1": { +"questname": "Travel to -544/76(X/Z)", +"keyword": "", +"current": 0, +"goal": 0, +"isFinished": "False", +"coordinates": "-543.2766/76.01564" + +}, +"quest2": { +"questname": "Travel to -615/488(X/Z)", +"keyword": "", +"current": 0, +"goal": 0, +"isFinished": "False", +"coordinates": "-614.2766/488.0156" + +} +}, +"collect": { +"quest0": { +"questname": "Collect 4 epic items", +"keyword": "Epic", +"current": 0, +"goal": 4, +"isFinished": "False", +"coordinates": "0/0" + +}, +"quest1": { +"questname": "Collect 9 stones", +"keyword": "Stone", +"current": 0, +"goal": 9, +"isFinished": "False", +"coordinates": "0/0" + } } }