浏览代码

clean up folders

/UI
uChema 4 年前
当前提交
20cfec67
共有 39 个文件被更改,包括 3 次插入11 次删除
  1. 2
      UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DropRewardSO.cs
  2. 2
      UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs
  3. 2
      UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs
  4. 8
      UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest1.meta
  5. 0
      /UOP1_Project/Assets/Art/UI/FinalUI
  6. 0
      /UOP1_Project/Assets/Art/UI/FinalUI.meta
  7. 0
      /UOP1_Project/Assets/Art/UI/UIProposition.meta
  8. 0
      /UOP1_Project/Assets/Art/UI/UIProposition
  9. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png
  10. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png.meta
  11. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png
  12. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png.meta
  13. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png
  14. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png.meta
  15. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png
  16. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png.meta
  17. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/LobsterSoupRecipe.png
  18. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/LobsterSoupRecipe.png.meta
  19. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/PizzaHawaiRecipe.png
  20. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/PizzaHawaiRecipe.png.meta
  21. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/PizzaMargaritaRecipe.png
  22. 0
      /UOP1_Project/Assets/Art/UI/UIProposition/PizzaMargaritaRecipe.png.meta
  23. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab
  24. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab.meta
  25. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab
  26. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab.meta
  27. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab
  28. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab.meta
  29. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab
  30. 0
      /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab.meta
  31. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest1
  32. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest2
  33. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest3
  34. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest1.meta
  35. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest2.meta
  36. 0
      /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest3.meta
  37. 0
      /UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs.meta
  38. 0
      /UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs

2
UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DropRewardSO.cs


position + itemPrefab.transform.localPosition +
_dropRewardConfig.ScatteringDistance * (Mathf.Cos(randAngle) * Vector3.forward + Mathf.Sin(randAngle) * Vector3.right),
Quaternion.identity);
collectibleItem.GetComponent<CollectibleItem>().AnimateItem();
collectibleItem.GetComponent<CollectableItem>().AnimateItem();
}
}

2
UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs


if (_onObjectPickUp != null)
{
Item currentItem = itemObject.GetComponent<CollectibleItem>().GetItem();
Item currentItem = itemObject.GetComponent<CollectableItem>().GetItem();
_onObjectPickUp.RaiseEvent(currentItem);
}

2
UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs


using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
public class CollectibleItem : MonoBehaviour
public class CollectableItem : MonoBehaviour
{
[SerializeField] private Item _currentItem = default;

8
UOP1_Project/Assets/ScriptableObjects/Quests/Questline2/Quest1.meta


fileFormatVersion: 2
guid: 91be7441f3111473a9342ea20fef4dd8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

/UOP1_Project/Assets/Art/UI/Final UI → /UOP1_Project/Assets/Art/UI/FinalUI

/UOP1_Project/Assets/Art/UI/Final UI.meta → /UOP1_Project/Assets/Art/UI/FinalUI.meta

/UOP1_Project/Assets/Art/UI/UI Proposition.meta → /UOP1_Project/Assets/Art/UI/UIProposition.meta

/UOP1_Project/Assets/Art/UI/UI Proposition → /UOP1_Project/Assets/Art/UI/UIProposition

/UOP1_Project/Assets/Art/UI/UIProposition/BG Slider.png → /UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png

/UOP1_Project/Assets/Art/UI/UIProposition/BG Slider.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/BGSlider.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/Check Fill.png → /UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png

/UOP1_Project/Assets/Art/UI/UIProposition/Check Fill.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/CheckFill.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/FG Slider.png → /UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png

/UOP1_Project/Assets/Art/UI/UIProposition/FG Slider.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/FGSlider.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/Frame1 border.png → /UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png

/UOP1_Project/Assets/Art/UI/UIProposition/Frame1 border.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/FrameBorder.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/Lobster Soup Recipe.png → /UOP1_Project/Assets/Art/UI/UIProposition/LobsterSoupRecipe.png

/UOP1_Project/Assets/Art/UI/UIProposition/Lobster Soup Recipe.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/LobsterSoupRecipe.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/Pizza Hawai Recipe.png → /UOP1_Project/Assets/Art/UI/UIProposition/PizzaHawaiRecipe.png

/UOP1_Project/Assets/Art/UI/UIProposition/Pizza Hawai Recipe.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/PizzaHawaiRecipe.png.meta

/UOP1_Project/Assets/Art/UI/UIProposition/Pizza Margarita Recipe.png → /UOP1_Project/Assets/Art/UI/UIProposition/PizzaMargaritaRecipe.png

/UOP1_Project/Assets/Art/UI/UIProposition/Pizza Margarita Recipe.png.meta → /UOP1_Project/Assets/Art/UI/UIProposition/PizzaMargaritaRecipe.png.meta

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Ginger.prefab → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Ginger.prefab.meta → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab.meta

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Item.prefab → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Item.prefab.meta → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab.meta

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Lemon.prefab → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Lemon.prefab.meta → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab.meta

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Lobster.prefab → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab

/UOP1_Project/Assets/Prefabs/Droppable/Collectible Lobster.prefab.meta → /UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab.meta

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 1 → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest1

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 2 → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest2

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 3 → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest3

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 1.meta → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest1.meta

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 2.meta → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest2.meta

/UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest 3.meta → /UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/Quest3.meta

/UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs.meta → /UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs.meta

/UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs → /UOP1_Project/Assets/Scripts/Inventory/CollectableItem.cs

正在加载...
取消
保存