浏览代码

Small tweaks to UI elements

/main
Ciro Continisio 3 年前
当前提交
510caa41
共有 13 个文件被更改,包括 10 次插入68 次删除
  1. 2
      UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab
  2. 2
      UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab
  3. 2
      UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab
  4. 2
      UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab
  5. 2
      UOP1_Project/Assets/Prefabs/Droppable/Collectable_RockCritterEgg.prefab
  6. 2
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/CharacterCustomization.asset
  7. 2
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Dish.asset
  8. 2
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Ingredient.asset
  9. 2
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Recipe.asset
  10. 2
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Utensil.asset
  11. 42
      UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Items/TestingItems/Pizza.asset
  12. 8
      UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Items/TestingItems/Pizza.asset.meta
  13. 8
      UOP1_Project/Assets/WIP/UI.meta

2
UOP1_Project/Assets/Prefabs/Droppable/Collectable_Ginger.prefab


- target: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
type: 3}
propertyPath: m_Name
value: Collectible Ginger
value: Collectable_Ginger
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0f60adbc96570cb4e9898a0409956f1d, type: 3}

2
UOP1_Project/Assets/Prefabs/Droppable/Collectable_Item.prefab


m_Layer: 0
m_Name: Collectable_Item
m_TagString: Pickable
m_Icon: {fileID: 7148428337604731935, guid: 0000000000000000d000000000000000, type: 0}
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1

2
UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lemon.prefab


- target: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
type: 3}
propertyPath: m_Name
value: Collectible Lemon
value: Collectable_Lemon
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0f60adbc96570cb4e9898a0409956f1d, type: 3}

2
UOP1_Project/Assets/Prefabs/Droppable/Collectable_Lobster.prefab


- target: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
type: 3}
propertyPath: m_Name
value: Collectible Lobster
value: Collectable_Lobster
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0f60adbc96570cb4e9898a0409956f1d, type: 3}

2
UOP1_Project/Assets/Prefabs/Droppable/Collectable_RockCritterEgg.prefab


- target: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
type: 3}
propertyPath: m_Name
value: Collectable_RockCritter
value: Collectable_RockCritterEgg
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0f60adbc96570cb4e9898a0409956f1d, type: 3}

2
UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/CharacterCustomization.asset


m_Key:
m_FallbackState: 0
m_WaitForCompletion: 1
_typeColor: {r: 1, g: 0, b: 0.7267132, a: 1}
_typeColor: {r: 0.8584906, g: 0.6687433, b: 0.74477065, a: 1}
_type: 3
_actionType: 2
_tabType: {fileID: 11400000, guid: b7f665e7113d54635b9cd79218983b7e, type: 2}

2
UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Dish.asset


m_Key:
m_FallbackState: 0
m_WaitForCompletion: 1
_typeColor: {r: 0.5137255, g: 0.6800925, b: 1, a: 1}
_typeColor: {r: 0.67609215, g: 0.7410676, b: 0.8679245, a: 1}
_type: 4
_actionType: 1
_tabType: {fileID: 11400000, guid: 89de7bb70f5b243fa80be0d8338dc39c, type: 2}

2
UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Ingredient.asset


m_Key:
m_FallbackState: 0
m_WaitForCompletion: 1
_typeColor: {r: 1, g: 0.5026138, b: 0, a: 1}
_typeColor: {r: 1, g: 0.8060515, b: 0.60916436, a: 1}
_type: 2
_actionType: 1
_tabType: {fileID: 11400000, guid: 89de7bb70f5b243fa80be0d8338dc39c, type: 2}

2
UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Recipe.asset


m_Key:
m_FallbackState: 0
m_WaitForCompletion: 1
_typeColor: {r: 0.7564373, g: 0.7028302, b: 1, a: 1}
_typeColor: {r: 0.71588767, g: 0.74784684, b: 0.8867924, a: 1}
_type: 0
_actionType: 0
_tabType: {fileID: 11400000, guid: ffb767e0213a74f999ef44c216168232, type: 2}

2
UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Utensil.asset


m_Key:
m_FallbackState: 0
m_WaitForCompletion: 1
_typeColor: {r: 0.6965084, g: 1, b: 0, a: 1}
_typeColor: {r: 0.8032218, g: 0.8962264, b: 0.58822405, a: 1}
_type: 1
_actionType: 3
_tabType: {fileID: 11400000, guid: 89de7bb70f5b243fa80be0d8338dc39c, type: 2}

42
UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Items/TestingItems/Pizza.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58a5b32581978a141a66d240261449d0, type: 3}
m_Name: Pizza
m_EditorClassIdentifier:
_guid: c733118f610514fd5834b23b4d8bf333
_name:
m_TableReference:
m_TableCollectionName: GUID:41b74adf4121a468e9dbe8958eb2f813
m_TableEntryReference:
m_KeyId: 40633530915479552
m_Key:
m_FallbackState: 0
_previewImage: {fileID: 21300000, guid: 53b3650512f0645c7a47a2c36271e215, type: 3}
_description:
m_TableReference:
m_TableCollectionName: GUID:63bf683e4210c4e48a201dfa773125d5
m_TableEntryReference:
m_KeyId: 40617814095028224
m_Key:
m_FallbackState: 0
_itemType: {fileID: 11400000, guid: 5aa0722ca1325a242b6923d6cb0d5864, type: 2}
_prefab: {fileID: 0}
_ingredientsList: []
_resultingDish: {fileID: 0}
_isLocalized: 1
_localizePreviewImage:
m_TableReference:
m_TableCollectionName: GUID:e7e5ada6333974625b639508f505d755
m_TableEntryReference:
m_KeyId: 14284742656
m_Key:
m_FallbackState: 0

8
UOP1_Project/Assets/ScriptableObjects/Inventory/ScriptableObjects/Items/TestingItems/Pizza.asset.meta


fileFormatVersion: 2
guid: c733118f610514fd5834b23b4d8bf333
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

8
UOP1_Project/Assets/WIP/UI.meta


fileFormatVersion: 2
guid: e60ab1220e5534fda8f605fcf71d161d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存