Skip to content

Commit b281e87

Browse files
slavidodoslavidodo
committed
Containers & Some refactors
- correcting spelling for some variables (due to last refactoring, a few things had a little mess) - containers should function correctly (you can interact with containers) - icons for containers should corrected - miniwindows should trigger the correct height when resizing. - correct object cache update, the client was forced to update the cache every time, which the correct case is that it should ONLY update the cache of a field when anything affects the field. - correct miniwindow height (including title height)
1 parent a1e9239 commit b281e87

19 files changed

Lines changed: 441 additions & 353 deletions

File tree

‎OpenTibia/Assets/Materials/OutfitTypeMaterial.mat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ Material:
7979
- _ZWrite: 1
8080
m_Colors:
8181
- _Color: {r: 1, g: 1, b: 1, a: 1}
82-
- _DetailColor: {r: 0.42857143, g: 0.42857143, b: 0.42857143, a: 1}
82+
- _DetailColor: {r: 0, g: 0, b: 0, a: 1}
8383
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
84-
- _HeadColor: {r: 1, g: 0.6666667, b: 0, a: 1}
85-
- _HighlightColor: {r: 1, g: 0.88235295, b: 0.21568628, a: 1}
86-
- _LegsColor: {r: 0.75, g: 0.5, b: 0.375, a: 1}
87-
- _TorsoColor: {r: 0.24975, g: 0.41650003, b: 0.75, a: 1}
84+
- _HeadColor: {r: 1, g: 1, b: 1, a: 1}
85+
- _HighlightColor: {r: 1, g: 1, b: 1, a: 1}
86+
- _LegsColor: {r: 1, g: 1, b: 1, a: 1}
87+
- _TorsoColor: {r: 1, g: 1, b: 1, a: 1}

‎OpenTibia/Assets/Prefabs/UI/MiniWindows/PanelMiniWindowContainer.prefab‎

