浏览代码

Fix Input when closing Inventory

/UI
uChema 4 年前
当前提交
09ec279d
共有 11 个文件被更改,包括 19 次插入30 次删除
  1. 1
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English (en).asset
  2. 1
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-French (fr).asset
  3. 1
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Italian (it).asset
  4. 1
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset
  5. 1
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset
  6. 6
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian (it).asset
  7. 1
      UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Action.asset
  8. 4
      UOP1_Project/Assets/Prefabs/Managers/QuestManager.prefab
  9. 31
      UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
  10. 1
      UOP1_Project/Assets/Scripts/UI/UIManager.cs
  11. 1
      UOP1_Project/Assets/ScriptableObjects/Events/.DS_Store

1
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English (en).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

1
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-French (fr).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- Preload
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

1
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Italian (it).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-it
- Preload
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

1
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
- m_GUID: c1866b8b88fdb418886123a7f6404094
m_Address: Inventory Tabs_en
m_ReadOnly: 1

1
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French (fr).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-fr
- Preload
- m_GUID: 60bc6035c2adb4c9da79f134bd4cebad
m_Address: Inventory Tabs_fr
m_ReadOnly: 1

6
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian (it).asset


m_ReadOnly: 1
m_SerializedLabels:
- Locale-it
- m_GUID: decdea0b1fff248df9c1f5663d91454f
m_Address: Inventory Item Action_it
m_ReadOnly: 1
m_SerializedLabels:
- Locale-it
- Preload
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

1
UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Action.asset


m_Tables:
- {fileID: 11400000, guid: 0d7c1864963414ff180884d706e87219, type: 2}
- {fileID: 11400000, guid: 7f70e48c12dbc4ce0b2e6b49b6836f2d, type: 2}
- {fileID: 11400000, guid: decdea0b1fff248df9c1f5663d91454f, type: 2}
m_Extensions: []
m_Group: String Table
references:

4
UOP1_Project/Assets/Prefabs/Managers/QuestManager.prefab


serializedVersion: 6
m_Component:
- component: {fileID: 8957403575277752757}
- component: {fileID: 8957403575277752756}
- component: {fileID: 478505548}
m_Layer: 0
m_Name: QuestManager
m_TagString: Untagged

m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8957403575277752756
--- !u!114 &478505548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

31
UOP1_Project/Assets/Scenes/Managers/Gameplay.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
m_IndirectSpecularColor: {r: 0.12731713, g: 0.13414736, b: 0.121078536, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

type: 3}
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
m_MoveAction: {fileID: -1680190386980627800, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}

m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &478505547 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8957403575277752759, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
m_PrefabInstance: {fileID: 8957403574244887918}
m_PrefabAsset: {fileID: 0}
--- !u!114 &478505548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 478505547}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3b99813ebb688d4ea1c24c7ac430cdc, type: 3}
m_Name:
m_EditorClassIdentifier:
_questAnchor: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
--- !u!114 &670213351 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8980297398607076176, guid: ccad748453924ff4092fe3e5b978d8e5,

propertyPath: m_Name
value: QuestManager
objectReference: {fileID: 0}
- target: {fileID: 8957403575277752759, guid: 021ad8df909ac4147aa545c01f5ad8db,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 8957403575277752756, guid: 021ad8df909ac4147aa545c01f5ad8db, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 021ad8df909ac4147aa545c01f5ad8db, type: 3}
--- !u!1001 &8980297399098703799
PrefabInstance:

1
UOP1_Project/Assets/Scripts/UI/UIManager.cs


{
_inventoryPanel.gameObject.SetActive(false);
_inputReader.EnableGameplayInput();
if (isForCooking)
{
_onInteractionEndedEvent.RaiseEvent();

1
UOP1_Project/Assets/ScriptableObjects/Events/.DS_Store
文件差异内容过多而无法显示
查看文件

正在加载...
取消
保存