浏览代码

Merge branch 'pr/396' into main . Fix Player Inventory/ Testing inventory data.

/main
uChema 3 年前
当前提交
fab03691
共有 9 个文件被更改,包括 217 次插入195 次删除
  1. 1
      UOP1_Project/Assets/Prefabs/Gameplay/EditorInitializer.prefab
  2. 346
      UOP1_Project/Assets/Scenes/Locations/Beach.unity
  3. 16
      UOP1_Project/Assets/Scenes/WIP/TestingGround_Questline.unity
  4. 10
      UOP1_Project/Assets/ScriptableObjects/Inventory/PlayerInventory.asset
  5. 10
      UOP1_Project/Assets/ScriptableObjects/Inventory/TestingInventory.asset
  6. 2
      UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/QL1.asset
  7. 11
      UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset
  8. 3
      UOP1_Project/Assets/Scripts/Menu/MenuSelectionHandler.cs
  9. 13
      UOP1_Project/Assets/Scripts/SceneManagement/EditorColdStartup.cs

1
UOP1_Project/Assets/Prefabs/Gameplay/EditorInitializer.prefab


_onSceneReadyChannel: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186,
type: 2}
_pathStorage: {fileID: 11400000, guid: a9ec09853cba047a8a58f5881053cfc6, type: 2}
_saveSystem: {fileID: 11400000, guid: edc355c4a7d5028408d322b90814e19e, type: 2}

346
UOP1_Project/Assets/Scenes/Locations/Beach.unity
文件差异内容过多而无法显示
查看文件

16
UOP1_Project/Assets/Scenes/WIP/TestingGround_Questline.unity


- target: {fileID: 653251662382642302, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.0000000037212475
value: 0.0000000037212473
value: 1.7351201e-10
value: 1.73512e-10
objectReference: {fileID: 0}
- target: {fileID: 5815136950816891769, guid: 27c7b99622d41f04ba08f0f122783c20,
type: 3}

propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7222522106795826365, guid: 54d1f8b93400ea64d97c276fab375df3,
type: 3}
propertyPath: _thisSceneSO
value:
objectReference: {fileID: 11400000, guid: 7713c45402e4e7c4a8ae2d8c3e8689f2,
type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 54d1f8b93400ea64d97c276fab375df3, type: 3}
--- !u!1 &695792052

- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.10224992
value: 0.102249905
value: -0.08917594
value: -0.08917595
value: 0.024490176
value: 0.024490178
objectReference: {fileID: 0}
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}

10
UOP1_Project/Assets/ScriptableObjects/Inventory/PlayerInventory.asset


_defaultItems:
- _item: {fileID: 11400000, guid: 540c35ca6164bf3438e37e4f8087d47c, type: 2}
Amount: 1
- _item: {fileID: 11400000, guid: 42396f680e5649c4b91e2b29ff34f811, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 1c53a3bee1a484bc2ab70d7f4f1f0aa4, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 7a6557abb46da48458da1572c9022163, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: f14caff5e16bd4a48b45e4a2c5a0fc86, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 3e353820f321eb9469633db094e0c048, type: 2}
Amount: 1

10
UOP1_Project/Assets/ScriptableObjects/Inventory/TestingInventory.asset


_defaultItems:
- _item: {fileID: 11400000, guid: 540c35ca6164bf3438e37e4f8087d47c, type: 2}
Amount: 1
- _item: {fileID: 11400000, guid: 42396f680e5649c4b91e2b29ff34f811, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 1c53a3bee1a484bc2ab70d7f4f1f0aa4, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 7a6557abb46da48458da1572c9022163, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: f14caff5e16bd4a48b45e4a2c5a0fc86, type: 2}
Amount: 20
- _item: {fileID: 11400000, guid: 3e353820f321eb9469633db094e0c048, type: 2}
Amount: 1

2
UOP1_Project/Assets/ScriptableObjects/Quests/Questline1/QL1.asset


_idQuestLine: 1
_quests:
- {fileID: 11400000, guid: 2419d670f41b60f45939ba1637631315, type: 2}
_isDone: 1
_isDone: 0
_endQuestlineEvent: {fileID: 11400000, guid: f1dfa8d5cf7153245aa0c66e9d73942a, type: 2}

11
UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset


m_Name: SaveSystem
m_EditorClassIdentifier:
_loadLocation: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
_playerInventory: {fileID: 11400000, guid: 59c84467f7726dc4587a8373b0936f03, type: 2}
_playerInventory: {fileID: 11400000, guid: d0238f5fb055027499af8e4c6961e01b, type: 2}
_locationId: 1514f833150a79e4c9d242f58bdbcbc0
_locationId: 2f386bbc670c05145834a0f9c7d55798
_finishedQuestlineItemsGUIds: []
_finishedQuestlineItemsGUIds:
- 7b43c62a4fa974bbc82d5af43cc173ca
- 2419d670f41b60f45939ba1637631315
- 2187c1f18f6f9ae4bbd10f33a1871d8e
- 2c804c0ebb31e6a48af992dacd5db830
- c0990e60e5858ed48b0add09c1895572

3
UOP1_Project/Assets/Scripts/Menu/MenuSelectionHandler.cs


public void Unselect()
{
currentSelection = null;
EventSystem.current.SetSelectedGameObject(null);
if (EventSystem.current != null)
EventSystem.current.SetSelectedGameObject(null);
}
/// <summary>

13
UOP1_Project/Assets/Scripts/SceneManagement/EditorColdStartup.cs


private bool isColdStart = false;
[SerializeField] private SaveSystem _saveSystem = default;
private void Awake()
{
if (!SceneManager.GetSceneByName(_persistentManagersSO.sceneReference.editorAsset.name).isLoaded)

if (isColdStart)
{
_persistentManagersSO.sceneReference.LoadSceneAsync(LoadSceneMode.Additive, true).Completed += LoadEventChannel;
CreateSaveFileIfNotPresent();
private void CreateSaveFileIfNotPresent()
{
if (_saveSystem != null && !_saveSystem.LoadSaveDataFromDisk())
{
_saveSystem.SetNewGameData();
}
}
private void LoadEventChannel(AsyncOperationHandle<SceneInstance> obj)
{
_notifyColdStartupChannel.LoadAssetAsync<LoadEventChannelSO>().Completed += OnNotifyChannelLoaded;

{
if(_thisSceneSO != null)
if (_thisSceneSO != null)
{
obj.Result.RaiseEvent(_thisSceneSO);
}

正在加载...
取消
保存