Lines changed: 86 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,41 @@ MonoBehaviour:
1717
_minContentHeight: 50
1818
_maxContentHeight: -1
1919
_preferredContentHeight: 50
20-
_panelContent: {fileID: 6357324742265880738}
20+
_panelContent: {fileID: 343761142182256883}
2121
_titleLabel: {fileID: 2129220585434311244}
22-
_closeButton: {fileID: 0}
22+
_closeButton: {fileID: 2630987419476728751}
2323
_minimizeButton: {fileID: 9061772425111600183}
2424
_maximizeButton: {fileID: 654977903458494250}
25+
_iconImage: {fileID: 7805138062862556048}
2526
_itemsScrollRect: {fileID: 7820408233784728935}
2627
_upButton: {fileID: 4969182052969208643}
27-
--- !u!114 &1298711957
28+
--- !u!114 &7805138062862556048
2829
MonoBehaviour:
2930
m_ObjectHideFlags: 0
3031
m_CorrespondingSourceObject: {fileID: 0}
3132
m_PrefabInstance: {fileID: 0}
3233
m_PrefabAsset: {fileID: 0}
33-
m_GameObject: {fileID: 3749360181059435191}
34+
m_GameObject: {fileID: 3921371273611504856}
3435
m_Enabled: 0
3536
m_EditorHideFlags: 0
36-
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
37+
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
3738
m_Name:
3839
m_EditorClassIdentifier:
39-
--- !u!114 &5150641457332132761
40-
MonoBehaviour:
41-
m_ObjectHideFlags: 0
42-
m_CorrespondingSourceObject: {fileID: 0}
43-
m_PrefabInstance: {fileID: 0}
44-
m_PrefabAsset: {fileID: 0}
45-
m_GameObject: {fileID: 3749360181059435191}
46-
m_Enabled: 1
47-
m_EditorHideFlags: 0
48-
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
49-
m_Name:
50-
m_EditorClassIdentifier:
51-
m_IgnoreLayout: 0
52-
m_MinWidth: -1
53-
m_MinHeight: 0
54-
m_PreferredWidth: -1
55-
m_PreferredHeight: -1
56-
m_FlexibleWidth: -1
57-
m_FlexibleHeight: -1
58-
m_LayoutPriority: 1
40+
m_Material: {fileID: 0}
41+
m_Color: {r: 1, g: 1, b: 1, a: 1}
42+
m_RaycastTarget: 0
43+
m_OnCullStateChanged:
44+
m_PersistentCalls:
45+
m_Calls: []
46+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
47+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
48+
m_Texture: {fileID: 0}
49+
m_UVRect:
50+
serializedVersion: 2
51+
x: 0
52+
y: 0
53+
width: 1
54+
height: 1
5955
--- !u!114 &2883666507746148778
6056
MonoBehaviour:
6157
m_ObjectHideFlags: 0
@@ -169,7 +165,7 @@ PrefabInstance:
169165
- target: {fileID: 4837015657985786659, guid: 6ad8373a7bca5c64a89914afd4a53d70,
170166
type: 3}
171167
propertyPath: m_AnchoredPosition.x
172-
value: -27
168+
value: -23
173169
objectReference: {fileID: 0}
174170
- target: {fileID: 4837015657985786659, guid: 6ad8373a7bca5c64a89914afd4a53d70,
175171
type: 3}
@@ -259,45 +255,10 @@ PrefabInstance:
259255
propertyPath: m_Name
260256
value: PanelMiniWindowContainer
261257
objectReference: {fileID: 0}
262-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
258+
- target: {fileID: 874942158131993495, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
263259
type: 3}
264-
propertyPath: m_Pivot.y
265-
value: 1
266-
objectReference: {fileID: 0}
267-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
268-
type: 3}
269-
propertyPath: m_AnchorMin.y
270-
value: 0
271-
objectReference: {fileID: 0}
272-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
273-
type: 3}
274-
propertyPath: m_AnchorMax.y
275-
value: 0
276-
objectReference: {fileID: 0}
277-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
278-
type: 3}
279-
propertyPath: m_AnchoredPosition.x
280-
value: 0
281-
objectReference: {fileID: 0}
282-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
283-
type: 3}
284-
propertyPath: m_AnchoredPosition.y
285-
value: 0
286-
objectReference: {fileID: 0}
287-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
288-
type: 3}
289-
propertyPath: m_SizeDelta.x
290-
value: 0
291-
objectReference: {fileID: 0}
292-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
293-
type: 3}
294-
propertyPath: m_SizeDelta.y
295-
value: 0
296-
objectReference: {fileID: 0}
297-
- target: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
298-
type: 3}
299-
propertyPath: m_AnchorMax.x
300-
value: 0
260+
propertyPath: m_margin.x
261+
value: 17
301262
objectReference: {fileID: 0}
302263
- target: {fileID: 7839350299977522590, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
303264
type: 3}
@@ -404,11 +365,6 @@ PrefabInstance:
404365
propertyPath: m_Pivot.y
405366
value: 0.5
406367
objectReference: {fileID: 0}
407-
- target: {fileID: 70739845383120780, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
408-
type: 3}
409-
propertyPath: m_ChildScaleWidth
410-
value: 0
411-
objectReference: {fileID: 0}
412368
- target: {fileID: 1082704166163997138, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
413369
type: 3}
414370
propertyPath: m_AnchorMin.y
@@ -439,13 +395,44 @@ PrefabInstance:
439395
propertyPath: m_SizeDelta.y
440396
value: 0
441397
objectReference: {fileID: 0}
398+
- target: {fileID: 4183815565391884831, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
399+
type: 3}
400+
propertyPath: m_Enabled
401+
value: 1
402+
objectReference: {fileID: 0}
403+
- target: {fileID: 4249444486570169845, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
404+
type: 3}
405+
propertyPath: m_Padding.m_Bottom
406+
value: 0
407+
objectReference: {fileID: 0}
408+
- target: {fileID: 4249444486570169845, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
409+
type: 3}
410+
propertyPath: m_Padding.m_Top
411+
value: 0
412+
objectReference: {fileID: 0}
442413
- target: {fileID: 4249444486570169845, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
443414
type: 3}
444415
propertyPath: m_Padding.m_Right
445416
value: 0
446417
objectReference: {fileID: 0}
418+
- target: {fileID: 4249444486570169845, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
419+
type: 3}
420+
propertyPath: m_Padding.m_Left
421+
value: 0
422+
objectReference: {fileID: 0}
423+
- target: {fileID: 5472662861425108758, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
424+
type: 3}
425+
propertyPath: m_SizeDelta.x
426+
value: 14
427+
objectReference: {fileID: 0}
428+
- target: {fileID: 5472662861425108758, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
429+
type: 3}
430+
propertyPath: m_SizeDelta.y
431+
value: 14
432+
objectReference: {fileID: 0}
447433
m_RemovedComponents:
448434
- {fileID: 8274263800241433161, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5, type: 3}
435+
- {fileID: 8859919385192425789, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5, type: 3}
449436
m_SourcePrefab: {fileID: 100100000, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5, type: 3}
450437
--- !u!1 &1248543922292823632 stripped
451438
GameObject:
@@ -471,6 +458,24 @@ MonoBehaviour:
471458
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
472459
m_Name:
473460
m_EditorClassIdentifier:
461+
--- !u!1 &3921371273611504856 stripped
462+
GameObject:
463+
m_CorrespondingSourceObject: {fileID: 2865252479647522051, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
464+
type: 3}
465+
m_PrefabInstance: {fileID: 1272523728227037659}
466+
m_PrefabAsset: {fileID: 0}
467+
--- !u!114 &2630987419476728751 stripped
468+
MonoBehaviour:
469+
m_CorrespondingSourceObject: {fileID: 3831380796377459316, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
470+
type: 3}
471+
m_PrefabInstance: {fileID: 1272523728227037659}
472+
m_PrefabAsset: {fileID: 0}
473+
m_GameObject: {fileID: 0}
474+
m_Enabled: 1
475+
m_EditorHideFlags: 0
476+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
477+
m_Name:
478+
m_EditorClassIdentifier:
474479
--- !u!114 &9061772425111600183 stripped
475480
MonoBehaviour:
476481
m_CorrespondingSourceObject: {fileID: 7811787762541956588, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
@@ -495,12 +500,6 @@ MonoBehaviour:
495500
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
496501
m_Name:
497502
m_EditorClassIdentifier:
498-
--- !u!1 &3749360181059435191 stripped
499-
GameObject:
500-
m_CorrespondingSourceObject: {fileID: 2711323855970945900, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
501-
type: 3}
502-
m_PrefabInstance: {fileID: 1272523728227037659}
503-
m_PrefabAsset: {fileID: 0}
504503
--- !u!224 &6357324742265880738 stripped
505504
RectTransform:
506505
m_CorrespondingSourceObject: {fileID: 5301063029104128377, guid: a5ddc2e2a5a73e448b4ab83fc88d3cb5,
@@ -519,6 +518,11 @@ PrefabInstance:
519518
propertyPath: m_Name
520519
value: ItemListScrollArea
521520
objectReference: {fileID: 0}
521+
- target: {fileID: 8603925423507969433, guid: 40dee3dca139fc94595d30807d888dc3,
522+
type: 3}
523+
propertyPath: m_Name
524+
value: PanelContentItems
525+
objectReference: {fileID: 0}
522526
- target: {fileID: 9080445934372335244, guid: 40dee3dca139fc94595d30807d888dc3,
523527
type: 3}
524528
propertyPath: m_LocalPosition.x
@@ -632,7 +636,7 @@ PrefabInstance:
632636
- target: {fileID: 8975592622985898134, guid: 40dee3dca139fc94595d30807d888dc3,
633637
type: 3}
634638
propertyPath: m_Size
635-
value: 0.9714286
639+
value: 0.97402596
636640
objectReference: {fileID: 0}
637641
- target: {fileID: 3971681045354460173, guid: 40dee3dca139fc94595d30807d888dc3,
638642
type: 3}
@@ -724,3 +728,9 @@ GameObject:
724728
type: 3}
725729
m_PrefabInstance: {fileID: 2275345211603013503}
726730
m_PrefabAsset: {fileID: 0}
731+
--- !u!224 &343761142182256883 stripped
732+
RectTransform:
733+
m_CorrespondingSourceObject: {fileID: 1970024145670434700, guid: 40dee3dca139fc94595d30807d888dc3,
734+
type: 3}
735+
m_PrefabInstance: {fileID: 2275345211603013503}
736+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)