Skip to content

Commit 535b30b

Browse files
uChemauChema
committed
Fix UI Rescaling. Test The whole game. WIP Interaction after cutscene
1 parent 94c4a76 commit 535b30b

File tree

9 files changed

+99
-35
lines changed

9 files changed

+99
-35
lines changed

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

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ GameObject:
181181
m_Icon: {fileID: 0}
182182
m_NavMeshLayer: 0
183183
m_StaticEditorFlags: 0
184-
m_IsActive: 0
184+
m_IsActive: 1
185185
--- !u!224 &3687453176568796422
186186
RectTransform:
187187
m_ObjectHideFlags: 0
@@ -502,9 +502,9 @@ MonoBehaviour:
502502
m_fontSize: 55
503503
m_fontSizeBase: 55
504504
m_fontWeight: 400
505-
m_enableAutoSizing: 0
506-
m_fontSizeMin: 18
507-
m_fontSizeMax: 72
505+
m_enableAutoSizing: 1
506+
m_fontSizeMin: 25
507+
m_fontSizeMax: 55
508508
m_fontStyle: 1
509509
m_HorizontalAlignment: 2
510510
m_VerticalAlignment: 512
@@ -984,6 +984,10 @@ PrefabInstance:
984984
m_Modification:
985985
m_TransformParent: {fileID: 1284969402}
986986
m_Modifications:
987+
- target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
988+
propertyPath: m_AnchoredPosition.x
989+
value: 0.0008544922
990+
objectReference: {fileID: 0}
987991
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
988992
type: 3}
989993
propertyPath: m_Pivot.x
@@ -1007,7 +1011,7 @@ PrefabInstance:
10071011
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10081012
type: 3}
10091013
propertyPath: m_AnchorMax.y
1010-
value: 1
1014+
value: 0
10111015
objectReference: {fileID: 0}
10121016
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10131017
type: 3}
@@ -1017,17 +1021,17 @@ PrefabInstance:
10171021
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10181022
type: 3}
10191023
propertyPath: m_AnchorMin.y
1020-
value: 1
1024+
value: 0
10211025
objectReference: {fileID: 0}
10221026
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10231027
type: 3}
10241028
propertyPath: m_SizeDelta.x
1025-
value: 366.11832
1029+
value: 0
10261030
objectReference: {fileID: 0}
10271031
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10281032
type: 3}
10291033
propertyPath: m_SizeDelta.y
1030-
value: 86.4
1034+
value: 0
10311035
objectReference: {fileID: 0}
10321036
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10331037
type: 3}
@@ -1067,12 +1071,12 @@ PrefabInstance:
10671071
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10681072
type: 3}
10691073
propertyPath: m_AnchoredPosition.x
1070-
value: 569.1775
1074+
value: 0
10711075
objectReference: {fileID: 0}
10721076
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10731077
type: 3}
10741078
propertyPath: m_AnchoredPosition.y
1075-
value: -43.2
1079+
value: 0
10761080
objectReference: {fileID: 0}
10771081
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
10781082
type: 3}
@@ -1099,6 +1103,16 @@ PrefabInstance:
10991103
propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
11001104
value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
11011105
objectReference: {fileID: 0}
1106+
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
1107+
type: 3}
1108+
propertyPath: m_AnchoredPosition.x
1109+
value: 2.3599854
1110+
objectReference: {fileID: 0}
1111+
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
1112+
type: 3}
1113+
propertyPath: m_AnchoredPosition.y
1114+
value: -0.010002136
1115+
objectReference: {fileID: 0}
11021116
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
11031117
type: 3}
11041118
propertyPath: m_text
@@ -1107,7 +1121,7 @@ PrefabInstance:
11071121
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
11081122
type: 3}
11091123
propertyPath: m_fontSize
1110-
value: 24.65
1124+
value: 44.65
11111125
objectReference: {fileID: 0}
11121126
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
11131127
type: 3}
@@ -1141,6 +1155,10 @@ PrefabInstance:
11411155
m_Modification:
11421156
m_TransformParent: {fileID: 1284969402}
11431157
m_Modifications:
1158+
- target: {fileID: 20254460, guid: bde732562bbef3c4785f9ce7c0af8047, type: 3}
1159+
propertyPath: m_AnchoredPosition.x
1160+
value: 0.0008544922
1161+
objectReference: {fileID: 0}
11441162
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11451163
type: 3}
11461164
propertyPath: m_Pivot.x
@@ -1164,7 +1182,7 @@ PrefabInstance:
11641182
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11651183
type: 3}
11661184
propertyPath: m_AnchorMax.y
1167-
value: 1
1185+
value: 0
11681186
objectReference: {fileID: 0}
11691187
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11701188
type: 3}
@@ -1174,17 +1192,17 @@ PrefabInstance:
11741192
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11751193
type: 3}
11761194
propertyPath: m_AnchorMin.y
1177-
value: 1
1195+
value: 0
11781196
objectReference: {fileID: 0}
11791197
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11801198
type: 3}
11811199
propertyPath: m_SizeDelta.x
1182-
value: 366.11832
1200+
value: 0
11831201
objectReference: {fileID: 0}
11841202
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11851203
type: 3}
11861204
propertyPath: m_SizeDelta.y
1187-
value: 86.4
1205+
value: 0
11881206
objectReference: {fileID: 0}
11891207
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
11901208
type: 3}
@@ -1224,12 +1242,12 @@ PrefabInstance:
12241242
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
12251243
type: 3}
12261244
propertyPath: m_AnchoredPosition.x
1227-
value: 183.05916
1245+
value: 0
12281246
objectReference: {fileID: 0}
12291247
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
12301248
type: 3}
12311249
propertyPath: m_AnchoredPosition.y
1232-
value: -43.2
1250+
value: 0
12331251
objectReference: {fileID: 0}
12341252
- target: {fileID: 550526546634029910, guid: bde732562bbef3c4785f9ce7c0af8047,
12351253
type: 3}
@@ -1256,6 +1274,16 @@ PrefabInstance:
12561274
propertyPath: m_UpdateString.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
12571275
value: TMPro.TextMeshProUGUI, Unity.TextMeshPro
12581276
objectReference: {fileID: 0}
1277+
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
1278+
type: 3}
1279+
propertyPath: m_AnchoredPosition.x
1280+
value: 2.3599854
1281+
objectReference: {fileID: 0}
1282+
- target: {fileID: 550526547636381841, guid: bde732562bbef3c4785f9ce7c0af8047,
1283+
type: 3}
1284+
propertyPath: m_AnchoredPosition.y
1285+
value: -0.010002136
1286+
objectReference: {fileID: 0}
12591287
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
12601288
type: 3}
12611289
propertyPath: m_text
@@ -1264,7 +1292,7 @@ PrefabInstance:
12641292
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
12651293
type: 3}
12661294
propertyPath: m_fontSize
1267-
value: 24.65
1295+
value: 44.65
12681296
objectReference: {fileID: 0}
12691297
- target: {fileID: 550526547636381843, guid: bde732562bbef3c4785f9ce7c0af8047,
12701298
type: 3}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actionName:
1616
m_TableReference:
17-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
17+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
1818
m_TableEntryReference:
1919
m_KeyId: 40314593280
2020
m_Key:
2121
m_FallbackState: 0
22+
m_WaitForCompletion: 1
2223
_typeName:
2324
m_TableReference:
24-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
25+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
2526
m_TableEntryReference:
2627
m_KeyId: 9515819008
2728
m_Key:
2829
m_FallbackState: 0
30+
m_WaitForCompletion: 1
2931
_typeColor: {r: 1, g: 0, b: 0.7267132, a: 1}
3032
_type: 3
3133
_actionType: 2

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actionName:
1616
m_TableReference:
17-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
17+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
1818
m_TableEntryReference:
19-
m_KeyId: 8664375296
19+
m_KeyId: 7281953546072064
2020
m_Key:
2121
m_FallbackState: 0
22+
m_WaitForCompletion: 1
2223
_typeName:
2324
m_TableReference:
24-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
25+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
2526
m_TableEntryReference:
26-
m_KeyId: 7281953546072064
27+
m_KeyId: 8664375296
2728
m_Key:
2829
m_FallbackState: 0
30+
m_WaitForCompletion: 1
2931
_typeColor: {r: 0.5137255, g: 0.6800925, b: 1, a: 1}
3032
_type: 4
3133
_actionType: 1

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actionName:
1616
m_TableReference:
17-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
17+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
1818
m_TableEntryReference:
19-
m_KeyId: 9104777216
19+
m_KeyId: 7281953546072064
2020
m_Key:
2121
m_FallbackState: 0
22+
m_WaitForCompletion: 1
2223
_typeName:
2324
m_TableReference:
24-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
25+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
2526
m_TableEntryReference:
2627
m_KeyId: 63681060864
2728
m_Key:
2829
m_FallbackState: 0
30+
m_WaitForCompletion: 1
2931
_typeColor: {r: 1, g: 0.5026138, b: 0, a: 1}
3032
_type: 2
3133
_actionType: 1

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actionName:
1616
m_TableReference:
17-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
17+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
1818
m_TableEntryReference:
1919
m_KeyId: 5159170121654272
2020
m_Key:
2121
m_FallbackState: 0
22+
m_WaitForCompletion: 1
2223
_typeName:
2324
m_TableReference:
24-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
25+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
2526
m_TableEntryReference:
2627
m_KeyId: 19204661248
2728
m_Key:
2829
m_FallbackState: 0
30+
m_WaitForCompletion: 1
2931
_typeColor: {r: 0.7564373, g: 0.7028302, b: 1, a: 1}
3032
_type: 0
3133
_actionType: 0

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
_actionName:
1616
m_TableReference:
17-
m_TableCollectionName:
17+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
1818
m_TableEntryReference:
19-
m_KeyId: 0
19+
m_KeyId: 9104777216
2020
m_Key:
2121
m_FallbackState: 0
22+
m_WaitForCompletion: 1
2223
_typeName:
2324
m_TableReference:
24-
m_TableCollectionName: GUID:4ac9e5091d0514d5c91eeeb5d5fb852e
25+
m_TableCollectionName: GUID:457af5455987a4876acc4332c3a761e5
2526
m_TableEntryReference:
2627
m_KeyId: 111147999232
2728
m_Key:
2829
m_FallbackState: 0
30+
m_WaitForCompletion: 1
2931
_typeColor: {r: 0.6965084, g: 1, b: 0, a: 1}
3032
_type: 1
3133
_actionType: 3

