Skip to content

Commit 02f35a4

Browse files
uChemauChema
committed
Add Icons placeholders - Set Game Scene UI - Add Aggro System
1 parent 9a43edc commit 02f35a4

33 files changed

+2642
-942
lines changed

‎UOP1_Project/Assets/Art/UI/PlaceHolders/HeartAggro.png

117 KB
Loading

‎UOP1_Project/Assets/Art/UI/PlaceHolders/HeartAggro.png.meta

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UOP1_Project/Assets/Art/UI/PlaceHolders/HeartBorder.png

5.46 KB
Loading

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ MonoBehaviour:
150150
_actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
151151
_defaultDialogue: {fileID: 11400000, guid: f7ead55387bac6d4a9ba9bf10c5c3ee5, type: 2}
152152
_questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
153+
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
153154
_interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
154155
_winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
155156
_loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}

‎UOP1_Project/Assets/Prefabs/UI/GameplayScene/GameScreen.prefab

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,47 +57,47 @@ PrefabInstance:
5757
- target: {fileID: 4915692451598217997, guid: 2e4947ea4180464408ff7fe04be6a671,
5858
type: 3}
5959
propertyPath: m_AnchorMax.y
60-
value: 0
60+
value: 1
6161
objectReference: {fileID: 0}
6262
- target: {fileID: 4915692451598217997, guid: 2e4947ea4180464408ff7fe04be6a671,
6363
type: 3}
6464
propertyPath: m_AnchorMin.y
65-
value: 0
65+
value: 1
6666
objectReference: {fileID: 0}
6767
- target: {fileID: 4915692451598217997, guid: 2e4947ea4180464408ff7fe04be6a671,
6868
type: 3}
6969
propertyPath: m_SizeDelta.y
70-
value: 0
70+
value: 62
7171
objectReference: {fileID: 0}
7272
- target: {fileID: 4915692451598217997, guid: 2e4947ea4180464408ff7fe04be6a671,
7373
type: 3}
7474
propertyPath: m_AnchoredPosition.x
75-
value: 0
75+
value: 149.5632
7676
objectReference: {fileID: 0}
7777
- target: {fileID: 4915692451598217997, guid: 2e4947ea4180464408ff7fe04be6a671,
7878
type: 3}
7979
propertyPath: m_AnchoredPosition.y
80-
value: 0
80+
value: -34.8091
8181
objectReference: {fileID: 0}
8282
- target: {fileID: 4915692451633599295, guid: 2e4947ea4180464408ff7fe04be6a671,
8383
type: 3}
8484
propertyPath: m_AnchorMax.y
85-
value: 0
85+
value: 1
8686
objectReference: {fileID: 0}
8787
- target: {fileID: 4915692451633599295, guid: 2e4947ea4180464408ff7fe04be6a671,
8888
type: 3}
8989
propertyPath: m_AnchorMin.y
90-
value: 0
90+
value: 1
9191
objectReference: {fileID: 0}
9292
- target: {fileID: 4915692451633599295, guid: 2e4947ea4180464408ff7fe04be6a671,
9393
type: 3}
9494
propertyPath: m_SizeDelta.y
95-
value: 0
95+
value: 69.6182
9696
objectReference: {fileID: 0}
9797
- target: {fileID: 4915692451633599295, guid: 2e4947ea4180464408ff7fe04be6a671,
9898
type: 3}
9999
propertyPath: m_AnchoredPosition.y
100-
value: 0
100+
value: -34.8091
101101
objectReference: {fileID: 0}
102102
- target: {fileID: 4915692452906622209, guid: 2e4947ea4180464408ff7fe04be6a671,
103103
type: 3}
@@ -209,55 +209,60 @@ PrefabInstance:
209209
propertyPath: m_Name
210210
value: InteractionDisplay
211211
objectReference: {fileID: 0}
212+
- target: {fileID: 4915692452906622210, guid: 2e4947ea4180464408ff7fe04be6a671,
213+
type: 3}
214+
propertyPath: m_IsActive
215+
value: 0
216+
objectReference: {fileID: 0}
212217
- target: {fileID: 4915692453220505055, guid: 2e4947ea4180464408ff7fe04be6a671,
213218
type: 3}
214219
propertyPath: m_AnchorMax.y
215-
value: 0
220+
value: 1
216221
objectReference: {fileID: 0}
217222
- target: {fileID: 4915692453220505055, guid: 2e4947ea4180464408ff7fe04be6a671,
218223
type: 3}
219224
propertyPath: m_AnchorMin.y
220-
value: 0
225+
value: 1
221226
objectReference: {fileID: 0}
222227
- target: {fileID: 4915692453220505055, guid: 2e4947ea4180464408ff7fe04be6a671,
223228
type: 3}
224229
propertyPath: m_SizeDelta.y
225-
value: 0
230+
value: 40.22
226231
objectReference: {fileID: 0}
227232
- target: {fileID: 4915692453220505055, guid: 2e4947ea4180464408ff7fe04be6a671,
228233
type: 3}
229234
propertyPath: m_AnchoredPosition.x
230-
value: 0
235+
value: 139.5632
231236
objectReference: {fileID: 0}
232237
- target: {fileID: 4915692453220505055, guid: 2e4947ea4180464408ff7fe04be6a671,
233238
type: 3}
234239
propertyPath: m_AnchoredPosition.y
235-
value: 0
240+
value: -34.8091
236241
objectReference: {fileID: 0}
237242
- target: {fileID: 4915692453496092222, guid: 2e4947ea4180464408ff7fe04be6a671,
238243
type: 3}
239244
propertyPath: m_AnchorMax.y
240-
value: 0
245+
value: 1
241246
objectReference: {fileID: 0}
242247
- target: {fileID: 4915692453496092222, guid: 2e4947ea4180464408ff7fe04be6a671,
243248
type: 3}
244249
propertyPath: m_AnchorMin.y
245-
value: 0
250+
value: 1
246251
objectReference: {fileID: 0}
247252
- target: {fileID: 4915692453496092222, guid: 2e4947ea4180464408ff7fe04be6a671,
248253
type: 3}
249254
propertyPath: m_SizeDelta.y
250-
value: 0
255+
value: 67
251256
objectReference: {fileID: 0}
252257
- target: {fileID: 4915692453496092222, guid: 2e4947ea4180464408ff7fe04be6a671,
253258
type: 3}
254259
propertyPath: m_AnchoredPosition.x
255-
value: 0
260+
value: 88.704
256261
objectReference: {fileID: 0}
257262
- target: {fileID: 4915692453496092222, guid: 2e4947ea4180464408ff7fe04be6a671,
258263
type: 3}
259264
propertyPath: m_AnchoredPosition.y
260-
value: 0
265+
value: -34.8091
261266
objectReference: {fileID: 0}
262267
m_RemovedComponents: []
263268
m_SourcePrefab: {fileID: 100100000, guid: 2e4947ea4180464408ff7fe04be6a671, type: 3}
@@ -484,6 +489,11 @@ PrefabInstance:
484489
propertyPath: m_AnchoredPosition.y
485490
value: 0
486491
objectReference: {fileID: 0}
492+
- target: {fileID: 2564300315847848979, guid: 8f80078235ba241aaa576eba63c44a25,
493+
type: 3}
494+
propertyPath: m_AnchoredPosition.x
495+
value: 0
496+
objectReference: {fileID: 0}
487497
- target: {fileID: 2743678380493192373, guid: 8f80078235ba241aaa576eba63c44a25,
488498
type: 3}
489499
propertyPath: m_AnchorMax.y
@@ -589,6 +599,11 @@ PrefabInstance:
589599
propertyPath: m_AnchoredPosition.y
590600
value: 0
591601
objectReference: {fileID: 0}
602+
- target: {fileID: 2953649455187504046, guid: 8f80078235ba241aaa576eba63c44a25,
603+
type: 3}
604+
propertyPath: m_AnchoredPosition.x
605+
value: 0
606+
objectReference: {fileID: 0}
592607
- target: {fileID: 3024197192044976688, guid: 8f80078235ba241aaa576eba63c44a25,
593608
type: 3}
594609
propertyPath: m_AnchorMax.y
@@ -809,6 +824,11 @@ PrefabInstance:
809824
propertyPath: m_AnchoredPosition.y
810825
value: 0
811826
objectReference: {fileID: 0}
827+
- target: {fileID: 5740383256594478017, guid: 8f80078235ba241aaa576eba63c44a25,
828+
type: 3}
829+
propertyPath: m_AnchoredPosition.x
830+
value: 0
831+
objectReference: {fileID: 0}
812832
- target: {fileID: 6087809287161891054, guid: 8f80078235ba241aaa576eba63c44a25,
813833
type: 3}
814834
propertyPath: m_AnchorMax.y
@@ -839,6 +859,11 @@ PrefabInstance:
839859
propertyPath: m_AnchoredPosition.y
840860
value: 0
841861
objectReference: {fileID: 0}
862+
- target: {fileID: 6292411167976899670, guid: 8f80078235ba241aaa576eba63c44a25,
863+
type: 3}
864+
propertyPath: m_AnchoredPosition.x
865+
value: 0
866+
objectReference: {fileID: 0}
842867
- target: {fileID: 6352810064952983069, guid: 8f80078235ba241aaa576eba63c44a25,
843868
type: 3}
844869
propertyPath: m_Pivot.x
@@ -949,6 +974,11 @@ PrefabInstance:
949974
propertyPath: m_PresetInfoIsWorld
950975
value: 0
951976
objectReference: {fileID: 0}
977+
- target: {fileID: 9088227919566831089, guid: 8f80078235ba241aaa576eba63c44a25,
978+
type: 3}
979+
propertyPath: m_AnchoredPosition.x
980+
value: 0
981+
objectReference: {fileID: 0}
952982
m_RemovedComponents: []
953983
m_SourcePrefab: {fileID: 100100000, guid: 8f80078235ba241aaa576eba63c44a25, type: 3}
954984
--- !u!224 &470360590739831999 stripped

0 commit comments

Comments
 (0)