浏览代码

Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene

/main
uChema 3 年前
当前提交
8a36c2bf
共有 9 个文件被更改,包括 99 次插入35 次删除
  1. 64
      UOP1_Project/Assets/Prefabs/UI/GameplayScene/Dialogue/DialoguePanel.prefab
  2. 6
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/CharacterCustomization.asset
  3. 10
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Dish.asset
  4. 8
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Ingredient.asset
  5. 6
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Recipe.asset
  6. 8
      UOP1_Project/Assets/ScriptableObjects/Inventory/ItemTypes/Utensil.asset
  7. 23
      UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset
  8. 8
      UOP1_Project/Assets/Scripts/Quests/QuestManagerSO.cs
  9. 1
      UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs

64
UOP1_Project/Assets/Prefabs/UI/GameplayScene/Dialogue/DialoguePanel.prefab


m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3687453176568796422
RectTransform:
m_ObjectHideFlags: 0

m_fontSize: 55
m_fontSizeBase: 55
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_enableAutoSizing: 1
m_fontSizeMin: 25
m_fontSizeMax: 55
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512

m_Modification:
m_TransformParent: {fileID: 1284969402}
m_Modifications:
- target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.0008544922
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_Pivot.x

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
value: 366.11832
value: 0
value: 86.4
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 569.1775
value: 0
value: -43.2
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
objectReference: {fileID: 0}
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 2.3599854
objectReference: {fileID: 0}
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.010002136
objectReference: {fileID: 0}
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_text

type: 3}
propertyPath: m_fontSize
value: 24.65
value: 44.65
objectReference: {fileID: 0}
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

m_Modification:
m_TransformParent: {fileID: 1284969402}
m_Modifications:
- target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.0008544922
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_Pivot.x

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
value: 366.11832
value: 0
value: 86.4
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 183.05916
value: 0
value: -43.2
value: 0
objectReference: {fileID: 0}
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
objectReference: {fileID: 0}
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 2.3599854
objectReference: {fileID: 0}
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.010002136
objectReference: {fileID: 0}
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}
propertyPath: m_text

type: 3}
propertyPath: m_fontSize
value: 24.65
value: 44.65
objectReference: {fileID: 0}
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
type: 3}

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


m_EditorClassIdentifier:
_actionName:
m_TableReference:
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
_typeColor: {r: 1, g: 0, b: 0.7267132, a: 1}
_type: 3
_actionType: 2

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


m_EditorClassIdentifier:
_actionName:
m_TableReference:
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_KeyId: 8664375296
m_KeyId: 7281953546072064
m_WaitForCompletion: 1
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_KeyId: 7281953546072064
m_KeyId: 8664375296
m_WaitForCompletion: 1
_typeColor: {r: 0.5137255, g: 0.6800925, b: 1, a: 1}
_type: 4
_actionType: 1

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


m_EditorClassIdentifier:
_actionName:
m_TableReference:
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_KeyId: 9104777216
m_KeyId: 7281953546072064
m_WaitForCompletion: 1
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
_typeColor: {r: 1, g: 0.5026138, b: 0, a: 1}
_type: 2
_actionType: 1

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


m_EditorClassIdentifier:
_actionName:
m_TableReference:
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
_typeColor: {r: 0.7564373, g: 0.7028302, b: 1, a: 1}
_type: 0
_actionType: 0

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


m_EditorClassIdentifier:
_actionName:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_KeyId: 0
m_KeyId: 9104777216
m_WaitForCompletion: 1
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
m_WaitForCompletion: 1
_typeColor: {r: 0.6965084, g: 1, b: 0, a: 1}
_type: 1
_actionType: 3

23
UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset


backupSaveFilename: save.chop.bak
saveData:
_locationId: 2f386bbc670c05145834a0f9c7d55798
_itemStacks: []
_itemStacks:
- itemGuid: 540c35ca6164bf3438e37e4f8087d47c
amount: 1
- itemGuid: 42396f680e5649c4b91e2b29ff34f811
amount: 20
- itemGuid: 1c53a3bee1a484bc2ab70d7f4f1f0aa4
amount: 20
- itemGuid: 7a6557abb46da48458da1572c9022163
amount: 20
- itemGuid: f14caff5e16bd4a48b45e4a2c5a0fc86
amount: 20
- itemGuid: 3e353820f321eb9469633db094e0c048
amount: 1
settings: {fileID: 0}
_masterVolume: 1
_musicVolume: 1
_sfxVolume: 1
_resolutionsIndex: 32
_antiAliasingIndex: 2
_shadowDistance: 20
_isFullscreen: 0
_currentLocale: {fileID: 11400000, guid: 13159d80b45f44b1e8f8b2ec92e8d30f, type: 2}

8
UOP1_Project/Assets/Scripts/Quests/QuestManagerSO.cs


_makeWinningChoiceEvent.OnEventRaised += MakeWinningChoice;
_makeLosingChoiceEvent.OnEventRaised += MakeLosingChoice;
StartQuestline();
Debug.Log(isNewGame());
}
void StartQuestline()
{

//Start Questline with the new data
StartQuestline();
}
public bool isNewGame()
{
bool isNew = false;
isNew = (!_questlines.Exists(o => o.Quests.Exists(j => j.Steps.Exists(k => k.IsDone))));
return isNew;
}
}

1
UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs


FileManager.WriteToFile(saveFilename, "");
_playerInventory.Init();
_questManagerSO.ResetQuestlines();
SaveDataToDisk();
}

正在加载...
取消
保存