‎UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,25 @@ MonoBehaviour:
2121
backupSaveFilename: save.chop.bak
2222
saveData:
2323
_locationId: 2f386bbc670c05145834a0f9c7d55798
24-
_itemStacks: []
24+
_itemStacks:
25+
- itemGuid: 540c35ca6164bf3438e37e4f8087d47c
26+
amount: 1
27+
- itemGuid: 42396f680e5649c4b91e2b29ff34f811
28+
amount: 20
29+
- itemGuid: 1c53a3bee1a484bc2ab70d7f4f1f0aa4
30+
amount: 20
31+
- itemGuid: 7a6557abb46da48458da1572c9022163
32+
amount: 20
33+
- itemGuid: f14caff5e16bd4a48b45e4a2c5a0fc86
34+
amount: 20
35+
- itemGuid: 3e353820f321eb9469633db094e0c048
36+
amount: 1
2537
_finishedQuestlineItemsGUIds: []
26-
settings: {fileID: 0}
38+
_masterVolume: 1
39+
_musicVolume: 1
40+
_sfxVolume: 1
41+
_resolutionsIndex: 32
42+
_antiAliasingIndex: 2
43+
_shadowDistance: 20
44+
_isFullscreen: 0
45+
_currentLocale: {fileID: 11400000, guid: 13159d80b45f44b1e8f8b2ec92e8d30f, type: 2}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void StartGame()
5353
_makeWinningChoiceEvent.OnEventRaised += MakeWinningChoice;
5454
_makeLosingChoiceEvent.OnEventRaised += MakeLosingChoice;
5555
StartQuestline();
56+
Debug.Log(isNewGame());
5657
}
5758
void StartQuestline()
5859
{
@@ -418,7 +419,12 @@ public void ResetQuestlines()
418419
//Start Questline with the new data
419420
StartQuestline();
420421
}
421-
422+
public bool isNewGame()
423+
{
424+
bool isNew = false;
425+
isNew = (!_questlines.Exists(o => o.Quests.Exists(j => j.Steps.Exists(k => k.IsDone))));
426+
return isNew;
427+
}
422428
}
423429

424430

‎UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void SetNewGameData()
103103
FileManager.WriteToFile(saveFilename, "");
104104
_playerInventory.Init();
105105
_questManagerSO.ResetQuestlines();
106+
106107
SaveDataToDisk();
107108

108109
}

0 commit comments

Comments
 (0)