From ea1a5790efe451e58786596730a92daafe85c8aa Mon Sep 17 00:00:00 2001 From: kabix09 Date: Sun, 27 Nov 2022 21:28:55 +0100 Subject: [PATCH] BUILD - hot fix after merge --- Assets/Prefarbs/Equipment.meta | 8 - Assets/Prefarbs/Item.meta | 8 - Assets/Prefarbs/Item/item_slot.prefab | 352 ------ Assets/Prefarbs/Item/item_slot.prefab.meta | 7 - Assets/Prefarbs/Task.meta | 8 - Assets/Prefarbs/Task/task_box.prefab | 949 ---------------- Assets/Prefarbs/Task/task_box.prefab.meta | 7 - Assets/Prefarbs/Task/task_box_old.prefab | 944 ---------------- Assets/Prefarbs/Task/task_box_old.prefab.meta | 7 - Assets/Prefarbs/Task/task_panel.prefab | 580 ---------- Assets/Prefarbs/Task/task_panel.prefab.meta | 7 - Assets/Resources/Items/Axe.asset | 2 +- .../{Basic_Sword.asset => Basic Sword.asset} | 14 +- ...word.asset.meta => Basic Sword.asset.meta} | 2 +- ...{Basic_Sword.prefab => Basic Sword.prefab} | 36 +- ...rd.prefab.meta => Basic Sword.prefab.meta} | 0 Assets/Resources/Items/Chestplate.asset | 10 +- Assets/Resources/Items/Chestplate.prefab | 30 +- Assets/Resources/Items/Pickaxe.asset | 4 +- ...vate_Helmet.asset => Private Helmet.asset} | 12 +- ...t.asset.meta => Private Helmet.asset.meta} | 2 +- ...te_Helmet.prefab => Private Helmet.prefab} | 36 +- ...prefab.meta => Private Helmet.prefab.meta} | 0 Assets/Resources/ThePlayer.prefab | 26 +- Assets/Scenes/CaveEntrance.unity | 964 +++++++++++++--- Assets/Scenes/SampleScene.unity | 1003 +++++++++-------- Assets/Scripts/Item/PickableController.cs | 6 +- Assets/Scripts/NPCs' Scripts/NPCDialogue.cs | 12 +- Assets/Scripts/Player.cs | 17 +- .../Application/Chest/ChestController.cs | 5 + .../Panel/Chest/SaveChestManager.cs | 8 +- .../Panel/Chest/SceneChestDataLoader.cs | 17 +- .../Panel/Chest/SceneChestDataManager.cs | 129 ++- .../Panel/Equipment/EquipmentDataLoader.cs | 14 +- .../Panel/Equipment/EquipmentDataManager.cs | 88 +- .../Inventory/SceneInventoryDataLoader.cs | 15 +- .../Inventory/SceneInventoryDataManager.cs | 100 +- .../Panel/Task/SceneTaskDataLoader.cs | 15 +- .../Panel/Task/SceneTaskDataManager.cs | 41 +- .../Manager/Panel/SceneBaseDataLoader.cs | 26 +- .../Manager/Panel/SceneBaseDataManager.cs | 105 +- .../Draggable/DraggablePanelController.cs | 2 +- .../Shared/Manager/UI/UIWarehouseManager.cs | 13 +- .../Application/UI/Chest/ChestUIManager.cs | 5 + .../UI/Equipment/EquipmentUIManager.cs | 1 - .../UI/Inventory/InventoryUIManager.cs | 5 +- .../UI/Panel/EquipmentPanelController.cs | 37 +- .../UI/Panel/TaskPanelController.cs | 9 +- .../Application/UI/Task/TaskUIManager.cs | 35 +- .../Models/Chest/ChestPrefabAsset.cs | 2 +- .../Models/Chest/ChestPrefabAssetData.cs | 19 +- .../EquippableItemPrefabAsset.cs | 16 +- .../REFACTORING/Models/Panel/Slot/ItemSlot.cs | 2 +- Assets/Scripts/SaveController.cs | 5 +- .../SceneManager/OnMapAppearanceMethod.cs | 4 +- .../SceneManager/SaveDynamicObjects.cs | 1 - .../SceneEquippableItemManager.cs | 31 +- 57 files changed, 1942 insertions(+), 3861 deletions(-) delete mode 100644 Assets/Prefarbs/Equipment.meta delete mode 100644 Assets/Prefarbs/Item.meta delete mode 100644 Assets/Prefarbs/Item/item_slot.prefab delete mode 100644 Assets/Prefarbs/Item/item_slot.prefab.meta delete mode 100644 Assets/Prefarbs/Task.meta delete mode 100644 Assets/Prefarbs/Task/task_box.prefab delete mode 100644 Assets/Prefarbs/Task/task_box.prefab.meta delete mode 100644 Assets/Prefarbs/Task/task_box_old.prefab delete mode 100644 Assets/Prefarbs/Task/task_box_old.prefab.meta delete mode 100644 Assets/Prefarbs/Task/task_panel.prefab delete mode 100644 Assets/Prefarbs/Task/task_panel.prefab.meta rename Assets/Resources/Items/{Basic_Sword.asset => Basic Sword.asset} (73%) rename Assets/Resources/Items/{Basic_Sword.asset.meta => Basic Sword.asset.meta} (79%) rename Assets/Resources/Items/{Basic_Sword.prefab => Basic Sword.prefab} (75%) rename Assets/Resources/Items/{Basic_Sword.prefab.meta => Basic Sword.prefab.meta} (100%) rename Assets/Resources/Items/{Private_Helmet.asset => Private Helmet.asset} (76%) rename Assets/Resources/Items/{Private_Helmet.asset.meta => Private Helmet.asset.meta} (79%) rename Assets/Resources/Items/{Private_Helmet.prefab => Private Helmet.prefab} (75%) rename Assets/Resources/Items/{Private_Helmet.prefab.meta => Private Helmet.prefab.meta} (100%) diff --git a/Assets/Prefarbs/Equipment.meta b/Assets/Prefarbs/Equipment.meta deleted file mode 100644 index ebb87985..00000000 --- a/Assets/Prefarbs/Equipment.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d86e64611a58e394cb03feca6c812caa -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Item.meta b/Assets/Prefarbs/Item.meta deleted file mode 100644 index 8beebdb7..00000000 --- a/Assets/Prefarbs/Item.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad5d982f550477a4b8b8be4ad2988ec2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Item/item_slot.prefab b/Assets/Prefarbs/Item/item_slot.prefab deleted file mode 100644 index 875439aa..00000000 --- a/Assets/Prefarbs/Item/item_slot.prefab +++ /dev/null @@ -1,352 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2195907289327283599 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2195907289327283598} - - component: {fileID: 2195907289327283584} - - component: {fileID: 2195907289327283585} - m_Layer: 5 - m_Name: inventory_image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2195907289327283598 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289327283599} - 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: 2195907289659811252} - m_RootOrder: 0 - 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: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2195907289327283584 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289327283599} - m_CullTransparentMesh: 1 ---- !u!114 &2195907289327283585 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289327283599} - 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} - 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: 0} - m_Type: 0 - 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!1 &2195907289659811253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2195907289659811252} - - component: {fileID: 2195907289659811254} - - component: {fileID: 2195907289659811255} - - component: {fileID: 5542991846752721897} - - component: {fileID: 528788604} - m_Layer: 5 - m_Name: item_slot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2195907289659811252 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289659811253} - 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: 2195907289327283598} - - {fileID: 2195907290760729736} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55, y: -55} - m_SizeDelta: {x: 60, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2195907289659811254 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289659811253} - m_CullTransparentMesh: 1 ---- !u!114 &2195907289659811255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289659811253} - 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: 21300000, guid: a45fb5c08be526a4dabe2e91e53f4d15, type: 3} - m_Type: 0 - 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!114 &5542991846752721897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289659811253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 2195907289659811255} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &528788604 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907289659811253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c5c5b18730cf11a41b91bf9d4f6cb26e, type: 3} - m_Name: - m_EditorClassIdentifier: - slotItemNumberText: {fileID: 2195907290760729739} - itemImage: {fileID: 2195907289327283585} - chestPanelController: {fileID: 5331092055018478729, guid: 2b46aee216d4b304f8aebcb303ebf4f4, type: 3} - countStackableItems: 0 ---- !u!1 &2195907290760729737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2195907290760729736} - - component: {fileID: 2195907290760729738} - - component: {fileID: 2195907290760729739} - m_Layer: 5 - m_Name: number_held - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2195907290760729736 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907290760729737} - 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: 2195907289659811252} - 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: 16.7, y: -20.2} - m_SizeDelta: {x: 30, y: 15.3012} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2195907290760729738 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907290760729737} - m_CullTransparentMesh: 1 ---- !u!114 &2195907290760729739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2195907290760729737} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: '0 - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefarbs/Item/item_slot.prefab.meta b/Assets/Prefarbs/Item/item_slot.prefab.meta deleted file mode 100644 index 4995226a..00000000 --- a/Assets/Prefarbs/Item/item_slot.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 39c7a9aabb5a44f48a2e23af5fbf5e1f -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Task.meta b/Assets/Prefarbs/Task.meta deleted file mode 100644 index 8cb2a6ce..00000000 --- a/Assets/Prefarbs/Task.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 27262e7c4e68fbb4db7e2f20464edf77 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Task/task_box.prefab b/Assets/Prefarbs/Task/task_box.prefab deleted file mode 100644 index 2689b155..00000000 --- a/Assets/Prefarbs/Task/task_box.prefab +++ /dev/null @@ -1,949 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3337243677719157076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243677719157067} - - component: {fileID: 3337243677719157066} - - component: {fileID: 1136979341} - m_Layer: 5 - m_Name: task_box - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243677719157067 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677719157076} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_Children: - - {fileID: 3337243678242528397} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3337243677719157066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677719157076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &1136979341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677719157076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3358a3890cb9d764aa23f481299e229d, type: 3} - m_Name: - m_EditorClassIdentifier: - taskBox_header: {fileID: 3337243678199584009} - taskBox_body: {fileID: 3337243679785832160} - title: {fileID: 3337243677751433640} - content: {fileID: 3337243679043656668} - task: {fileID: 0} ---- !u!1 &3337243677751433640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243677751433647} - - component: {fileID: 3337243677751433645} - - component: {fileID: 3337243677751433646} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243677751433647 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677751433640} - 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: 3337243678199584008} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 105, y: -10} - m_SizeDelta: {x: 150, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3337243677751433645 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677751433640} - m_CullTransparentMesh: 1 ---- !u!114 &3337243677751433646 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243677751433640} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Lorem ipsum title - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4282532448 - m_fontColor: {r: 0.3773585, g: 0.25809896, b: 0.25809896, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -0.044948574, y: 0.6672936, z: -0.14154793, w: 1.2620177} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3337243678199584009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243678199584008} - - component: {fileID: 3337243678199584013} - - component: {fileID: 3337243678199584014} - - component: {fileID: 3337243678199584015} - m_Layer: 5 - m_Name: Header - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243678199584008 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678199584009} - 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: 3337243678447623330} - - {fileID: 3337243678969414444} - - {fileID: 3337243677751433647} - m_Father: {fileID: 3337243678242528397} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3337243678199584013 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678199584009} - m_CullTransparentMesh: 1 ---- !u!114 &3337243678199584014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678199584009} - 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: 21300000, guid: 99ef742ea21894b4d995d1bc6209bd91, type: 3} - m_Type: 0 - 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!114 &3337243678199584015 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678199584009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 20 - m_PreferredWidth: -1 - m_PreferredHeight: 20 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &3337243678242528398 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243678242528397} - - component: {fileID: 3337243678242528387} - - component: {fileID: 3337243678242528396} - m_Layer: 5 - m_Name: Window Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243678242528397 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678242528398} - 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: 3337243678199584008} - - {fileID: 3337243679785832167} - m_Father: {fileID: 3337243677719157067} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &3337243678242528387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678242528398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &3337243678242528396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678242528398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &3337243678447623342 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243678447623330} - - component: {fileID: 3337243678447623331} - - component: {fileID: 3337243678447623340} - - component: {fileID: 3337243678447623341} - m_Layer: 0 - m_Name: Expand Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3337243678447623330 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678447623342} - 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: 3337243678199584008} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -10} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3337243678447623331 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678447623342} - m_CullTransparentMesh: 1 ---- !u!114 &3337243678447623340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678447623342} - 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: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - 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!114 &3337243678447623341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678447623342} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 3337243678447623340} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3337243678447623342} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 3337243678969414445} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 3337243679785832160} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 ---- !u!1 &3337243678969414445 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243678969414444} - - component: {fileID: 3337243678969414433} - - component: {fileID: 3337243678969414434} - - component: {fileID: 3337243678969414435} - m_Layer: 0 - m_Name: Collapse Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243678969414444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678969414445} - 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: 3337243678199584008} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -10} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3337243678969414433 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678969414445} - m_CullTransparentMesh: 1 ---- !u!114 &3337243678969414434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678969414445} - 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: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - 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!114 &3337243678969414435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243678969414445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 3337243678969414434} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3337243678447623342} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 3337243678969414445} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 3337243679785832160} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &3337243679043656668 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243679043656659} - - component: {fileID: 3337243679043656657} - - component: {fileID: 3337243679043656658} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243679043656659 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679043656668} - 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: 3337243679785832167} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3337243679043656657 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679043656668} - m_CullTransparentMesh: 1 ---- !u!114 &3337243679043656658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679043656668} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean et consequat - nibh, et rhoncus dolor. Mauris lobortis volutpat ullamcorper. Etiam dictum consequat - null - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3337243679785832160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3337243679785832167} - - component: {fileID: 3337243679785832155} - - component: {fileID: 3337243679785832164} - - component: {fileID: 3337243679785832165} - - component: {fileID: 3337243679785832166} - m_Layer: 0 - m_Name: Body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3337243679785832167 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679785832160} - 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: 3337243679043656659} - m_Father: {fileID: 3337243678242528397} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 100, y: 0} - m_SizeDelta: {x: 200, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &3337243679785832155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679785832160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &3337243679785832164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679785832160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 8 - m_Top: 8 - m_Bottom: 8 - m_ChildAlignment: 0 - m_Spacing: 5 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!222 &3337243679785832165 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679785832160} - m_CullTransparentMesh: 1 ---- !u!114 &3337243679785832166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3337243679785832160} - 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: 21300000, guid: 99ef742ea21894b4d995d1bc6209bd91, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefarbs/Task/task_box.prefab.meta b/Assets/Prefarbs/Task/task_box.prefab.meta deleted file mode 100644 index 8038c077..00000000 --- a/Assets/Prefarbs/Task/task_box.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 242e5493ee5f3fb45a5c163dc1a480c5 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Task/task_box_old.prefab b/Assets/Prefarbs/Task/task_box_old.prefab deleted file mode 100644 index eb659ce9..00000000 --- a/Assets/Prefarbs/Task/task_box_old.prefab +++ /dev/null @@ -1,944 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &553745824476885938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745824476885069} - - component: {fileID: 553745824476885068} - - component: {fileID: 2392074781415890737} - m_Layer: 5 - m_Name: task_box_old - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553745824476885069 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824476885938} - 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: 553745824869149001} - - {fileID: 553745824516735126} - - {fileID: 7109153436270443517} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &553745824476885068 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824476885938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 1 - m_VerticalFit: 1 ---- !u!114 &2392074781415890737 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824476885938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3358a3890cb9d764aa23f481299e229d, type: 3} - m_Name: - m_EditorClassIdentifier: - number: 0 - task: {fileID: 0} ---- !u!1 &553745824516735127 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745824516735126} - - component: {fileID: 553745824516735122} - - component: {fileID: 553745824516735123} - - component: {fileID: 553745824516735120} - - component: {fileID: 553745824516735121} - m_Layer: 0 - m_Name: Body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553745824516735126 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824516735127} - 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: 553745825261435547} - m_Father: {fileID: 553745824476885069} - m_RootOrder: 1 - 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: -6.7300034} - m_SizeDelta: {x: 190, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &553745824516735122 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824516735127} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &553745824516735123 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824516735127} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 8 - m_Top: 8 - m_Bottom: 8 - m_ChildAlignment: 0 - m_Spacing: 5 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!222 &553745824516735120 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824516735127} - m_CullTransparentMesh: 1 ---- !u!114 &553745824516735121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824516735127} - 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: 21300000, guid: 99ef742ea21894b4d995d1bc6209bd91, type: 3} - m_Type: 0 - 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!1 &553745824529072238 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745824529072233} - - component: {fileID: 553745824529072234} - - component: {fileID: 553745824529072235} - - component: {fileID: 553745824529072232} - m_Layer: 0 - m_Name: Collapse Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553745824529072233 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824529072238} - 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: 553745824869149001} - 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: -69.999985, y: -0.000022888184} - m_SizeDelta: {x: -160, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &553745824529072234 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824529072238} - m_CullTransparentMesh: 1 ---- !u!114 &553745824529072235 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824529072238} - 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: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - 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!114 &553745824529072232 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824529072238} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 553745824529072235} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 553745825287307593} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 553745824529072238} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 553745824516735127} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &553745824869149006 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745824869149001} - - component: {fileID: 553745824869149002} - - component: {fileID: 553745824869149003} - - component: {fileID: 553745824869149000} - m_Layer: 0 - m_Name: Header - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553745824869149001 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824869149006} - 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: 553745825287307589} - - {fileID: 553745824529072233} - - {fileID: 8037892326599746516} - m_Father: {fileID: 553745824476885069} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &553745824869149002 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824869149006} - m_CullTransparentMesh: 1 ---- !u!114 &553745824869149003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824869149006} - 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: 21300000, guid: 99ef742ea21894b4d995d1bc6209bd91, type: 3} - m_Type: 0 - 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!114 &553745824869149000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745824869149006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 60 - m_PreferredWidth: -1 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: 1 - m_LayoutPriority: 0 ---- !u!1 &553745825261435544 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745825261435547} - - component: {fileID: 553745825261435541} - - component: {fileID: 553745825261435546} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &553745825261435547 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825261435544} - 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: 553745824516735126} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &553745825261435541 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825261435544} - m_CullTransparentMesh: 1 ---- !u!114 &553745825261435546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825261435544} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean et consequat - nibh, et rhoncus dolor. Mauris lobortis volutpat ullamcorper. Etiam dictum consequat - null - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &553745825287307593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 553745825287307589} - - component: {fileID: 553745825287307594} - - component: {fileID: 553745825287307595} - - component: {fileID: 553745825287307592} - m_Layer: 0 - m_Name: Expand Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &553745825287307589 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825287307593} - 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: 553745824869149001} - 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: -69.999985, y: -0.000022888184} - m_SizeDelta: {x: -160, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &553745825287307594 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825287307593} - m_CullTransparentMesh: 1 ---- !u!114 &553745825287307595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825287307593} - 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: 10915, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - 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!114 &553745825287307592 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 553745825287307593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 553745825287307595} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 553745825287307593} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 553745824529072238} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 553745824516735127} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 ---- !u!1 &1025523002002341991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7109153436270443517} - - component: {fileID: 3735192827397535923} - - component: {fileID: 602012969872387902} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7109153436270443517 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025523002002341991} - 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: 553745824476885069} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3735192827397535923 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025523002002341991} - m_CullTransparentMesh: 1 ---- !u!114 &602012969872387902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025523002002341991} - 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!1 &6916145611367778360 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8037892326599746516} - - component: {fileID: 144946287582322257} - - component: {fileID: 7203938899791776170} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8037892326599746516 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6916145611367778360} - 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: 553745824869149001} - m_RootOrder: 2 - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &144946287582322257 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6916145611367778360} - m_CullTransparentMesh: 1 ---- !u!114 &7203938899791776170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6916145611367778360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Lorem ipsum title - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4282532448 - m_fontColor: {r: 0.3773585, g: 0.25809896, b: 0.25809896, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 39.972343, y: 7.492752, z: 16.353302, w: 6.949959} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefarbs/Task/task_box_old.prefab.meta b/Assets/Prefarbs/Task/task_box_old.prefab.meta deleted file mode 100644 index 6748effd..00000000 --- a/Assets/Prefarbs/Task/task_box_old.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c2e651a09bdc574408f7ab11baf2842f -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefarbs/Task/task_panel.prefab b/Assets/Prefarbs/Task/task_panel.prefab deleted file mode 100644 index 915641af..00000000 --- a/Assets/Prefarbs/Task/task_panel.prefab +++ /dev/null @@ -1,580 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4136979550770096709 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979550770096714} - - component: {fileID: 4136979550770096713} - - component: {fileID: 4136979550770096712} - - component: {fileID: 4136979550770096715} - m_Layer: 5 - m_Name: Scroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979550770096714 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550770096709} - 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: 4136979550912312139} - m_Father: {fileID: 4136979550784496705} - 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: 0.0000038146973, y: 0.0000076293945} - m_SizeDelta: {x: 550, y: 715} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4136979550770096713 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550770096709} - m_CullTransparentMesh: 1 ---- !u!114 &4136979550770096712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550770096709} - 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: 21300000, guid: c7b158bba3938c6498313b06b868b9a7, type: 3} - m_Type: 0 - 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!114 &4136979550770096715 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550770096709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 4136979552221407524} - m_Horizontal: 0 - m_Vertical: 0 - m_MovementType: 2 - m_Elasticity: 0.5 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 4136979550912312139} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4136979550784496704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979550784496705} - - component: {fileID: 4136979550784496711} - - component: {fileID: 4136979550784496710} - - component: {fileID: 562335258} - m_Layer: 5 - m_Name: task_panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979550784496705 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550784496704} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} - m_Children: - - {fileID: 4136979551920493059} - - {fileID: 4136979550770096714} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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: 225, y: 0} - m_SizeDelta: {x: 550, y: 715} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4136979550784496711 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550784496704} - m_CullTransparentMesh: 0 ---- !u!114 &4136979550784496710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550784496704} - 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} - 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: 0} - m_Type: 0 - 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!114 &562335258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550784496704} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9f07b313ccbd175489a00fcaf7521761, type: 3} - m_Name: - m_EditorClassIdentifier: - _panelContent: {fileID: 4136979552221407527} - taskbox_template: {fileID: 1136979341, guid: 242e5493ee5f3fb45a5c163dc1a480c5, type: 3} - taskBox_list: [] - taskList: [] ---- !u!1 &4136979550912312138 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979550912312139} - - component: {fileID: 4136979550912312142} - - component: {fileID: 4136979550912312137} - - component: {fileID: 4136979550912312136} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979550912312139 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550912312138} - 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: 4136979552221407524} - m_Father: {fileID: 4136979550770096714} - 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: -25} - m_SizeDelta: {x: 0, y: -47} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4136979550912312142 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550912312138} - m_CullTransparentMesh: 1 ---- !u!114 &4136979550912312137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550912312138} - 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: 21300000, guid: 5891182583b3e7a42a21ed9d1cb46e97, type: 3} - m_Type: 0 - 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!114 &4136979550912312136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979550912312138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!1 &4136979551422401455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979551422401452} - - component: {fileID: 4136979551422401362} - - component: {fileID: 4136979551422401453} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979551422401452 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551422401455} - 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: 4136979551920493059} - m_RootOrder: 0 - 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_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4136979551422401362 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551422401455} - m_CullTransparentMesh: 1 ---- !u!114 &4136979551422401453 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551422401455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Quests - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4136979551920493058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979551920493059} - - component: {fileID: 4136979551920493057} - - component: {fileID: 4136979551920493056} - m_Layer: 5 - m_Name: Header - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979551920493059 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551920493058} - 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: 4136979551422401452} - m_Father: {fileID: 4136979550784496705} - 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: 397.5} - m_SizeDelta: {x: -130, y: -635} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4136979551920493057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551920493058} - m_CullTransparentMesh: 1 ---- !u!114 &4136979551920493056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979551920493058} - 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: 21300000, guid: fc7810d5df3d6b64eb3b231f24cf22f9, type: 3} - m_Type: 0 - 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!1 &4136979552221407527 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4136979552221407524} - - component: {fileID: 4136979552221407530} - - component: {fileID: 4136979552221407525} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4136979552221407524 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979552221407527} - 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: 4136979550912312139} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &4136979552221407530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979552221407527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &4136979552221407525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4136979552221407527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 25 - m_Right: 0 - m_Top: 0 - m_Bottom: 10 - m_ChildAlignment: 0 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 1 - m_ReverseArrangement: 0 diff --git a/Assets/Prefarbs/Task/task_panel.prefab.meta b/Assets/Prefarbs/Task/task_panel.prefab.meta deleted file mode 100644 index 90f3454c..00000000 --- a/Assets/Prefarbs/Task/task_panel.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5045428a361e7e4429694ac7d62e2909 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Items/Axe.asset b/Assets/Resources/Items/Axe.asset index 74429a18..a448869c 100644 --- a/Assets/Resources/Items/Axe.asset +++ b/Assets/Resources/Items/Axe.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Axe m_EditorClassIdentifier: id: 2 - name: Axe + name: Lumberjac Axe description: Lumberjack axe level: 1 image: {fileID: 21300000, guid: d7a7292796eda0941a6a863b7d66bbcb, type: 3} diff --git a/Assets/Resources/Items/Basic_Sword.asset b/Assets/Resources/Items/Basic Sword.asset similarity index 73% rename from Assets/Resources/Items/Basic_Sword.asset rename to Assets/Resources/Items/Basic Sword.asset index 22ffeee7..ac62809a 100644 --- a/Assets/Resources/Items/Basic_Sword.asset +++ b/Assets/Resources/Items/Basic Sword.asset @@ -9,18 +9,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 943bb4b7c1123c44fb1cbc048a56a954, type: 3} - m_Name: Basic_Sword + m_Script: {fileID: 11500000, guid: a0c176e87b3c91641897c23dc27e92a0, type: 3} + m_Name: Basic Sword m_EditorClassIdentifier: id: 0 - name: Basic_Sword - description: My greatest sword - level: 0 + name: Basic Sword + description: + level: 1 image: {fileID: -1424804349743227679, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} itemModel: {fileID: 4126821754175378127, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - StrengthBonus: 1 + StrengthBonus: 15 AgilityBonus: 0 InteligenceBonus: 0 VitalityBonus: 0 isStackable: 0 - EquipmentType: 4 + EquipmentType: 5 diff --git a/Assets/Resources/Items/Basic_Sword.asset.meta b/Assets/Resources/Items/Basic Sword.asset.meta similarity index 79% rename from Assets/Resources/Items/Basic_Sword.asset.meta rename to Assets/Resources/Items/Basic Sword.asset.meta index ec00b806..26248cc8 100644 --- a/Assets/Resources/Items/Basic_Sword.asset.meta +++ b/Assets/Resources/Items/Basic Sword.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8ae7655d3a8a20498e956a98667e158 +guid: 414cc7af49ae5914a95e2c334a55af99 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/Items/Basic_Sword.prefab b/Assets/Resources/Items/Basic Sword.prefab similarity index 75% rename from Assets/Resources/Items/Basic_Sword.prefab rename to Assets/Resources/Items/Basic Sword.prefab index b6c8a79b..17c34a5f 100644 --- a/Assets/Resources/Items/Basic_Sword.prefab +++ b/Assets/Resources/Items/Basic Sword.prefab @@ -11,8 +11,9 @@ GameObject: - component: {fileID: 5029889951288834834} - component: {fileID: 5756712382501596272} - component: {fileID: 8281463047152580519} + - component: {fileID: -9035502233580223045} m_Layer: 0 - m_Name: Basic_Sword + m_Name: Basic Sword m_TagString: Pickable m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,6 +29,7 @@ Transform: 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: 0} m_RootOrder: 0 @@ -43,6 +45,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -95,9 +98,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c261410eee3e5d640abd23159c28b3cc, type: 3} m_Name: m_EditorClassIdentifier: - item: {fileID: 11400000, guid: d8ae7655d3a8a20498e956a98667e158, type: 2} - name: Basic_Sword - name2: + item: {fileID: 11400000, guid: 414cc7af49ae5914a95e2c334a55af99, type: 2} + name: Basic Sword triggered: 0 isPicked: 0 HandleIndexInScelenObjectList: 0 +--- !u!61 &-9035502233580223045 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126821754175378127} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Resources/Items/Basic_Sword.prefab.meta b/Assets/Resources/Items/Basic Sword.prefab.meta similarity index 100% rename from Assets/Resources/Items/Basic_Sword.prefab.meta rename to Assets/Resources/Items/Basic Sword.prefab.meta diff --git a/Assets/Resources/Items/Chestplate.asset b/Assets/Resources/Items/Chestplate.asset index 65e75831..a4038f70 100644 --- a/Assets/Resources/Items/Chestplate.asset +++ b/Assets/Resources/Items/Chestplate.asset @@ -9,18 +9,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 943bb4b7c1123c44fb1cbc048a56a954, type: 3} + m_Script: {fileID: 11500000, guid: a0c176e87b3c91641897c23dc27e92a0, type: 3} m_Name: Chestplate m_EditorClassIdentifier: id: 0 name: Chestplate - description: My old chestplate - level: 0 + description: + level: 1 image: {fileID: 4404702397685382865, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} itemModel: {fileID: 8687962458953192462, guid: ae7e7f7d0d926174a8edae16f7f4d305, type: 3} StrengthBonus: 0 AgilityBonus: 0 InteligenceBonus: 0 - VitalityBonus: 1 + VitalityBonus: 15 isStackable: 0 - EquipmentType: 1 + EquipmentType: 2 diff --git a/Assets/Resources/Items/Chestplate.prefab b/Assets/Resources/Items/Chestplate.prefab index 84b74475..e9906676 100644 --- a/Assets/Resources/Items/Chestplate.prefab +++ b/Assets/Resources/Items/Chestplate.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 2737777845718636262} - component: {fileID: 695570320775817563} - component: {fileID: 3447797899526480791} + - component: {fileID: 7222068818567372997} m_Layer: 0 m_Name: Chestplate m_TagString: Untagged @@ -28,6 +29,7 @@ Transform: 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: 0} m_RootOrder: 0 @@ -43,6 +45,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -97,7 +100,32 @@ MonoBehaviour: m_EditorClassIdentifier: item: {fileID: 11400000, guid: 43fcc69d78c8c3847bbedde817f35b45, type: 2} name: Chestplate - name2: triggered: 0 isPicked: 0 HandleIndexInScelenObjectList: 0 +--- !u!61 &7222068818567372997 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8687962458953192462} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.9375, y: 0.9375} + newSize: {x: 0.9375, y: 0.8125} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.9375, y: 0.9375} + m_EdgeRadius: 0 diff --git a/Assets/Resources/Items/Pickaxe.asset b/Assets/Resources/Items/Pickaxe.asset index 8a3f9d86..3b869a45 100644 --- a/Assets/Resources/Items/Pickaxe.asset +++ b/Assets/Resources/Items/Pickaxe.asset @@ -18,9 +18,9 @@ MonoBehaviour: level: 1 image: {fileID: 8959118705387878318, guid: 25e473b59d2d7534e803be0a2825e0f7, type: 3} itemModel: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3} - StrengthBonus: 0 + StrengthBonus: 5 AgilityBonus: 0 InteligenceBonus: 0 VitalityBonus: 0 isStackable: 0 - EquipmentType: 4 + EquipmentType: 5 diff --git a/Assets/Resources/Items/Private_Helmet.asset b/Assets/Resources/Items/Private Helmet.asset similarity index 76% rename from Assets/Resources/Items/Private_Helmet.asset rename to Assets/Resources/Items/Private Helmet.asset index edb81f97..2b08cad0 100644 --- a/Assets/Resources/Items/Private_Helmet.asset +++ b/Assets/Resources/Items/Private Helmet.asset @@ -9,11 +9,11 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 943bb4b7c1123c44fb1cbc048a56a954, type: 3} - m_Name: Private_Helmet + m_Script: {fileID: 11500000, guid: a0c176e87b3c91641897c23dc27e92a0, type: 3} + m_Name: Private Helmet m_EditorClassIdentifier: - id: 0 - name: Private_Helmet + id: 3 + name: Private Helmet description: level: 0 image: {fileID: -4153561594331974330, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} @@ -21,6 +21,6 @@ MonoBehaviour: StrengthBonus: 0 AgilityBonus: 0 InteligenceBonus: 0 - VitalityBonus: 0 + VitalityBonus: 5 isStackable: 0 - EquipmentType: 0 + EquipmentType: 1 diff --git a/Assets/Resources/Items/Private_Helmet.asset.meta b/Assets/Resources/Items/Private Helmet.asset.meta similarity index 79% rename from Assets/Resources/Items/Private_Helmet.asset.meta rename to Assets/Resources/Items/Private Helmet.asset.meta index 4449bdb6..5da1a189 100644 --- a/Assets/Resources/Items/Private_Helmet.asset.meta +++ b/Assets/Resources/Items/Private Helmet.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd21d2478d240f6469e739c04d9bfc9e +guid: e76017225f130f3459860a42d4169494 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/Items/Private_Helmet.prefab b/Assets/Resources/Items/Private Helmet.prefab similarity index 75% rename from Assets/Resources/Items/Private_Helmet.prefab rename to Assets/Resources/Items/Private Helmet.prefab index 021843c7..8f34ebe9 100644 --- a/Assets/Resources/Items/Private_Helmet.prefab +++ b/Assets/Resources/Items/Private Helmet.prefab @@ -11,8 +11,9 @@ GameObject: - component: {fileID: 1052685646034761090} - component: {fileID: 6306919781718258975} - component: {fileID: -8044045541806724455} + - component: {fileID: 7669348506709133377} m_Layer: 0 - m_Name: Private_Helmet + m_Name: Private Helmet m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,6 +29,7 @@ Transform: 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: 0} m_RootOrder: 0 @@ -43,6 +45,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -95,9 +98,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c261410eee3e5d640abd23159c28b3cc, type: 3} m_Name: m_EditorClassIdentifier: - item: {fileID: 11400000, guid: fd21d2478d240f6469e739c04d9bfc9e, type: 2} - name: Private_Helmet - name2: + item: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2} + name: Private Helmet triggered: 0 isPicked: 0 HandleIndexInScelenObjectList: 0 +--- !u!61 &7669348506709133377 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8387239886674690860} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 0.9375} + newSize: {x: 0.8125, y: 0.75} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9375} + m_EdgeRadius: 0 diff --git a/Assets/Resources/Items/Private_Helmet.prefab.meta b/Assets/Resources/Items/Private Helmet.prefab.meta similarity index 100% rename from Assets/Resources/Items/Private_Helmet.prefab.meta rename to Assets/Resources/Items/Private Helmet.prefab.meta diff --git a/Assets/Resources/ThePlayer.prefab b/Assets/Resources/ThePlayer.prefab index 28a74f6f..461b2d98 100644 --- a/Assets/Resources/ThePlayer.prefab +++ b/Assets/Resources/ThePlayer.prefab @@ -36,6 +36,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -3.21, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4869648843387222761} - {fileID: 4869648845035997474} @@ -61,6 +62,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -196,7 +198,7 @@ CircleCollider2D: m_Radius: 0.38 --- !u!95 &4869648843286970677 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -209,6 +211,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -300,6 +303,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 0 @@ -311,19 +315,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4869648843387222766} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.2 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 0 startDelay: serializedVersion: 2 minMaxState: 0 @@ -873,6 +877,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 7 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -5080,6 +5085,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -5110,6 +5116,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 3 m_RenderMode: 3 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0.1 m_MaxParticleSize: 0.5 @@ -5133,6 +5140,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &4869648843392866306 GameObject: @@ -5161,6 +5172,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 7 @@ -5241,6 +5253,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 4 @@ -5303,6 +5316,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 5 @@ -5365,6 +5379,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 3 @@ -5427,6 +5442,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 8 @@ -5502,6 +5518,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 2 @@ -5564,6 +5581,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 1 @@ -5611,6 +5629,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 9 @@ -5686,6 +5705,7 @@ Transform: 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: 4869648843286970699} m_RootOrder: 6 diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index c3ec2cf2..a0e8f6b0 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -152,6 +152,7 @@ RectTransform: 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: 858875760} m_RootOrder: 3 @@ -246,6 +247,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 518089535} m_RootOrder: 2 @@ -405,6 +407,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1049545580} - {fileID: 1038010609} @@ -490,6 +493,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101338460} m_RootOrder: 1 @@ -569,6 +573,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95000404, y: 0.19999997, z: 4.799999} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1830502768} - {fileID: 1564617194} @@ -647,6 +652,7 @@ Transform: 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: 708949758} m_RootOrder: 1 @@ -717,6 +723,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 62.2, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 7 @@ -770,6 +777,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -810,6 +818,61 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &67120568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 67120569} + - component: {fileID: 67120570} + m_Layer: 0 + m_Name: Equipment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &67120569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67120568} + 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: 277471083} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &67120570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67120568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3} + m_Name: + m_EditorClassIdentifier: + ElementsToBuildOnSceneList: + - Key: 1 + Value: + EquippableItem: {fileID: 11400000, guid: 43fcc69d78c8c3847bbedde817f35b45, type: 2} + - Key: 0 + Value: + EquippableItem: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2} + - Key: 2 + Value: + EquippableItem: {fileID: 11400000, guid: 414cc7af49ae5914a95e2c334a55af99, type: 2} + convertedData: [] --- !u!1 &72027011 GameObject: m_ObjectHideFlags: 0 @@ -838,6 +901,7 @@ RectTransform: 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: 1738591102} m_RootOrder: 0 @@ -916,6 +980,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426214703} m_RootOrder: 1 @@ -1121,6 +1186,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1280430026} - {fileID: 791282141} @@ -1192,6 +1258,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1950591502} - {fileID: 452416803} @@ -1277,6 +1344,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 90994618} m_RootOrder: 5 @@ -1292,6 +1360,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -23418,6 +23487,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1491998336} m_RootOrder: 1 @@ -23678,6 +23748,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 518089535} m_RootOrder: 3 @@ -23826,6 +23897,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593723514} m_RootOrder: 1 @@ -23905,6 +23977,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 349656823} m_RootOrder: 0 @@ -23982,6 +24055,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 518089535} m_RootOrder: 1 @@ -24130,6 +24204,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 603154668} m_Father: {fileID: 1174630501} @@ -24211,6 +24286,7 @@ RectTransform: 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: 1546100804} m_Father: {fileID: 1174630501} @@ -24325,6 +24401,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1379407234} - {fileID: 207170701} @@ -24430,6 +24507,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101338460} m_RootOrder: 3 @@ -24578,6 +24656,7 @@ RectTransform: 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: 1738591102} m_RootOrder: 2 @@ -24653,6 +24732,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 90994618} m_RootOrder: 7 @@ -24668,6 +24748,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -50277,6 +50358,7 @@ RectTransform: 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: 996161346} m_Father: {fileID: 146720943} @@ -50315,6 +50397,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 42.2, y: 3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 3 @@ -50368,6 +50451,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -50436,6 +50520,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1245845880} - {fileID: 374378052} @@ -50515,6 +50600,7 @@ RectTransform: 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: 1491998336} m_RootOrder: 4 @@ -50562,7 +50648,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237071778} m_CullTransparentMesh: 1 ---- !u!1 &251828921 +--- !u!1 &239749516 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -50570,114 +50656,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 251828923} - - component: {fileID: 251828927} - - component: {fileID: 251828922} - - component: {fileID: 251828924} - - component: {fileID: 251828925} - - component: {fileID: 251828926} + - component: {fileID: 239749517} + - component: {fileID: 239749518} m_Layer: 0 - m_Name: LocalSceneManager + m_Name: Task m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &251828922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3414ebe7b0de81b47a6726905f4c1322, type: 3} - m_Name: - m_EditorClassIdentifier: - StaticElements: [] - DynamicElements: [] - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: EquippableItem - ItemsListName: EquippableItemList ---- !u!4 &251828923 +--- !u!4 &239749517 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} + m_GameObject: {fileID: 239749516} 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: 0} - m_RootOrder: 0 + m_Father: {fileID: 277471083} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &251828924 +--- !u!114 &239749518 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} + m_GameObject: {fileID: 239749516} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b8a65f0b147a2e44e8f244301ff0de57, type: 3} - m_Name: - m_EditorClassIdentifier: - TaskElements: [] - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: Quest - ItemsListName: QuestsList ---- !u!114 &251828925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ef71482e4d2df8440a1117e181018706, type: 3} - m_Name: - m_EditorClassIdentifier: - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: InventoryItem - ItemsListName: InventoryItemList ---- !u!114 &251828926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e11719a854a3211459e4fb55658c64c3, type: 3} - m_Name: - m_EditorClassIdentifier: - avatar: {fileID: 0} - AvatarClone: {fileID: 0} - startPosition: {x: 0, y: 0, z: 0} ---- !u!114 &251828927 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251828921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fbd4e55be86a9d49adcb35c89ee9c18, type: 3} + m_Script: {fileID: 11500000, guid: 696dabb3bc014c2181a73c86e59506cb, type: 3} m_Name: m_EditorClassIdentifier: + ElementsToBuildOnSceneList: + - id: 0 + title: Family heirloom + description: Bring back my family heirloom that was stolen by bandits hiding + in the nearby cave and I will reward you generously. + difficulty: 4 --- !u!1 &253761061 GameObject: m_ObjectHideFlags: 0 @@ -50706,6 +50726,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8, y: 17, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1704775974} - {fileID: 988201576} @@ -50791,6 +50812,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1856409633} m_RootOrder: 0 @@ -50870,6 +50892,7 @@ Transform: 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: 1970299934} m_RootOrder: 1 @@ -50940,6 +50963,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 40, y: 9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1811764002} - {fileID: 307320967} @@ -50997,6 +51021,40 @@ PolygonCollider2D: - {x: 1.0834732, y: -0.19933319} - {x: 1.2800922, y: 0.12136078} - {x: 1.5291128, y: 0.1931228} +--- !u!1 &277471082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 277471083} + m_Layer: 0 + m_Name: PlayerManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &277471083 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277471082} + 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: 1133845001} + - {fileID: 67120569} + - {fileID: 239749517} + m_Father: {fileID: 557637066} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &292791103 GameObject: m_ObjectHideFlags: 0 @@ -51025,6 +51083,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9499999, y: 0.2, z: 4.799999} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 749129729} - {fileID: 2145520339} @@ -51143,6 +51202,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -659.28564, y: -370.71426, z: 0} m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 989731994} m_RootOrder: 0 @@ -51158,6 +51218,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -51226,6 +51287,7 @@ RectTransform: 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: 1677041282} m_RootOrder: 0 @@ -51301,6 +51363,7 @@ Transform: 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: 270516053} m_RootOrder: 1 @@ -51369,6 +51432,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -25.208187, y: -26.491179, z: -3.4962616} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1199482292} - {fileID: 424496146} @@ -51409,6 +51473,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 90994618} m_RootOrder: 6 @@ -51424,6 +51489,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -54105,6 +54171,7 @@ RectTransform: 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: 858875760} m_RootOrder: 1 @@ -54178,6 +54245,7 @@ RectTransform: 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: 117474564} m_Father: {fileID: 146720943} @@ -54216,6 +54284,7 @@ RectTransform: 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: 1095906115} m_RootOrder: 0 @@ -54292,6 +54361,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 698155434} m_RootOrder: 0 @@ -54387,6 +54457,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222310084} m_RootOrder: 1 @@ -54553,6 +54624,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1491998336} m_RootOrder: 3 @@ -54716,6 +54788,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 60.7, y: -5.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 1 @@ -54771,6 +54844,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -54841,6 +54915,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426214703} m_RootOrder: 3 @@ -54989,6 +55064,7 @@ Transform: 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: 96776836} m_RootOrder: 1 @@ -55059,6 +55135,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101338460} m_RootOrder: 2 @@ -55138,6 +55215,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 49, y: 11, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1453295262} - {fileID: 1007302232} @@ -55223,6 +55301,7 @@ RectTransform: 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: 1993824421} m_RootOrder: 0 @@ -55298,6 +55377,7 @@ RectTransform: 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: 1677041282} m_RootOrder: 1 @@ -55373,6 +55453,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 30, y: 11, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 877979921} - {fileID: 2007727333} @@ -55461,6 +55542,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1217169685} m_RootOrder: 1 @@ -55623,6 +55705,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 56.2, y: -5.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 6 @@ -55676,6 +55759,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -55744,6 +55828,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1220966342} - {fileID: 123139060} @@ -55887,6 +55972,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -37, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -55924,6 +56010,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.042999268, y: 0.32499886, z: 487.52594} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 919303325} m_RootOrder: 0 @@ -55939,6 +56026,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -56108,7 +56196,7 @@ MonoBehaviour: id: 0 title: description: - hardnessLevel: 0 + difficulty: 0 axe: {fileID: 1826809974269949497, guid: 83fa1f81238efb541bd77405dcf33dd1, type: 3} isTaskAccepted: 0 --- !u!114 &551619109 @@ -56126,6 +56214,103 @@ MonoBehaviour: lumberjack: {fileID: 551619101} isQuest: 1 name: +--- !u!1 &557637061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557637066} + - component: {fileID: 557637065} + - component: {fileID: 557637064} + - component: {fileID: 557637063} + - component: {fileID: 557637062} + m_Layer: 0 + m_Name: SceneManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &557637062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557637061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3414ebe7b0de81b47a6726905f4c1322, type: 3} + m_Name: + m_EditorClassIdentifier: + StaticElements: [] + DynamicElements: [] + MapName: + ElementFolderName: EquippableItem + ItemsListName: EquippableItemList +--- !u!114 &557637063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557637061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8081574e3f851e4d9335be93900a94e, type: 3} + m_Name: + m_EditorClassIdentifier: + DraggedSlotImageTemplate: {fileID: 6570396142606985298, guid: 1304511dd1dfefc449e87c3d904ab15f, type: 3} + DraggedSlotImage: {fileID: 0} + _draggedSlot: {fileID: 0} +--- !u!114 &557637064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557637061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fbd4e55be86a9d49adcb35c89ee9c18, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &557637065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557637061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e11719a854a3211459e4fb55658c64c3, type: 3} + m_Name: + m_EditorClassIdentifier: + avatar: {fileID: 0} + AvatarClone: {fileID: 0} + startPosition: {x: 0, y: 0, z: 0} +--- !u!4 &557637066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557637061} + 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: 1288958687} + - {fileID: 277471083} + - {fileID: 736035331} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &589833388 GameObject: m_ObjectHideFlags: 0 @@ -56156,6 +56341,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1392579422} m_RootOrder: 2 @@ -56300,6 +56486,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1499286461} - {fileID: 107951201} @@ -56377,6 +56564,7 @@ RectTransform: 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: 1236142965} m_Father: {fileID: 1993824421} @@ -56417,6 +56605,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 605639183} m_RootOrder: 0 @@ -56564,6 +56753,7 @@ RectTransform: 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: 131906520} m_RootOrder: 0 @@ -56615,6 +56805,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 603032474} - {fileID: 2070805987} @@ -56693,6 +56884,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.9589837} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1290903874} - {fileID: 1095906115} @@ -56796,6 +56988,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1856409633} m_RootOrder: 2 @@ -56875,6 +57068,7 @@ Transform: 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: 1039853848} m_RootOrder: 0 @@ -56891,6 +57085,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -56921,6 +57116,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -56944,6 +57140,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &657916327 ParticleSystem: @@ -56952,19 +57152,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 657916324} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -57514,6 +57714,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -61682,6 +61883,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 90994618} m_RootOrder: 3 @@ -61697,6 +61899,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -72470,6 +72673,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743052381} m_RootOrder: 0 @@ -72577,6 +72781,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 372636028} - {fileID: 1395361978} @@ -72657,6 +72862,7 @@ Transform: 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: 827196535} m_RootOrder: 0 @@ -72673,6 +72879,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -72703,6 +72910,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -72726,6 +72934,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &698944572 ParticleSystem: @@ -72734,19 +72946,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698944569} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -73296,6 +73508,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -77461,6 +77674,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1996553856} m_Father: {fileID: 41007156} @@ -77563,6 +77777,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14, y: 5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1767827229} - {fileID: 47711167} @@ -77647,6 +77862,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -659.28564, y: -370.71426, z: 0} m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1860177093} m_RootOrder: 0 @@ -77662,6 +77878,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -77730,6 +77947,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 46.2, y: 2.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 5 @@ -77783,6 +78001,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -77823,6 +78042,60 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &736035330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 736035331} + - component: {fileID: 736035332} + m_Layer: 0 + m_Name: ChestManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &736035331 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736035330} + 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: 557637066} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &736035332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736035330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0b2d7931c00ea64eb1da159de0455e0, type: 3} + m_Name: + m_EditorClassIdentifier: + CurrentChest: + id: 0 + name: + description: + chestModel: {fileID: 0} + ChestType: 0 + Content: [] + UiManager: {fileID: 0} + ElementsToBuildOnSceneList: [] + convertedData: [] --- !u!1 &743052380 GameObject: m_ObjectHideFlags: 0 @@ -77851,6 +78124,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 683740644} - {fileID: 991059755} @@ -77934,6 +78208,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690621165} m_RootOrder: 0 @@ -78097,6 +78372,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292791104} m_RootOrder: 0 @@ -78179,6 +78455,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743052381} m_RootOrder: 2 @@ -78343,8 +78620,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7610fa3cdda79614e94110dd314fbfed, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 9124304227729624651, guid: e9cbfeb9e69af1245bc3180e86ff23f6, type: 3} - isOpen: 0 --- !u!4 &786466316 Transform: m_ObjectHideFlags: 0 @@ -78355,6 +78630,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 873.9808, y: 640.6703, z: -1503.7872} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -78390,6 +78666,7 @@ Transform: 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: 90994618} m_RootOrder: 1 @@ -78405,6 +78682,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -108581,6 +108859,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -22.694523, y: -24.78614, z: -0.71084684} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 827196535} - {fileID: 18522982} @@ -108628,6 +108907,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15, y: -9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 698944570} - {fileID: 1121720568} @@ -108711,6 +108991,7 @@ RectTransform: 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: 2007501651} m_Father: {fileID: 1438336256} @@ -108749,6 +109030,7 @@ Transform: 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: 958374415} m_RootOrder: 1 @@ -108819,6 +109101,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.49999997, y: 0.84999996, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1304852186} - {fileID: 1549432369} @@ -108898,6 +109181,7 @@ RectTransform: 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: 1096748270} - {fileID: 344424549} @@ -109004,6 +109288,7 @@ RectTransform: 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: 1956597452} m_RootOrder: 0 @@ -109116,6 +109401,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1556616035} - {fileID: 1781107319} @@ -109163,6 +109449,7 @@ RectTransform: 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: 899694185} m_Father: {fileID: 610776505} @@ -109201,6 +109488,7 @@ Transform: 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: 477683941} m_RootOrder: 0 @@ -109217,6 +109505,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -109247,6 +109536,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -109270,6 +109560,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &877979923 ParticleSystem: @@ -109278,19 +109572,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 877979920} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -109840,6 +110134,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -114036,6 +114331,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 865940016} m_RootOrder: 0 @@ -114111,6 +114407,7 @@ RectTransform: 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: 1438336256} m_RootOrder: 0 @@ -114186,6 +114483,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1980562414} - {fileID: 1657046537} @@ -114302,6 +114600,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -11, y: 9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1291182100} - {fileID: 1630984067} @@ -114388,6 +114687,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426214703} m_RootOrder: 0 @@ -114482,6 +114782,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1, y: -6, z: 6.7609825} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 551619102} m_Father: {fileID: 1113185084} @@ -114610,6 +114911,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690621165} m_RootOrder: 1 @@ -114845,9 +115147,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cfdba4ab39859774dab558d713b06989, type: 3} m_Name: m_EditorClassIdentifier: - _panel_template: {fileID: 4136979550784496704, guid: 5045428a361e7e4429694ac7d62e2909, type: 3} - isOpen: 0 - taskList: [] --- !u!4 &940670623 Transform: m_ObjectHideFlags: 0 @@ -114858,6 +115157,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0000252938, y: -0.00013830999, z: -0.014879539} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -114890,6 +115190,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1975951753} - {fileID: 840846513} @@ -114975,6 +115276,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1508374561} m_RootOrder: 0 @@ -115052,6 +115354,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.4799998, y: 1.4799998, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1866620309} m_RootOrder: 0 @@ -115196,6 +115499,7 @@ Transform: 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: 253761062} m_RootOrder: 1 @@ -115266,6 +115570,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 303437406} m_Father: {fileID: 1068013555} @@ -115343,6 +115648,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743052381} m_RootOrder: 1 @@ -115437,6 +115743,7 @@ RectTransform: 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: 207170701} m_RootOrder: 0 @@ -115512,6 +115819,7 @@ Transform: 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: 464012281} m_RootOrder: 1 @@ -115582,6 +115890,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1465799243} - {fileID: 1938355872} @@ -115662,6 +115971,7 @@ RectTransform: 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: 1971055736} m_Father: {fileID: 845223941} @@ -115808,6 +116118,7 @@ Transform: 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: 18522982} m_RootOrder: 1 @@ -115878,6 +116189,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 657916325} - {fileID: 2143191129} @@ -115966,6 +116278,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1856409633} m_RootOrder: 3 @@ -116140,6 +116453,7 @@ Transform: 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: 0} m_RootOrder: 5 @@ -116172,6 +116486,7 @@ Transform: 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: 18522982} m_RootOrder: 0 @@ -116188,6 +116503,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -116218,6 +116534,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -116241,6 +116558,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1049545582 ParticleSystem: @@ -116249,19 +116570,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049545579} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -116811,6 +117132,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -120976,6 +121298,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1217169685} m_RootOrder: 2 @@ -121055,6 +121378,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1345908662} - {fileID: 989731994} @@ -121131,6 +121455,7 @@ RectTransform: 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: 1452828000} m_Father: {fileID: 1993824421} @@ -121167,6 +121492,7 @@ RectTransform: 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: 366350560} m_Father: {fileID: 610776505} @@ -121205,6 +121531,7 @@ RectTransform: 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: 858875760} m_RootOrder: 0 @@ -121290,6 +121617,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1609563328} - {fileID: 25102636} @@ -121367,6 +121695,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -23.399466, y: -22.451155, z: -494.28693} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 919303325} m_Father: {fileID: 0} @@ -121400,6 +121729,7 @@ Transform: 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: 827196535} m_RootOrder: 1 @@ -121470,6 +121800,7 @@ RectTransform: 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: 1012123456} m_RootOrder: 3 @@ -121548,6 +121879,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222310084} m_RootOrder: 2 @@ -121683,6 +122015,50 @@ MonoBehaviour: textEnglish: language textPolish: jezyk displayText: {fileID: 1133104833} +--- !u!1 &1133845000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1133845001} + - component: {fileID: 1133845002} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1133845001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133845000} + 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: 277471083} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1133845002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133845000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1140585616 GameObject: m_ObjectHideFlags: 0 @@ -121714,6 +122090,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1217169685} m_RootOrder: 3 @@ -121877,6 +122254,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4999999, y: 0.8499999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 131906520} - {fileID: 1956597452} @@ -121938,8 +122316,8 @@ GameObject: - component: {fileID: 1193017325} - component: {fileID: 1193017324} - component: {fileID: 1193017323} - - component: {fileID: 1193017322} - component: {fileID: 1193017326} + - component: {fileID: 1193017327} m_Layer: 0 m_Name: Door m_TagString: SceneTransition @@ -121947,25 +122325,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1193017322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1193017321} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7edafbad889ba34e9aae593d927c3a5, type: 3} - m_Name: - m_EditorClassIdentifier: - SaveController: {fileID: 1193017321} - gateway: - id: 0 - currentMapName: - coords: {x: 0.55, y: -10.48, z: 0} - nextMapName: SampleScene - respawnCoords: {x: 0, y: -4.5, z: 10} --- !u!50 &1193017323 Rigidbody2D: serializedVersion: 4 @@ -122023,6 +122382,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.55, y: -10.48, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -122039,6 +122399,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1193017327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193017321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3} + m_Name: + m_EditorClassIdentifier: + SaveController: {fileID: 1193017321} + gateway: + id: 0 + currentMapName: + coords: {x: 0.55, y: -10.48, z: 10} + nextMapName: SampleScene + respawnCoords: {x: 0, y: -4.5, z: 10} --- !u!1 &1193056560 GameObject: m_ObjectHideFlags: 0 @@ -122078,6 +122457,7 @@ Transform: 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: 90994618} m_Father: {fileID: 0} @@ -122124,6 +122504,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1068013555} m_RootOrder: 2 @@ -122268,6 +122649,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.7, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 0 @@ -122323,6 +122705,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -122391,6 +122774,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 845223941} m_RootOrder: 2 @@ -122471,6 +122855,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1612202805} m_Father: {fileID: 292791104} @@ -122573,6 +122958,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 37.2, y: 10.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 2 @@ -122626,6 +123012,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -122694,6 +123081,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1301601625} - {fileID: 486623990} @@ -122775,6 +123163,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 518089535} m_RootOrder: 0 @@ -122923,6 +123312,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 597381657} m_RootOrder: 0 @@ -123001,6 +123391,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222310084} m_RootOrder: 0 @@ -123166,6 +123557,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1491998336} m_RootOrder: 0 @@ -123273,6 +123665,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1392579422} m_RootOrder: 0 @@ -123383,6 +123776,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 90994618} m_RootOrder: 0 @@ -123398,6 +123792,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -182657,10 +183052,123 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 29.760506, y: -24.748878, z: -321.1878} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1288958686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1288958687} + - component: {fileID: 1288958692} + - component: {fileID: 1288958691} + - component: {fileID: 1288958690} + - component: {fileID: 1288958689} + - component: {fileID: 1288958688} + m_Layer: 0 + m_Name: UiManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1288958687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + 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: 557637066} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1288958688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cccb30d385eff4c468ee907498459813, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 0 + Elements: [] +--- !u!114 &1288958689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c41ad0a68f8aff469d175f905bbf89e, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 101 + Elements: [] + CurrentChestName: +--- !u!114 &1288958690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79e7954722c69764e9be36961af94d1e, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 105 + Elements: [] +--- !u!114 &1288958691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e09bf4772fa4f3042a7b2d2e04051247, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 105 + Elements: [] +--- !u!114 &1288958692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288958686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6684146805f4d85a427005443c221a6, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 113 + Elements: [] --- !u!1 &1290903873 GameObject: m_ObjectHideFlags: 0 @@ -182689,6 +183197,7 @@ RectTransform: 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: 610776505} m_RootOrder: 0 @@ -182764,6 +183273,7 @@ Transform: 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: 916349078} m_RootOrder: 0 @@ -182780,6 +183290,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -182810,6 +183321,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -182833,6 +183345,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1291182102 ParticleSystem: @@ -182841,19 +183357,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291182099} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -183403,6 +183919,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -187571,6 +188088,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1217169685} m_RootOrder: 0 @@ -187733,6 +188251,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 845223941} m_RootOrder: 0 @@ -187812,6 +188331,7 @@ Transform: 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: 2027990422} m_RootOrder: 1 @@ -187924,6 +188444,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1068013555} m_RootOrder: 0 @@ -187961,6 +188482,7 @@ RectTransform: 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: 146720943} m_RootOrder: 0 @@ -188036,6 +188558,7 @@ Transform: 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: 1970299934} m_RootOrder: 0 @@ -188052,6 +188575,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -188082,6 +188606,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -188105,6 +188630,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1379604781 ParticleSystem: @@ -188113,19 +188642,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1379604778} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -188675,6 +189204,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -192840,6 +193370,7 @@ Transform: 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: 2027990422} m_RootOrder: 0 @@ -192856,6 +193387,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -192886,6 +193418,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -192909,6 +193442,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1391870047 ParticleSystem: @@ -192917,19 +193454,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1391870044} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -193479,6 +194016,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -197644,6 +198182,7 @@ Transform: 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: 1833696466} m_RootOrder: 0 @@ -197660,6 +198199,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -197690,6 +198230,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -197713,6 +198254,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1392068704 ParticleSystem: @@ -197721,19 +198266,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1392068701} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -198283,6 +198828,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -202448,6 +202994,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1261810048} - {fileID: 1860177093} @@ -202526,6 +203073,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 698155434} m_RootOrder: 1 @@ -202607,6 +203155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -202639,6 +203188,7 @@ Transform: 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: 0} m_RootOrder: 6 @@ -202671,6 +203221,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 917887683} - {fileID: 78203886} @@ -202761,6 +203312,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 901446985} - {fileID: 831976368} @@ -202864,6 +203416,7 @@ RectTransform: 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: 1077108804} m_RootOrder: 0 @@ -202939,6 +203492,7 @@ Transform: 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: 464012281} m_RootOrder: 0 @@ -202955,6 +203509,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -202985,6 +203540,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -203008,6 +203564,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1453295264 ParticleSystem: @@ -203016,19 +203576,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1453295261} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -203578,6 +204138,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -207745,6 +208306,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1012123456} m_RootOrder: 0 @@ -207852,6 +208414,7 @@ Transform: 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: 90994618} m_RootOrder: 4 @@ -207867,6 +208430,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -219606,6 +220170,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1251808201} - {fileID: 105457316} @@ -219686,6 +220251,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593723514} m_RootOrder: 0 @@ -219763,6 +220329,7 @@ RectTransform: 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: 959073696} m_Father: {fileID: 1438336256} @@ -219803,6 +220370,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 698155434} m_RootOrder: 2 @@ -219953,6 +220521,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 605639183} m_RootOrder: 2 @@ -220104,6 +220673,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1491998336} m_RootOrder: 2 @@ -220267,6 +220837,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.8, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 144172499} m_RootOrder: 0 @@ -220361,6 +220932,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 845223941} m_RootOrder: 1 @@ -220442,6 +221014,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.48, y: 1.48, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 865356176} m_RootOrder: 0 @@ -220586,6 +221159,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41007156} m_RootOrder: 1 @@ -220665,6 +221239,7 @@ Transform: 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: 1833696466} m_RootOrder: 1 @@ -220735,6 +221310,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101338460} m_RootOrder: 0 @@ -220815,17 +221391,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ba28abf0f2ebba45a0f7743b05d08d9, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 260959342237683369, guid: d220ca711ae86664d8bb4f9c1622b13f, type: 3} - isOpen: 0 - _helmet: {fileID: 11400000, guid: fd21d2478d240f6469e739c04d9bfc9e, type: 2} - _chest: {fileID: 11400000, guid: 43fcc69d78c8c3847bbedde817f35b45, type: 2} - _boots: {fileID: 0} - _weapon: {fileID: 11400000, guid: d8ae7655d3a8a20498e956a98667e158, type: 2} - _potion_one: {fileID: 0} - _potion_two: {fileID: 0} - _potion_three: {fileID: 0} - _potion_four: {fileID: 0} - _potion_five: {fileID: 0} --- !u!4 &1610847533 Transform: m_ObjectHideFlags: 0 @@ -220836,6 +221401,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 873.9808, y: 640.6703, z: -1503.7872} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -220868,6 +221434,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1205964161} m_RootOrder: 0 @@ -220947,6 +221514,7 @@ Transform: 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: 916349078} m_RootOrder: 1 @@ -221048,6 +221616,7 @@ RectTransform: 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: 1738591102} m_RootOrder: 1 @@ -221123,6 +221692,7 @@ Transform: 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: 910263151} m_RootOrder: 1 @@ -221193,6 +221763,7 @@ RectTransform: 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: 1677041282} m_RootOrder: 2 @@ -221268,6 +221839,7 @@ RectTransform: 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: 304730968} - {fileID: 477634855} @@ -221293,6 +221865,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: slider: {fileID: 1677041284} + maxHealth: 0 + health: 0 --- !u!114 &1677041284 MonoBehaviour: m_ObjectHideFlags: 0 @@ -221372,6 +221946,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1856409633} m_RootOrder: 1 @@ -221451,6 +222026,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 743480049} - {fileID: 933251617} @@ -221530,6 +222106,7 @@ Transform: 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: 253761062} m_RootOrder: 0 @@ -221546,6 +222123,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -221576,6 +222154,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -221599,6 +222178,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1704775976 ParticleSystem: @@ -221607,19 +222190,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1704775973} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -222169,6 +222752,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -226395,6 +226979,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 44.2, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 326555399} m_RootOrder: 4 @@ -226448,6 +227033,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -226516,6 +227102,7 @@ RectTransform: 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: 1426214703} m_RootOrder: 4 @@ -226591,6 +227178,7 @@ RectTransform: 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: 72027012} - {fileID: 1650688810} @@ -226616,6 +227204,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: slider: {fileID: 1738591104} + maxHealth: 0 + health: 0 --- !u!114 &1738591104 MonoBehaviour: m_ObjectHideFlags: 0 @@ -226721,6 +227311,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4530646, y: -3.8489263, z: 4.197498} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -226753,6 +227344,7 @@ Transform: 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: 708949758} m_RootOrder: 0 @@ -226769,6 +227361,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -226799,6 +227392,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -226822,6 +227416,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1767827231 ParticleSystem: @@ -226830,19 +227428,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1767827228} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -227392,6 +227990,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -231559,6 +232158,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 865356176} m_RootOrder: 1 @@ -231706,6 +232306,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690621165} m_RootOrder: 3 @@ -231869,6 +232470,7 @@ Transform: 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: 270516053} m_RootOrder: 0 @@ -231885,6 +232487,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -231915,6 +232518,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -231938,6 +232542,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1811764004 ParticleSystem: @@ -231946,19 +232554,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1811764001} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -232508,6 +233116,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -236673,6 +237282,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41007156} m_RootOrder: 0 @@ -236752,6 +237362,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -8, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1392068702} - {fileID: 1591450955} @@ -236837,6 +237448,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.6999999, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 255731521} - {fileID: 1683754330} @@ -236916,6 +237528,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 724414189} m_Father: {fileID: 1392579422} @@ -237054,6 +237667,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 973869403} - {fileID: 2007160025} @@ -237111,6 +237725,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1012123456} m_RootOrder: 2 @@ -237275,6 +237890,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 605639183} m_RootOrder: 3 @@ -237428,6 +238044,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1012123456} m_RootOrder: 1 @@ -237616,6 +238233,7 @@ Transform: 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: 96776836} m_RootOrder: 0 @@ -237632,6 +238250,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -237662,6 +238281,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -237685,6 +238305,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1950591504 ParticleSystem: @@ -237693,19 +238317,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950591501} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -238255,6 +238879,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -242436,6 +243061,7 @@ Transform: 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: 0} m_RootOrder: 16 @@ -242468,6 +243094,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3.5, y: 3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 860173531} m_Father: {fileID: 1174630501} @@ -242550,6 +243177,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593723514} m_RootOrder: 3 @@ -242709,6 +243337,7 @@ Transform: 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: 90994618} m_RootOrder: 2 @@ -242724,6 +243353,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -243247,6 +243877,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -12, y: -5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1379604779} - {fileID: 261951960} @@ -243332,6 +243963,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.8, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1025745583} m_RootOrder: 0 @@ -243411,6 +244043,7 @@ Transform: 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: 958374415} m_RootOrder: 0 @@ -243427,6 +244060,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -243457,6 +244091,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -243480,6 +244115,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1975951755 ParticleSystem: @@ -243488,19 +244127,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975951752} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -244050,6 +244689,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -248215,6 +248855,7 @@ Transform: 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: 910263151} m_RootOrder: 0 @@ -248231,6 +248872,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -248261,6 +248903,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -248284,6 +248927,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1980562416 ParticleSystem: @@ -248292,19 +248939,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980562413} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -248854,6 +249501,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 10 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -253019,6 +253667,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593723514} m_RootOrder: 2 @@ -253097,6 +253746,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.9589837} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 465393497} - {fileID: 1077108804} @@ -253201,6 +253851,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 701772477} m_RootOrder: 0 @@ -253297,6 +253948,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.4999998, y: 1.4999998, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1866620309} m_RootOrder: 1 @@ -253441,6 +254093,7 @@ RectTransform: 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: 831976368} m_RootOrder: 0 @@ -253516,6 +254169,7 @@ Transform: 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: 477683941} m_RootOrder: 1 @@ -253588,6 +254242,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426214703} m_RootOrder: 2 @@ -253735,6 +254390,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -12, y: 22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1391870045} - {fileID: 1307144893} @@ -253822,6 +254478,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 605639183} m_RootOrder: 1 @@ -254008,6 +254665,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690621165} m_RootOrder: 2 @@ -254174,6 +254832,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222310084} m_RootOrder: 3 @@ -254337,6 +254996,7 @@ RectTransform: 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: 858875760} m_RootOrder: 2 @@ -254412,6 +255072,7 @@ Transform: 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: 1039853848} m_RootOrder: 1 @@ -254482,6 +255143,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292791104} m_RootOrder: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 4e85a24a..0c172b17 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -469,6 +469,7 @@ MonoBehaviour: isKilled: 0 isKilled2: 0 expValue: 5 + dmgValue: 0 --- !u!114 &8620312 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1129,6 +1130,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 88145926} m_CullTransparentMesh: 1 +--- !u!1 &121907410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 121907411} + - component: {fileID: 121907412} + m_Layer: 0 + m_Name: ChestManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &121907411 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121907410} + 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: 1602706375} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &121907412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 121907410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0b2d7931c00ea64eb1da159de0455e0, type: 3} + m_Name: + m_EditorClassIdentifier: + CurrentChest: + id: 0 + name: + description: + chestModel: {fileID: 0} + ChestType: 0 + Content: [] + UiManager: {fileID: 0} + ElementsToBuildOnSceneList: + - Name: + PrefabAssetName: + Position: + - -409.8 + - -216.4 + - 10 + ChestData: + id: 0 + name: Wooden Chest 1 + modelName: Wooden Chest + description: + type: 0 + content: + - Key: 4 + Value: + id: 0 + name: Pickaxe + modelName: Pickaxe + description: + level: 0 + imageName: + strengthBonus: 0 + agilityBonus: 0 + inteligenceBonus: 0 + vitalityBonus: 0 + isStackable: 0 + equipmentType: 5 + - Name: + PrefabAssetName: + Position: + - -382 + - -201 + - 10 + ChestData: + id: 0 + name: Gold Chest 2 + modelName: Gold Chest + description: + type: 2 + content: [] + - Name: + PrefabAssetName: + Position: + - -376.5 + - -224.8 + - 10 + ChestData: + id: 0 + name: Wooden Chest + modelName: Wooden Chest + description: + type: 0 + content: [] + convertedData: [] --- !u!1 &131599442 GameObject: m_ObjectHideFlags: 0 @@ -1324,7 +1431,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &148988773 MonoBehaviour: @@ -1339,6 +1446,51 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: musicSlider: {fileID: 1463806451} +--- !u!1 &149978585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149978586} + - component: {fileID: 149978587} + m_Layer: 0 + m_Name: Equipment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &149978586 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149978585} + 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: 1273555370} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &149978587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149978585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3} + m_Name: + m_EditorClassIdentifier: + ElementsToBuildOnSceneList: [] + convertedData: [] --- !u!1 &158729764 GameObject: m_ObjectHideFlags: 0 @@ -1463,10 +1615,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26a44ba4cba1985408fca11ba424361c, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 5331092055018478733, guid: 2b46aee216d4b304f8aebcb303ebf4f4, type: 3} - isOpen: 0 - chest: {fileID: 158729764} - developerList: [] --- !u!95 &158729769 Animator: serializedVersion: 3 @@ -1602,7 +1750,7 @@ Transform: - {fileID: 1143151251} - {fileID: 1058265262} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &174581753 GameObject: @@ -1791,7 +1939,7 @@ RectTransform: - {fileID: 3269899} - {fileID: 1464669569} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1836,7 +1984,7 @@ Transform: - {fileID: 2132075799} - {fileID: 682072030} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &220874724 GameObject: @@ -2091,6 +2239,7 @@ MonoBehaviour: isKilled: 0 isKilled2: 0 expValue: 5 + dmgValue: 0 --- !u!50 &242009515 Rigidbody2D: serializedVersion: 4 @@ -2355,7 +2504,7 @@ Transform: m_LocalScale: {x: 7.1499996, y: 7.1499996, z: 6} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!199 &259955963 ParticleSystemRenderer: @@ -7305,7 +7454,7 @@ Transform: m_Children: - {fileID: 132185247} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &271856464 GameObject: @@ -25349,7 +25498,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &440573952 GameObject: @@ -25799,7 +25948,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &562803612 GameObject: @@ -25876,51 +26025,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562803612} m_CullTransparentMesh: 1 ---- !u!1 &563016210 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 563016212} - - component: {fileID: 563016211} - m_Layer: 0 - m_Name: Inventory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &563016211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 563016210} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7610fa3cdda79614e94110dd314fbfed, type: 3} - m_Name: - m_EditorClassIdentifier: - _panel: {fileID: 9124304227729624651, guid: e9cbfeb9e69af1245bc3180e86ff23f6, type: 3} - isOpen: 0 ---- !u!4 &563016212 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 563016210} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 727.6137, y: 542.32117, z: -1282.3181} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &564650392 GameObject: m_ObjectHideFlags: 0 @@ -35641,7 +35745,7 @@ Transform: - {fileID: 1200894937} - {fileID: 359978800} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &708386335 GameObject: @@ -36447,122 +36551,6 @@ MonoBehaviour: textEnglish: continue textPolish: kontynuuj displayText: {fileID: 788474929} ---- !u!1 &805783477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 805783479} - - component: {fileID: 805783483} - - component: {fileID: 805783478} - - component: {fileID: 805783480} - - component: {fileID: 805783481} - - component: {fileID: 805783482} - m_Layer: 0 - m_Name: LocalSceneManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &805783478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3414ebe7b0de81b47a6726905f4c1322, type: 3} - m_Name: - m_EditorClassIdentifier: - StaticElements: [] - DynamicElements: [] - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: EquippableItem - ItemsListName: EquippableItemList ---- !u!4 &805783479 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.8525665, y: -0.1126967, z: -140.81984} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &805783480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b8a65f0b147a2e44e8f244301ff0de57, type: 3} - m_Name: - m_EditorClassIdentifier: - TaskElements: [] - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: Quest - ItemsListName: QuestsList ---- !u!114 &805783481 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ef71482e4d2df8440a1117e181018706, type: 3} - m_Name: - m_EditorClassIdentifier: - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: InventoryItem - ItemsListName: InventoryItemList ---- !u!114 &805783482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e11719a854a3211459e4fb55658c64c3, type: 3} - m_Name: - m_EditorClassIdentifier: - avatar: {fileID: 0} - AvatarClone: {fileID: 0} - startPosition: {x: 0, y: 0, z: 0} ---- !u!114 &805783483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fbd4e55be86a9d49adcb35c89ee9c18, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &805898524 GameObject: m_ObjectHideFlags: 0 @@ -36572,8 +36560,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 805898525} - - component: {fileID: 805898527} - - component: {fileID: 805898526} m_Layer: 0 m_Name: Chest1-InteractionMSG m_TagString: Untagged @@ -36593,39 +36579,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1168411278} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &805898526 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 805783477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b522b9a99467e740adc3e2ce6036ebe, type: 3} - m_Name: - m_EditorClassIdentifier: - StaticElements: - - name: Prize Chest - prefarbAssetName: Prize Chest - position: {x: 0.8, y: 75.6, z: 20} - - name: Gold Chest - prefarbAssetName: Gold Chest - position: {x: 43.3, y: 57.6, z: 20} - - name: Wooden Chest one - prefarbAssetName: Wooden Chest - position: {x: 56.3, y: 0.6, z: 20} - - name: Wooden Chest two - prefarbAssetName: Wooden Chest - position: {x: -23.65, y: 20.7, z: 20} - DynamicElements: [] - isNewGame: 1 - isContinued: 0 - MapName: - ElementFolderName: Chest - ItemsListName: ChestList --- !u!1 &824404437 GameObject: m_ObjectHideFlags: 0 @@ -37042,60 +36997,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Obj: {fileID: 641696201} ---- !u!1 &877553605 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 877553607} - - component: {fileID: 877553606} - m_Layer: 0 - m_Name: Equipment - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &877553606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 877553605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ba28abf0f2ebba45a0f7743b05d08d9, type: 3} - m_Name: - m_EditorClassIdentifier: - _panel: {fileID: 260959342237683369, guid: d220ca711ae86664d8bb4f9c1622b13f, type: 3} - isOpen: 0 - _helmet: {fileID: 0} - _chest: {fileID: 0} - _boots: {fileID: 0} - _weapon: {fileID: 0} - _potion_one: {fileID: 0} - _potion_two: {fileID: 0} - _potion_three: {fileID: 0} - _potion_four: {fileID: 0} - _potion_five: {fileID: 0} ---- !u!4 &877553607 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 877553605} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 727.6137, y: 542.32117, z: -1282.3181} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &880342281 GameObject: m_ObjectHideFlags: 0 @@ -37124,7 +37025,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &887082958 GameObject: @@ -37582,9 +37483,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: Player, Assembly-CSharp - m_MethodName: SaveCheckpoint + - m_Target: {fileID: 897697754} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveChests m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -37814,7 +37715,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1168411278} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &926459325 MonoBehaviour: @@ -37828,11 +37729,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26a44ba4cba1985408fca11ba424361c, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 5331092055018478733, guid: 2b46aee216d4b304f8aebcb303ebf4f4, type: 3} - isOpen: 0 - chest: {fileID: 926459323} - developerList: - - {fileID: 11400000, guid: 5935777f7ac390a4187e03f34e7cafdd, type: 2} --- !u!61 &926459326 BoxCollider2D: m_ObjectHideFlags: 0 @@ -38573,8 +38469,9 @@ GameObject: m_IsActive: 1 --- !u!4 &1027343185 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5754902894522036728, guid: 3c4c4514921bad449bbfab46d86ee881, type: 3} - m_PrefabInstance: {fileID: 5754902894740927145} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027343184} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -38582,7 +38479,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1168411278} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1027343186 SpriteRenderer: @@ -38673,10 +38570,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26a44ba4cba1985408fca11ba424361c, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 5331092055018478733, guid: 2b46aee216d4b304f8aebcb303ebf4f4, type: 3} - isOpen: 0 - chest: {fileID: 1027343184} - developerList: [] --- !u!95 &1027343189 Animator: serializedVersion: 3 @@ -38801,52 +38694,6 @@ Transform: m_Father: {fileID: 166697418} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1071120246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1071120248} - - component: {fileID: 1071120247} - m_Layer: 0 - m_Name: QuestPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1071120247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071120246} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfdba4ab39859774dab558d713b06989, type: 3} - m_Name: - m_EditorClassIdentifier: - _panel_template: {fileID: 4136979550784496704, guid: 5045428a361e7e4429694ac7d62e2909, type: 3} - isOpen: 0 - taskList: [] ---- !u!4 &1071120248 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071120246} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1286.3684, y: 528.8063, z: -320.55316} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1081484090 GameObject: m_ObjectHideFlags: 0 @@ -39367,9 +39214,11 @@ Transform: - {fileID: 158729765} - {fileID: 1265465283} - {fileID: 1027343185} - - {fileID: 3972494989525988937} + - {fileID: 805898525} + - {fileID: 1698721847} + - {fileID: 926459324} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1177353679 GameObject: @@ -39439,6 +39288,7 @@ MonoBehaviour: maxExp: 0 levelBar: {fileID: 0} minPlayerExp: {fileID: 0} + attackValue: 0 --- !u!114 &1177353682 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39577,7 +39427,7 @@ Transform: - {fileID: 311956049} - {fileID: 683424792} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1200894936 GameObject: @@ -40394,8 +40244,9 @@ GameObject: m_IsActive: 1 --- !u!4 &1265465283 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4669568061092186073, guid: 5cf1cdd5626b6894f824d7c7edcdc166, type: 3} - m_PrefabInstance: {fileID: 4669568061974884378} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265465282} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -40403,7 +40254,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1168411278} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1265465284 SpriteRenderer: @@ -40494,10 +40345,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26a44ba4cba1985408fca11ba424361c, type: 3} m_Name: m_EditorClassIdentifier: - _panel: {fileID: 5331092055018478733, guid: 2b46aee216d4b304f8aebcb303ebf4f4, type: 3} - isOpen: 0 - chest: {fileID: 1265465282} - developerList: [] --- !u!95 &1265465287 Animator: serializedVersion: 3 @@ -40517,6 +40364,39 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1273555369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1273555370} + m_Layer: 0 + m_Name: PlayerManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1273555370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1273555369} + 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: 1833717355} + - {fileID: 149978586} + - {fileID: 2073875298} + m_Father: {fileID: 1602706375} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1290527200 GameObject: m_ObjectHideFlags: 0 @@ -41589,6 +41469,117 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1457144445} m_CullTransparentMesh: 1 +--- !u!1 &1458715758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1458715759} + - component: {fileID: 1458715764} + - component: {fileID: 1458715763} + - component: {fileID: 1458715762} + - component: {fileID: 1458715761} + - component: {fileID: 1458715760} + m_Layer: 0 + m_Name: UiManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1458715759 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + 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: 1602706375} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1458715760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cccb30d385eff4c468ee907498459813, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 0 + Elements: [] +--- !u!114 &1458715761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c41ad0a68f8aff469d175f905bbf89e, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 101 + Elements: [] + CurrentChestName: +--- !u!114 &1458715762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79e7954722c69764e9be36961af94d1e, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 105 + Elements: [] +--- !u!114 &1458715763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e09bf4772fa4f3042a7b2d2e04051247, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 105 + Elements: [] +--- !u!114 &1458715764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458715758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6684146805f4d85a427005443c221a6, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 113 + Elements: [] --- !u!1 &1463806449 GameObject: m_ObjectHideFlags: 0 @@ -42055,6 +42046,102 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1602706374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1602706375} + - component: {fileID: 1602706379} + - component: {fileID: 1602706378} + - component: {fileID: 1602706376} + - component: {fileID: 1602706377} + m_Layer: 0 + m_Name: SceneManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1602706375 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602706374} + 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: 1458715759} + - {fileID: 1273555370} + - {fileID: 121907411} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1602706376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602706374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8081574e3f851e4d9335be93900a94e, type: 3} + m_Name: + m_EditorClassIdentifier: + DraggedSlotImageTemplate: {fileID: 6570396142606985298, guid: 1304511dd1dfefc449e87c3d904ab15f, type: 3} + DraggedSlotImage: {fileID: 0} + _draggedSlot: {fileID: 0} +--- !u!114 &1602706377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602706374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3414ebe7b0de81b47a6726905f4c1322, type: 3} + m_Name: + m_EditorClassIdentifier: + StaticElements: [] + DynamicElements: [] + MapName: + ElementFolderName: EquippableItem + ItemsListName: EquippableItemList +--- !u!114 &1602706378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602706374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fbd4e55be86a9d49adcb35c89ee9c18, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1602706379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602706374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e11719a854a3211459e4fb55658c64c3, type: 3} + m_Name: + m_EditorClassIdentifier: + avatar: {fileID: 0} + AvatarClone: {fileID: 0} + startPosition: {x: 0, y: 0, z: 0} --- !u!1 &1644923230 GameObject: m_ObjectHideFlags: 0 @@ -132822,7 +132909,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1168411278} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1698721848 MonoBehaviour: @@ -133492,6 +133579,49 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1821814465} m_CullTransparentMesh: 1 +--- !u!1 &1833717354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1833717355} + - component: {fileID: 1833717356} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1833717355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833717354} + 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: 1273555370} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1833717356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833717354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2abcc8484cbc4084baa69da81c59fc3d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1843922266 GameObject: m_ObjectHideFlags: 0 @@ -133875,67 +134005,6 @@ Transform: m_Father: {fileID: 166697418} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1948226836 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4126821754175378127, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_Name - value: Basic_Sword - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalPosition.x - value: -1.1483517 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalPosition.y - value: 2.2197802 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5029889951288834834, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8281463047152580519, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - propertyPath: triggered - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} --- !u!1 &1969780556 GameObject: m_ObjectHideFlags: 0 @@ -134000,7 +134069,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1995903830 GameObject: @@ -134013,8 +134082,8 @@ GameObject: - component: {fileID: 1995903835} - component: {fileID: 1995903834} - component: {fileID: 1995903833} - - component: {fileID: 1995903832} - component: {fileID: 1995903831} + - component: {fileID: 1995903836} m_Layer: 0 m_Name: DoorToHell m_TagString: SceneTransition @@ -134034,25 +134103,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1995903832 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995903830} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7edafbad889ba34e9aae593d927c3a5, type: 3} - m_Name: - m_EditorClassIdentifier: - SaveController: {fileID: 1995903830} - gateway: - id: 0 - currentMapName: - coords: {x: 0, y: 0, z: 0} - nextMapName: WizardHouse - respawnCoords: {x: -5, y: 1.5, z: 10} --- !u!50 &1995903833 Rigidbody2D: serializedVersion: 4 @@ -134112,8 +134162,27 @@ Transform: m_LocalScale: {x: 1.975, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1995903836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995903830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3} + m_Name: + m_EditorClassIdentifier: + SaveController: {fileID: 1995903830} + gateway: + id: 0 + currentMapName: + coords: {x: 0, y: 0, z: 0} + nextMapName: WizardHouse + respawnCoords: {x: -5, y: 1.5, z: 10} --- !u!1 &2020454682 GameObject: m_ObjectHideFlags: 0 @@ -134125,8 +134194,8 @@ GameObject: - component: {fileID: 2020454686} - component: {fileID: 2020454685} - component: {fileID: 2020454684} - - component: {fileID: 2020454683} - component: {fileID: 2020454687} + - component: {fileID: 2020454688} m_Layer: 0 m_Name: Door m_TagString: SceneTransition @@ -134134,25 +134203,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2020454683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2020454682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7edafbad889ba34e9aae593d927c3a5, type: 3} - m_Name: - m_EditorClassIdentifier: - SaveController: {fileID: 2020454682} - gateway: - id: 0 - currentMapName: - coords: {x: 0, y: 0, z: 0} - nextMapName: CaveEntrance - respawnCoords: {x: 0.55, y: -11.5, z: 10} --- !u!50 &2020454684 Rigidbody2D: serializedVersion: 4 @@ -134212,7 +134262,7 @@ Transform: m_LocalScale: {x: 1.975, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2020454687 MonoBehaviour: @@ -134226,6 +134276,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &2020454688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020454682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3} + m_Name: + m_EditorClassIdentifier: + SaveController: {fileID: 2020454682} + gateway: + id: 0 + currentMapName: + coords: {x: 0, y: 0, z: 0} + nextMapName: CaveEntrance + respawnCoords: {x: 0.55, y: -11.5, z: 10} --- !u!1 &2042296513 GameObject: m_ObjectHideFlags: 0 @@ -134438,7 +134507,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2051744379 GameObject: @@ -134469,7 +134538,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &2051744381 PolygonCollider2D: @@ -134554,6 +134623,50 @@ Transform: m_Father: {fileID: 166697418} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2073875297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2073875298} + - component: {fileID: 2073875299} + m_Layer: 0 + m_Name: Task + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2073875298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073875297} + 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: 1273555370} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2073875299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073875297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 696dabb3bc014c2181a73c86e59506cb, type: 3} + m_Name: + m_EditorClassIdentifier: + ElementsToBuildOnSceneList: [] --- !u!1 &2105401424 GameObject: m_ObjectHideFlags: 0 @@ -134633,7 +134746,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2132075798 GameObject: @@ -134991,9 +135104,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: Player, Assembly-CSharp - m_MethodName: SaveCheckpoint + - m_Target: {fileID: 2146696734} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveChests m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -135127,7 +135240,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_RootOrder - value: 23 + value: 19 objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Item/PickableController.cs b/Assets/Scripts/Item/PickableController.cs index 2317aa32..302f900e 100644 --- a/Assets/Scripts/Item/PickableController.cs +++ b/Assets/Scripts/Item/PickableController.cs @@ -42,6 +42,10 @@ public class PickableController : MonoBehaviour if(!InventoryUIManager.Instance.IsFull()) { InventoryUIManager.Instance.Add(this.item); + + if(InventoryUIManager.Instance.GetPanelStatus()) + GameObject.FindObjectOfType().BuildPanelContent(InventoryUIManager.Instance.GetList()); + isPicked = 1; //PlayerPrefs.SetInt(name, isPicked); //gameObject.SetActive(false); @@ -57,7 +61,7 @@ public class PickableController : MonoBehaviour } } - private void OnTrigerEnter2D(Collider2D collision) + private void OnTriggerEnter2D(Collider2D collision) { if (collision.tag == "Player") { diff --git a/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs b/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs index bfc55475..c6076b39 100644 --- a/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs +++ b/Assets/Scripts/NPCs' Scripts/NPCDialogue.cs @@ -52,8 +52,6 @@ public class NPCDialogue : MonoBehaviour sentences = new Queue(); sentencesWQuest = new Queue(); sentencesAQuest = new Queue(); - - } public void TriggerDialogue() @@ -326,7 +324,15 @@ public class NPCDialogue : MonoBehaviour InventoryUIManager.Instance.RemoveByPosition(questItem[0].Key); - // 2. Set as finished + // 3. remove quest from player list + var task = TaskUIManager.Instance.FindTaskByName(gameObject.GetComponent().quest.Title); + + if (task.Count == 0) + Debug.LogError($"Task '{gameObject.GetComponent().quest.Title}' not found"); + else + TaskUIManager.Instance.RemoveByName(gameObject.GetComponent().quest.Title); + + // 3. Set as finished isQuest = 3; EndDialogue(); } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 1fcc8915..cb160799 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -174,16 +174,17 @@ public class Player : MonoBehaviour private void HandleAttacks() { + if (canWalk == true) { - if (!EquipmentUIManager.Instance.GetList().Select(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First()) + if (EquipmentUIManager.Instance.GetList().Count() == 0 || EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).Count() == 0) return; - if (EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First().Value.Name.Equals("pickaxe_test") && attackSword) + if (EquipmentUIManager.Instance.GetList().Count() != 0 && EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).First().Value.Name.Equals("Pickaxe") && attackSword) { myAnimator.SetTrigger("pickaxe"); } - else if (attackSword && EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First().Value.Name.Equals("Basic_Sword")) + else if (attackSword && EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).First().Value.Name.Equals("Basic Sword")) { myAnimator.SetTrigger("attack"); } @@ -356,16 +357,20 @@ public class Player : MonoBehaviour public void ManageStrength() { - if (!EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First().Value) + if (EquipmentUIManager.Instance.GetList().Count() == 0 || EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).Count() == 0) { attackValue = 0f; } - else if (EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First().Value.Name.Equals("pickaxe_test")) + else if (EquipmentUIManager.Instance.GetList().Count() != 0 && + EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).Count() > 0 && + EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).First().Value.Name.Equals("Pickaxe")) { attackValue = 0.5f; PlayerPrefs.SetFloat("attackValue", attackValue); } - else if (EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot).First().Value.Name.Equals("Basic_Sword")) + else if (EquipmentUIManager.Instance.GetList().Count() != 0 && + EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).Count() > 0 && + EquipmentUIManager.Instance.GetList().Where(el => el.Key == (int)EquipmentPanelSlotsTypeEnum.WeaponSlot && el.Value != null).First().Value.Name.Equals("Basic Sword")) { attackValue = 1.0f; PlayerPrefs.SetFloat("attackValue", attackValue); diff --git a/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs b/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs index 727057da..effc9d9c 100644 --- a/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs +++ b/Assets/Scripts/REFACTORING/Application/Chest/ChestController.cs @@ -24,6 +24,11 @@ public class ChestController : MonoBehaviour ChestUIManager.Instance.CurrentChestName = null; ChestUIManager.Instance.ClosePanel(); + + // Close additiona panels + if (EquipmentUIManager.Instance.GetPanelStatus()) EquipmentUIManager.Instance.ClosePanel(); + + if (InventoryUIManager.Instance.GetPanelStatus()) InventoryUIManager.Instance.ClosePanel(); } } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SaveChestManager.cs b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SaveChestManager.cs index ce5aa603..384cb4d8 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SaveChestManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SaveChestManager.cs @@ -62,12 +62,12 @@ public class SaveChestManager : SaveModelSystem // Support function // 1. From model to data format - private ChestPrefabAssetData ConvertObjectToDataModel(ChestPrefabAsset model) + public static ChestPrefabAssetData ConvertObjectToDataModel(ChestPrefabAsset model) { return new ChestPrefabAssetData(model); } - private List ConvertObjectsListToListOfDataModels(List modelsList) + public static List ConvertObjectsListToListOfDataModels(List modelsList) { List convertedList = new List(); @@ -80,12 +80,12 @@ public class SaveChestManager : SaveModelSystem } // 2. From data to model format - private ChestPrefabAsset ConvertDataModelToObject(ChestPrefabAssetData dataModel) + public static ChestPrefabAsset ConvertDataModelToObject(ChestPrefabAssetData dataModel) { return (ChestPrefabAsset)dataModel.MapDataToPrefabAssetModel(); } - private List ConvertListOfDataModelsToListOfObject(List dataModelsList) + public static List ConvertListOfDataModelsToListOfObject(List dataModelsList) { List convertedList = new List(); diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataLoader.cs b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataLoader.cs index 0c92f084..30ada43b 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataLoader.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataLoader.cs @@ -87,9 +87,6 @@ public class SceneChestDataLoader : SceneBaseDataLoader */ - - protected override List LoadStaticData() { throw new System.NotImplementedException(); } - protected override List LoadDynamicData() { SaveModelSystem.Path = PathBuilder.BuildSavePath().WithMap(CurrentMap).WithDataType(SceneElementTypeEnum.Dynamic).GetString(); @@ -97,23 +94,11 @@ public class SceneChestDataLoader : SceneBaseDataLoader return SaveModelSystem.LoadModelList(); } - protected override bool SaveStaticData(List _elements) { throw new System.NotImplementedException(); } - protected override bool SaveDynamicData(List _elements) { SaveModelSystem.Path = PathBuilder.BuildSavePath().WithMap(CurrentMap).WithDataType(SceneElementTypeEnum.Dynamic).GetString(); - Debug.Log(SaveModelSystem.Path); - - try - { - SaveModelSystem.SaveModelList(_elements); - - return true; - } - catch (Exception e) { Debug.LogError(e.Message); } - - return false; + return base.SaveDynamicData(_elements); } protected override List LoadGenericData() { throw new NotImplementedException(); } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataManager.cs b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataManager.cs index a73a0599..feb66ca8 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Chest/SceneChestDataManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; [Serializable] @@ -15,14 +16,11 @@ public class SceneChestDataManager : SceneBaseDataManager [SerializeField] Chest CurrentChest; + [SerializeField] protected new ChestUIManager UiManager; + [SerializeField] public List ElementsToBuildOnSceneList = new List(); - - - [SerializeField] List convertDataToAsset = new List(); + [SerializeField] List convertedData = new List(); - - // tmp var - bool NewGame = true; public override void Awake() { @@ -37,68 +35,24 @@ public class SceneChestDataManager : SceneBaseDataManager } } - private void Start() + public override void Start() { Debug.Log("Start SceneChestData manager"); //TaskUIManager.FindOrCreateInstance(); - var chestManager = ChestUIManager.Instance; + UiManager = ChestUIManager.Instance; - if (chestManager == null) + if (UiManager == null) throw new NullReferenceException("ChestUIManager not found!!!"); - StaticDataList = (new ChestDataListManager()).SetUiManager(ref chestManager); - DynamicDataList = (new ChestDataListManager()).SetUiManager(ref chestManager); + DynamicDataList = (new ChestDataListManager()).SetUiManager(ref UiManager); DataLoader = new SceneChestDataLoader(OBJECT_LIST_NAME, OBJECT_FOLDER_NAME); ChestBuilder = new SceneChestBuilder(); - //ChestBuilder.ElementsToBuildOnSceneList = ElementsToBuildOnSceneList; - - //SaveData(StaticDataList.GetList(), SceneElementTypeEnum.None); - - //LoadData(SceneElementTypeEnum.None, ref StaticDataList); - // LoadDynamicData(); - - //inventoryManager.SetList(StaticDataList.GetList()); - - //inventoryManager.OpenPanel(); - - if (NewGame) - { - foreach (ChestPrefabAssetData asset in ElementsToBuildOnSceneList) { convertDataToAsset.Add((ChestPrefabAsset)asset.MapDataToPrefabAssetModel()); } - - ChestBuilder.ElementsToBuildOnSceneList = convertDataToAsset; - ChestBuilder.BuildList(); - DynamicDataList.SetList(convertDataToAsset); - - List tmp = new List(); - foreach (ChestPrefabAsset asset in ChestBuilder.ElementsToBuildOnSceneList) { tmp.Add(asset.Chest); } - - chestManager.SetList(tmp); - } - else - { - LoadDynamicData(); - - ChestBuilder.ElementsToBuildOnSceneList = DynamicDataList.GetList(); - ChestBuilder.BuildList(); - - List tmp = new List(); - foreach (ChestPrefabAsset asset in ChestBuilder.ElementsToBuildOnSceneList) { tmp.Add(asset.Chest); } - - chestManager.SetList(tmp); - - - - // BuildList(); - - // when chest detect player in near arrea and player press "c" - // open panel -> chest controller handle Open panel in Scene Chest Manager passing info about what Chest Palyer want to open - // Manager Build panel and pass info about chest content - } + base.Start(); } // TODO - save ChestPrefabAsset (we need to save coords...) but in manager handle Chest data.. @@ -117,17 +71,76 @@ public class SceneChestDataManager : SceneBaseDataManager } + + protected override void UseDefaultSettings() + { + foreach (ChestPrefabAssetData asset in ElementsToBuildOnSceneList) { convertedData.Add((ChestPrefabAsset)asset.MapDataToPrefabAssetModel()); } + + ChestBuilder.ElementsToBuildOnSceneList = convertedData; + ChestBuilder.BuildList(); + + + DynamicDataList.SetList(convertedData); + + List tmp = new List(); + foreach (ChestPrefabAsset asset in ChestBuilder.ElementsToBuildOnSceneList) { tmp.Add(asset.Chest); } + + UiManager.SetList(tmp); + } + + protected override void UseDynamicSettings() + { + // BuildList(); + + // when chest detect player in near arrea and player press "c" + // open panel -> chest controller handle Open panel in Scene Chest Manager passing info about what Chest Palyer want to open + // Manager Build panel and pass info about chest content + LoadDynamicData(); + + + // VERy VERY provisional SOLUTION + if (DynamicDataList.GetList().Count == 0) + { + UseDefaultSettings(); + return; + } + + ChestBuilder.ElementsToBuildOnSceneList = DynamicDataList.GetList(); + ChestBuilder.BuildList(); + + List tmp = new List(); + foreach (ChestPrefabAsset asset in ChestBuilder.ElementsToBuildOnSceneList) { tmp.Add(asset.Chest); } + + UiManager.SetList(tmp); + } + // TODO manager api // open panel extend function // close panel extend function - public void OpenPanel(string chestName) - { - } // TODO chest api // add to chest - find chest by its name np // remove from chest - select chest by its name - // chesk item in chest - check chest by tis name + + public override bool SaveDynamicData() + { + // TODO + // how to get list + // 1. List in UI manager should be synchronized with list in this manager + + foreach (Chest chest in UiManager.GetList()) + { + DynamicDataList.GetList().Where(el => el.Name == chest.Name).ToList().ForEach(slot => slot.Chest = chest); + } + + //DynamicDataList.SetList(tmp); + + // approach: + // 1. get from outside, update local list && us it + // 2. Handle list synchronized all the time & pass local list + return SaveData(DynamicDataList.GetList(), SceneElementTypeEnum.Dynamic); + } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataLoader.cs b/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataLoader.cs index 1a51b4f7..64f5ccd6 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataLoader.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataLoader.cs @@ -35,7 +35,6 @@ public class EquipmentDataLoader : SceneBaseDataLoader> LoadDynamicData() { SaveModelSystem.Path = PathBuilder.BuildSavePath().GetString(); @@ -43,22 +42,11 @@ public class EquipmentDataLoader : SceneBaseDataLoader> LoadStaticData(){ throw new System.NotImplementedException(); } protected override bool SaveDynamicData(List> _elements) { SaveModelSystem.Path = PathBuilder.BuildSavePath().GetString(); - try - { - SaveModelSystem.SaveModelList(_elements); - - return true; - } - catch (Exception e) { Debug.LogError(e.Message); } - - return false; + return base.SaveDynamicData(_elements); } - - protected override bool SaveStaticData(List> _elements) { throw new System.NotImplementedException(); } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataManager.cs b/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataManager.cs index 3c233f20..9f8b1b40 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Equipment/EquipmentDataManager.cs @@ -10,7 +10,10 @@ public class EquipmentDataManager : SceneBaseDataManager> DataLoader { get; set; } - bool NewGame = false; + [SerializeField] public List> ElementsToBuildOnSceneList = new List>(); + [SerializeField] List> convertedData = new List>(); + + public override void Awake() { if (Instance == null) @@ -27,48 +30,60 @@ public class EquipmentDataManager : SceneBaseDataManager chest controller handle Open panel in Scene Chest Manager passing info about what Chest Palyer want to open - // Manager Build panel and pass info about chest content - } + base.Start(); } + protected SceneBaseDataManager> GetObjectType() + { + return GameObject.FindObjectOfType(); + } + + protected SceneBaseDataManager> CreateInstance(ref GameObject managerGameObject) + { + return managerGameObject.AddComponent(); + } + + protected override void UseDefaultSettings() + { + foreach (IndexValuePair asset in ElementsToBuildOnSceneList) + { + convertedData.Add( + new IndexValuePair((int)asset.Key, (EquippableItem)asset.Value.EquippableItem) + ); + } + + DynamicDataList.SetList(convertedData); + + UiManager.SetList(convertedData); + } + + protected override void UseDynamicSettings() + { + LoadDynamicData(); + + UiManager.SetList(DynamicDataList.GetList()); + } + + + #region override load & save protected override bool LoadData(SceneElementTypeEnum type, ref DataListManager> dataListManager) { @@ -134,23 +149,4 @@ public class EquipmentDataManager : SceneBaseDataManager> GetObjectType() - { - return GameObject.FindObjectOfType(); - } - - protected SceneBaseDataManager> CreateInstance(ref GameObject managerGameObject) - { - return managerGameObject.AddComponent(); - } - - public override bool SaveDynamicData() - { - Debug.Log("SaveDynamicData"); - // tem approach - DynamicDataList.SetList(EquipmentUIManager.Instance.GetList()); - - return base.SaveDynamicData(); - } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataLoader.cs b/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataLoader.cs index b99416a4..90ba46c5 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataLoader.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataLoader.cs @@ -34,7 +34,6 @@ public class SceneInventoryDataLoader : SceneBaseDataLoader> LoadStaticData() { throw new System.NotImplementedException(); } protected override List> LoadDynamicData() { @@ -43,22 +42,10 @@ public class SceneInventoryDataLoader : SceneBaseDataLoader> _elements) { throw new System.NotImplementedException(); } - protected override bool SaveDynamicData(List> _elements) { SaveModelSystem.Path = PathBuilder.BuildSavePath().GetString(); - Debug.Log(SaveModelSystem.Path); - - try - { - SaveModelSystem.SaveModelList(_elements); - - return true; - } - catch (Exception e) { Debug.LogError(e.Message); } - - return false; + return base.SaveDynamicData(_elements); } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataManager.cs b/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataManager.cs index 1e956575..410bda57 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Inventory/SceneInventoryDataManager.cs @@ -29,32 +29,72 @@ public class SceneInventoryDataManager : SceneBaseDataManager> GetObjectType() + { + return GameObject.FindObjectOfType(); + } + + protected SceneBaseDataManager> CreateInstance(ref GameObject managerGameObject) + { + return managerGameObject.AddComponent(); + } + + + + protected override void UseDefaultSettings() + { + return; // at the beginning we want to have inventory empty + } + + protected override void UseDynamicSettings() + { + LoadDynamicData(); + + UiManager.SetList(DynamicDataList.GetList()); + } + + + // TODO whats with that + /* + public int AddToInventory(EquippableItem pickable) + { + if (this._items.Count <= MAX_ITEMS) + { + for (int slotNumber = 0; slotNumber < MAX_ITEMS; slotNumber++) + { + if (!this._items.ContainsKey(slotNumber)) + { + this._items[slotNumber] = pickable; + return slotNumber; + } + + } + } + + return -1; + } + */ + + #region override load & save protected override bool LoadData(SceneElementTypeEnum type, ref DataListManager> dataListManager) { @@ -63,7 +103,7 @@ public class SceneInventoryDataManager : SceneBaseDataManager> convertedList = new List>(); - foreach(IndexValuePair loadedEquippableItemPrefarbAssetElement in (List>)DataLoader.LoadData(SceneElementTypeEnum.None)) + foreach (IndexValuePair loadedEquippableItemPrefarbAssetElement in (List>)DataLoader.LoadData(SceneElementTypeEnum.None)) { convertedList.Add(new IndexValuePair(loadedEquippableItemPrefarbAssetElement.Key, (EquippableItem)loadedEquippableItemPrefarbAssetElement.Value.EquippableItem)); } @@ -72,7 +112,7 @@ public class SceneInventoryDataManager : SceneBaseDataManager> GetObjectType() - { - return GameObject.FindObjectOfType(); - } - - protected SceneBaseDataManager> CreateInstance(ref GameObject managerGameObject) - { - return managerGameObject.AddComponent(); - } - - - // TODO whats with that -/* public int AddToInventory(EquippableItem pickable) - { - if (this._items.Count <= MAX_ITEMS) - { - for (int slotNumber = 0; slotNumber < MAX_ITEMS; slotNumber++) - { - if (!this._items.ContainsKey(slotNumber)) - { - this._items[slotNumber] = pickable; - return slotNumber; - } - - } - } - - return -1; - }*/ } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataLoader.cs b/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataLoader.cs index b940d99f..27f5abdd 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataLoader.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataLoader.cs @@ -88,13 +88,20 @@ public class SceneTaskDataLoader : SceneBaseDataLoader return false; } - protected override List LoadStaticData() { throw new System.NotImplementedException(); } - protected override List LoadDynamicData() { throw new System.NotImplementedException(); } + protected override List LoadDynamicData() + { + SaveModelSystem.Path = PathBuilder.BuildSavePath().GetString(); + + return SaveModelSystem.LoadModelList(); + } - protected override bool SaveStaticData(List _elements) { throw new System.NotImplementedException(); } + protected override bool SaveDynamicData(List _elements) + { + SaveModelSystem.Path = PathBuilder.BuildSavePath().GetString(); - protected override bool SaveDynamicData(List _elements) { throw new System.NotImplementedException(); } + return base.SaveDynamicData(_elements); + } } diff --git a/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataManager.cs b/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataManager.cs index 6b1532b0..d4a51f5c 100644 --- a/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Panel/Task/SceneTaskDataManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using UnityEngine; public class SceneTaskDataManager : SceneBaseDataManager @@ -6,27 +7,25 @@ public class SceneTaskDataManager : SceneBaseDataManager protected override string OBJECT_FOLDER_NAME { get { return "Quest"; } } protected override string OBJECT_LIST_NAME { get { return "QuestsList"; } } - private void Start() + [SerializeField] public List ElementsToBuildOnSceneList = new List(); + + + public override void Start() { - Debug.Log("Start SceneTaskdata manager"); + Debug.Log("Start SceneTaskdata manager"); - //TaskUIManager.FindOrCreateInstance(); - var taskManager = TaskUIManager.Instance; + //TaskUIManager.FindOrCreateInstance(); + UiManager = TaskUIManager.Instance; - if (taskManager == null) - throw new NullReferenceException("TaskUIManager not found!!!"); + if (UiManager == null) + throw new NullReferenceException("TaskUIManager not found!!!"); - StaticDataList = (new TaskDataListManager()).SetUiManager(ref taskManager); - // DynamicDataList = (new TaskDataListManager()).SetUiManager(ref taskManager); + DynamicDataList = (new TaskDataListManager()).SetUiManager(ref UiManager); - DataLoader = new SceneTaskDataLoader(OBJECT_LIST_NAME, OBJECT_FOLDER_NAME); - - // taskManager.SetList(); - //SaveData(taskManager.GetList(), SceneElementTypeEnum.None); + DataLoader = new SceneTaskDataLoader(OBJECT_LIST_NAME, OBJECT_FOLDER_NAME); - //LoadData(SceneElementTypeEnum.None, ref StaticDataList); - //taskManager.SetList(StaticDataList.GetList()); + base.Start(); } protected SceneBaseDataManager GetObjectType() @@ -38,4 +37,18 @@ public class SceneTaskDataManager : SceneBaseDataManager { return managerGameObject.AddComponent(); } + + protected override void UseDefaultSettings() + { + DynamicDataList.SetList(ElementsToBuildOnSceneList); + + UiManager.SetList(ElementsToBuildOnSceneList); + } + + protected override void UseDynamicSettings() + { + LoadDynamicData(); + + UiManager.SetList(DynamicDataList.GetList()); + } } diff --git a/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataLoader.cs b/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataLoader.cs index 0e7ae698..c9710c4f 100644 --- a/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataLoader.cs +++ b/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataLoader.cs @@ -25,10 +25,10 @@ public abstract class SceneBaseDataLoader : SceneDataLoaderInterface { return LoadGenericData(); } - case SceneElementTypeEnum.Static: +/* case SceneElementTypeEnum.Static: { return LoadStaticData(); - } + }*/ case SceneElementTypeEnum.Dynamic: { return LoadDynamicData(); @@ -50,10 +50,10 @@ public abstract class SceneBaseDataLoader : SceneDataLoaderInterface { return SaveGenericData(_elements); } - case SceneElementTypeEnum.Static: +/* case SceneElementTypeEnum.Static: { return SaveStaticData(_elements); - } + }*/ case SceneElementTypeEnum.Dynamic: { return SaveDynamicData(_elements); @@ -68,11 +68,23 @@ public abstract class SceneBaseDataLoader : SceneDataLoaderInterface } - protected abstract List LoadStaticData(); protected abstract List LoadDynamicData(); protected abstract List LoadGenericData(); - protected abstract bool SaveStaticData(List _elements); - protected abstract bool SaveDynamicData(List _elements); + protected virtual bool SaveDynamicData(List _elements) + { + Debug.Log(SaveModelSystem.Path); + + try + { + SaveModelSystem.SaveModelList(_elements); + + return true; + } + catch (Exception e) { Debug.LogError(e.Message); } + + return false; + } + protected abstract bool SaveGenericData(List _elements); } diff --git a/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataManager.cs b/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataManager.cs index b5125176..e527f1c7 100644 --- a/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Shared/Manager/Panel/SceneBaseDataManager.cs @@ -7,9 +7,9 @@ public abstract class SceneBaseDataManager : MonoBehaviour protected virtual string OBJECT_FOLDER_NAME => ""; protected virtual string OBJECT_LIST_NAME => ""; - protected bool IsNewGame = true; // change to use global "gateway" - protected DataListManager StaticDataList; + protected UIBaseManager UiManager; + protected DataListManager DynamicDataList; protected SceneBaseDataLoader DataLoader { get; set; } @@ -32,30 +32,57 @@ public abstract class SceneBaseDataManager : MonoBehaviour } } + /// + /// Function to manage objects on scene depending on class responsibility + /// + /// Important - USE THIS METHOD IN EVERY CHILD'S 'start' FUNCTION + /// + public virtual void Start() + { + // Decide which element use during game + AfterStart(); + } + protected static SceneBaseDataManager GetObjectType() { return GameObject.FindObjectOfType>(); } - protected static SceneBaseDataManager CreateInstance() + /* + * TODO WHAT WITH THAT... + * protected static SceneBaseDataManager CreateInstance() + { + var managerGameObject = HandleManagerOnScene(); + + if (!managerGameObject) + throw new Exception("Game object to srote Managers scripts not found on scene!!!"); + + return managerGameObject.AddComponent>(); + } + + /// + /// Function to handel GLOBAL manager object from scene + /// + /// + protected static GameObject HandleManagerOnScene() + { + return GameObject.FindGameObjectWithTag("Manager").transform.Find("DataManger").gameObject; + }*/ + + protected void AfterStart() { - var managerGameObject = HandleManagerOnScene(); - - if (!managerGameObject) - throw new Exception("Game object to srote Managers scripts not found on scene!!!"); - - return managerGameObject.AddComponent>(); + if (OnMapAppearanceMethod.Gateway == OnMapAppearanceMethodEnum.NewGame) + { + UseDefaultSettings(); + } else { + UseDynamicSettings(); + } } - /// - /// Function to handel GLOBAL manager object from scene - /// - /// - protected static GameObject HandleManagerOnScene() - { - return GameObject.FindGameObjectWithTag("Manager").transform.Find("DataManger").gameObject; - } + protected abstract void UseDefaultSettings(); + protected abstract void UseDynamicSettings(); + #region Lad & Save protected virtual bool LoadData(SceneElementTypeEnum type, ref DataListManager dataListManager) { try @@ -87,43 +114,12 @@ public abstract class SceneBaseDataManager : MonoBehaviour return false; } + #endregion - /// - /// Part of static list CURD methods - /// - public bool LoadStaticData() - { - return LoadData(SceneElementTypeEnum.Static, ref StaticDataList); - } - - protected virtual void AddElementToStaticList(T _element) - { - StaticDataList.AddElementToList(_element); - } - - protected virtual void RemoveElementFromStaticList(T _element) - { - StaticDataList.RemoveElementFromList(_element); - } - - public bool SaveStaticData() - { - // TODO - // how to get list - // 1. List in UI manager should be synchronized with list in this manager - - // approach: - // 1. get from outside, update local list && us it - // 2. Handle list synchronized all the time & pass local list - - Debug.Log("SaveStaticData"); - return SaveData(StaticDataList.GetList(), SceneElementTypeEnum.Static); - } - - - /// - /// Part of dynamic list CURD methods - /// + #region DynamicData Methods + /// + /// Part of dynamic list CURD methods + /// public bool LoadDynamicData() { return LoadData(SceneElementTypeEnum.Dynamic, ref DynamicDataList); @@ -144,11 +140,12 @@ public abstract class SceneBaseDataManager : MonoBehaviour // TODO // how to get list // 1. List in UI manager should be synchronized with list in this manager - + DynamicDataList.SetList(UiManager.GetList()); // approach: // 1. get from outside, update local list && us it // 2. Handle list synchronized all the time & pass local list return SaveData(DynamicDataList.GetList(), SceneElementTypeEnum.Dynamic); } + #endregion } \ No newline at end of file diff --git a/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/Panel/Draggable/DraggablePanelController.cs b/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/Panel/Draggable/DraggablePanelController.cs index a3f667ce..99cd0351 100644 --- a/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/Panel/Draggable/DraggablePanelController.cs +++ b/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/Panel/Draggable/DraggablePanelController.cs @@ -83,7 +83,7 @@ public abstract class DraggablePanelController : PanelController(dropItemSlot.Number, tmpDraggedItem)); - Debug.Log(UiManager); + // !!! remember item from dropped position to future operation !!! if (dropItem) DraggedSlotController.Instance.UpdateItem(new EquippableItem(dropItem)); diff --git a/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/UIWarehouseManager.cs b/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/UIWarehouseManager.cs index 7daa8eac..ac279eb0 100644 --- a/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/UIWarehouseManager.cs +++ b/Assets/Scripts/REFACTORING/Application/Shared/Manager/UI/UIWarehouseManager.cs @@ -62,7 +62,18 @@ public abstract class UIWarehouseManager : UISlotPanelManager itemSlot.Key); + var max = 0; + if(Elements.Count() > 0) + { + for (int i = 0; i < SLOTS_NUMBER; i++) + { + if (Elements.Where(el => el.Key == i && el.Value != null).Count() != 0) + continue; + + max = i; + break; + } + } base.Add(new IndexValuePair(max, item)); } diff --git a/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs index 54d39fc4..b2c42e1b 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Chest/ChestUIManager.cs @@ -35,6 +35,11 @@ public class ChestUIManager : UIBaseManager return false; } + // Open additiona panels + if (!EquipmentUIManager.Instance.GetPanelStatus()) EquipmentUIManager.Instance.OpenPanel(); + + if (!InventoryUIManager.Instance.GetPanelStatus()) InventoryUIManager.Instance.OpenPanel(); + return base.OpenPanel(); } diff --git a/Assets/Scripts/REFACTORING/Application/UI/Equipment/EquipmentUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Equipment/EquipmentUIManager.cs index 5bb75508..3cd547fc 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Equipment/EquipmentUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Equipment/EquipmentUIManager.cs @@ -52,7 +52,6 @@ public class EquipmentUIManager : UIWarehouseManager /// public override void Add(IndexValuePair itemOnSlot) { - Debug.Log(itemOnSlot.Value); if (!CheckIfSlotIsInRange(itemOnSlot.Key)) throw new System.Exception($"Slot number: {itemOnSlot.Key} is out of range, avaiable: {SLOTS_NUMBER} slots"); diff --git a/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs index a197d337..28b11f72 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs @@ -43,7 +43,10 @@ public class InventoryUIManager : UIWarehouseManager public override void UpdateList() { - DynamicPanel.GetComponent().BuildPanelContent(Elements); + // condition for situation where eg player want to pick up item when inventory / equipment is closed + + if(DynamicPanel) + DynamicPanel.GetComponent().BuildPanelContent(Elements); } protected override GameObject GetTemplatePanel() diff --git a/Assets/Scripts/REFACTORING/Application/UI/Panel/EquipmentPanelController.cs b/Assets/Scripts/REFACTORING/Application/UI/Panel/EquipmentPanelController.cs index 4a0d8a30..224ddc4e 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Panel/EquipmentPanelController.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Panel/EquipmentPanelController.cs @@ -21,6 +21,16 @@ public class EquipmentPanelController : DraggablePanelController public void InitSlotsList() { + _panelContent.transform.Find("equipment_slot_helmet").GetComponent()._PanelController = this; + _panelContent.transform.Find("equipment_slot_armor").GetComponent()._PanelController = this; + _panelContent.transform.Find("equipment_slot_weapon").GetComponent()._PanelController = this; + _panelContent.transform.Find("equipment_slot_boots").GetComponent()._PanelController = this; + _panelAdditionalSlotsContent.transform.Find("equipment_slot_ring").GetComponent()._PanelController = this; + _panelAdditionalSlotsContent.transform.Find("equipment_slot_bracelet").GetComponent()._PanelController = this; + _panelAdditionalSlotsContent.transform.Find("equipment_slot_necklet").GetComponent()._PanelController = this; + _panelAdditionalSlotsContent.transform.Find("equipment_slot_potion_i").GetComponent()._PanelController = this; + _panelAdditionalSlotsContent.transform.Find("equipment_slot_potion_ii").GetComponent()._PanelController = this; + ChildBoxList.Add(SetupDragAndDropToSlot(_panelContent.transform.Find("equipment_slot_helmet").GetComponent())); ChildBoxList.Add(SetupDragAndDropToSlot(_panelContent.transform.Find("equipment_slot_armor").GetComponent())); ChildBoxList.Add(SetupDragAndDropToSlot(_panelContent.transform.Find("equipment_slot_weapon").GetComponent())); @@ -66,27 +76,36 @@ public class EquipmentPanelController : DraggablePanelController } } - - - public virtual void EndDrag(ItemSlot itemSlot) + public override void EndDrag(ItemSlot itemSlot) { + Debug.Log("End Drag"); if (!DraggedSlotController.Instance.IsDragged()) // if there was nothing dragged - ignore event return; DraggedSlotController.Instance.RemoveDraggedSlot(); - Debug.Log(this); + if (!itemSlot.Item) + ((ItemSlot)ChildBoxList.Where(slot => slot.Number == itemSlot.Number).First()).ResetSlot(); + else + ((ItemSlot)ChildBoxList.Where(slot => slot.Number == itemSlot.Number).First()).SetItem(itemSlot.Item); - // Rebuild/apply UiManager content (list of items) base on slots values after its updating - for (int i = 0; i < ChildBoxList.Count; i++) + + var ChildBoxListCopy = new List>(ChildBoxList.Where(slot => slot.Item != null).Select(slot => new IndexValuePair(slot.Number, slot.Item)).ToList()); + + Debug.Log(ChildBoxListCopy.Count()); + UiManager.RemoveAll(); + Debug.Log(ChildBoxListCopy.Count()); + + foreach (IndexValuePair slot in ChildBoxListCopy) { - if (ChildBoxList[i].Item != null) + if (slot.Value != null) { - UiManager.Add(new IndexValuePair(i, ChildBoxList[i].Item)); + Debug.Log($"Slot nr: {slot.Key} with item: {slot.Value}"); + UiManager.Add(new IndexValuePair(slot.Key, slot.Value)); } else { - UiManager.RemoveByPosition(i); + UiManager.Add(new IndexValuePair(slot.Key, null)); } } } diff --git a/Assets/Scripts/REFACTORING/Application/UI/Panel/TaskPanelController.cs b/Assets/Scripts/REFACTORING/Application/UI/Panel/TaskPanelController.cs index 5fafd044..c9607261 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Panel/TaskPanelController.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Panel/TaskPanelController.cs @@ -21,6 +21,8 @@ public class TaskPanelController : PanelController { base.BuildPanelContent(elements); + ClearSlots(); + for (int i = 0; i < elements.Count; i++) { this.AddTask(elements[i]); @@ -70,6 +72,11 @@ public class TaskPanelController : PanelController public override void ClearSlots() { - throw new NotImplementedException(); + foreach(var taskObj in ChildBoxList) + { + DestroyImmediate(taskObj); + } + + ChildBoxList.Clear(); } } diff --git a/Assets/Scripts/REFACTORING/Application/UI/Task/TaskUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Task/TaskUIManager.cs index a5e333fd..a0de8505 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Task/TaskUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Task/TaskUIManager.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using UnityEngine; [Serializable] @@ -8,6 +9,20 @@ public class TaskUIManager : UIBaseManager public const string ITEM_LOCALIZATION = "UiPanels/"; public const string PANEL_NAME = "TaskPanel"; + public static new TaskUIManager Instance { get; protected set; } + + public void Awake() + { + if (Instance == null) + { + Instance = this; + } + else + { + Destroy(gameObject); + } + } + public override void SetupPanel() { base.SetupPanel(); @@ -17,10 +32,26 @@ public class TaskUIManager : UIBaseManager } public override void UpdateList() - { - DynamicPanel.GetComponent().BuildPanelContent(Elements); + { + // condition for situation where eg player want to pick up item when inventory / equipment is closed + + if (DynamicPanel) + DynamicPanel.GetComponent().BuildPanelContent(Elements); } + public List FindTaskByName(string taskTitle) + { + return Elements.Where(task => task.Title == taskTitle).ToList(); + } + + public void RemoveByName(string name) + { + Elements.RemoveAll(task => task.Title == name); + + UpdateList(); + } + + protected override GameObject GetTemplatePanel() { // Resources = default path - Asset/Resources ... .obj diff --git a/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAsset.cs b/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAsset.cs index 492d0b47..cff8f1bd 100644 --- a/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAsset.cs +++ b/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAsset.cs @@ -12,7 +12,7 @@ public class ChestPrefabAsset : PrefabAssetModel //public List> Content { get; set; } public ChestPrefabAsset(Chest _chest) - : base(_chest.name, _chest.ChestModel.name, new Vector3(0,0,0)) + : base(_chest.name, _chest.ChestModel.name, new Vector3(0, 0, 0)) { Chest = _chest; } diff --git a/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAssetData.cs b/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAssetData.cs index 279ba2b8..9ccda257 100644 --- a/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAssetData.cs +++ b/Assets/Scripts/REFACTORING/Models/Chest/ChestPrefabAssetData.cs @@ -11,7 +11,8 @@ public class ChestPrefabAssetData : PrefabAssetModelData { ChestData = MapModelToData(assetModel.Chest); - /* Content = new List>(); + /* + Content = new List>(); Debug.Log("ChestPrefarbAsset to ChestPrefarbAssetData - " + assetModel.Name); @@ -46,14 +47,14 @@ public class ChestPrefabAssetData : PrefabAssetModelData // clear content and set items from data - this will modify Scri-0ptableObject data also in source //chestPrefabAsset.Chest.Content.Clear(); -/* foreach (IndexValuePair modelData in ChestData.content) - { - var objectFromData = (modelData.Value).MapDataToObject(); - Debug.Log(objectFromData); - chestPrefabAsset.Chest.Content.Add( - new IndexValuePair(modelData.Key, objectFromData) - ); - }*/ + /* foreach (IndexValuePair modelData in ChestData.content) + { + var objectFromData = (modelData.Value).MapDataToObject(); + Debug.Log(objectFromData); + chestPrefabAsset.Chest.Content.Add( + new IndexValuePair(modelData.Key, objectFromData) + ); + }*/ return chestPrefabAsset; } diff --git a/Assets/Scripts/REFACTORING/Models/Item/EquippableItem/EquippableItemPrefabAsset.cs b/Assets/Scripts/REFACTORING/Models/Item/EquippableItem/EquippableItemPrefabAsset.cs index 56c9aab7..45540abd 100644 --- a/Assets/Scripts/REFACTORING/Models/Item/EquippableItem/EquippableItemPrefabAsset.cs +++ b/Assets/Scripts/REFACTORING/Models/Item/EquippableItem/EquippableItemPrefabAsset.cs @@ -26,20 +26,8 @@ public class EquippableItemPrefabAsset : PrefabAssetModel public EquippableItemPrefabAsset(string _name, string _prefabAssetName, Vector3 _position, string _equippableItemName) : base(_name, _prefabAssetName, _position) { - - // TODO during build product process, objects are not found - refactor this - string[] assetNames = AssetDatabase.FindAssets("t:EquippableItem", new[] { "Assets/Items/" }); - foreach (string SOName in assetNames) - { - var SoPath = AssetDatabase.GUIDToAssetPath(SOName); - - if(SoPath.Contains(_equippableItemName + ".asset")) - { - // 3.2 set EquippableItem object - EquippableItem = AssetDatabase.LoadAssetAtPath(SoPath); - break; - } - } + // 3.2 set EquippableItem object + EquippableItem = Resources.Load("Items/" + _equippableItemName); } /// diff --git a/Assets/Scripts/REFACTORING/Models/Panel/Slot/ItemSlot.cs b/Assets/Scripts/REFACTORING/Models/Panel/Slot/ItemSlot.cs index 50508c05..5d02945b 100644 --- a/Assets/Scripts/REFACTORING/Models/Panel/Slot/ItemSlot.cs +++ b/Assets/Scripts/REFACTORING/Models/Panel/Slot/ItemSlot.cs @@ -12,7 +12,7 @@ public class ItemSlot : MonoBehaviour, ISlot, IBeginDragHandler, IEndDragHandler [SerializeField] private TextMeshProUGUI slotItemNumberText; [SerializeField] private Image itemImage; - public WarehousePanelController _PanelController; + public DraggablePanelController _PanelController; private Color normalColor = Color.white; private Color disabledColor = new Color(1, 1, 1, 0); // transparency = 0 diff --git a/Assets/Scripts/SaveController.cs b/Assets/Scripts/SaveController.cs index 5b0ca4ed..a375abbe 100644 --- a/Assets/Scripts/SaveController.cs +++ b/Assets/Scripts/SaveController.cs @@ -27,20 +27,19 @@ public class SaveController : MonoBehaviour public void SaveItems() // toDO change name to save Equipment - save items will save items on map eg after drops { - //SceneEquippableItemManager.Instance.SaveEquippableItems(); EquipmentDataManager.Instance.SaveDynamicData(); } public void SaveQuests() { - SceneTaskDataManager.Instance.SaveStaticData(); + SceneTaskDataManager.Instance.SaveDynamicData(); // right now, we dont need to save dynamic list :D } public void SaveInventory() { - SceneInventoryDataManager.Instance.SaveStaticData(); + SceneInventoryDataManager.Instance.SaveDynamicData(); } public void SaveChests() diff --git a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs index b5ba5623..cecbd212 100644 --- a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs +++ b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs @@ -20,9 +20,7 @@ public class OnMapAppearanceMethod : MonoBehaviour if(Gateway == null) { Gateway = OnMapAppearanceMethodEnum.NewGame; - } - //Debug.Log("Set Gateway"); - + } } } \ No newline at end of file diff --git a/Assets/Scripts/SceneManager/SaveDynamicObjects.cs b/Assets/Scripts/SceneManager/SaveDynamicObjects.cs index b88ee33c..810727b9 100644 --- a/Assets/Scripts/SceneManager/SaveDynamicObjects.cs +++ b/Assets/Scripts/SceneManager/SaveDynamicObjects.cs @@ -58,7 +58,6 @@ public class SaveDynamicObjects : MonoBehaviour if (ThugFromScene != null) { - Debug.Log("Save thug"); ThugFromScene.GetComponent().SaveCheckpoint(); } else diff --git a/Assets/Scripts/SceneManager/SceneEquippableItemManager.cs b/Assets/Scripts/SceneManager/SceneEquippableItemManager.cs index 9a23f8a1..713c3a8c 100644 --- a/Assets/Scripts/SceneManager/SceneEquippableItemManager.cs +++ b/Assets/Scripts/SceneManager/SceneEquippableItemManager.cs @@ -9,9 +9,9 @@ using System.Linq; // only for eqipptable items public class SceneEquippableItemManager : MonoBehaviour { - private const string GameObjectLocalization = "Assets/Items/"; + private const string GameObjectLocalization = "Items/"; - private const string AssetLocalization = "Assets/Items/"; + private const string AssetLocalization = "Items/"; private const string DYNAMIC_ELEMENT = "/DynamicElements/"; private const string STATIC_ELEMENT = "/StaticElements/"; @@ -33,8 +33,6 @@ public class SceneEquippableItemManager : MonoBehaviour [SerializeField] public List DynamicElements; - public bool isNewGame = true; - public bool isContinued = false; public string MapName; public string ElementFolderName = "EquippableItem"; public string ItemsListName = "EquippableItemList"; @@ -47,11 +45,11 @@ public class SceneEquippableItemManager : MonoBehaviour { this.MapName = SceneManager.GetActiveScene().name; - if(isNewGame) // in new game dynamicItemsList is defaulty empty + if(OnMapAppearanceMethod.Gateway == OnMapAppearanceMethodEnum.NewGame) // in new game dynamicItemsList is defaulty empty { BuildItems(StaticElements); - }else if(isContinued) + }else { LoadEquippableItems(); @@ -112,10 +110,11 @@ public class SceneEquippableItemManager : MonoBehaviour { foreach(EquippableItemPrefabAsset equippableItemPrefarbAsset in equippableItemPrefarbAssetList) { - - GameObject newEquippableItemObject = (GameObject)AssetDatabase.LoadAssetAtPath(GameObjectLocalization + equippableItemPrefarbAsset.PrefabAssetName + ".prefab", typeof(GameObject)); - if(!newEquippableItemObject) + + GameObject newEquippableItemObject = Resources.Load(GameObjectLocalization + equippableItemPrefarbAsset.PrefabAssetName); + + if (!newEquippableItemObject) { Debug.Log("Can't find prefarb by name " + equippableItemPrefarbAsset.PrefabAssetName); break; @@ -142,18 +141,10 @@ public class SceneEquippableItemManager : MonoBehaviour // 3. SetUp object properties // 3.1 find object - string[] assetNames = AssetDatabase.FindAssets("t:EquippableItem", new[] { AssetLocalization }); - foreach (string SOName in assetNames) - { - var SOpath = AssetDatabase.GUIDToAssetPath(SOName); - if(SOpath.Contains(equippableItemPrefarbAsset.PrefabAssetName + ".asset")) - { - // 3.2 set EquippableItem object - equippableItem.GetComponent().item = AssetDatabase.LoadAssetAtPath(SOpath); - break; - } - } + // 3.2 set EquippableItem object + equippableItem.GetComponent().item = Resources.Load("Items/"+equippableItemPrefarbAsset.PrefabAssetName); + } else {