Skip to content

Commit c68f399

Browse files
committed
Refactoring code
- removed some bulk functions - refactored hotkeys window - several fixes
1 parent a14c4a3 commit c68f399

31 files changed

Lines changed: 5009 additions & 4476 deletions

OpenTibia/Assets/Prefabs/UI/Custom/PanelHoteyAction.prefab

Lines changed: 78 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ MonoBehaviour:
6262
m_Name:
6363
m_EditorClassIdentifier:
6464
textComponent: {fileID: 1112518620548769155}
65+
normalColor: {r: 0, g: 0, b: 0, a: 0}
66+
highlightColor: {r: 0, g: 0, b: 0, a: 0}
67+
KeyCode: 0
68+
EventModifiers: 0
69+
BaseText:
6570
--- !u!114 &6819045635219079869
6671
MonoBehaviour:
6772
m_ObjectHideFlags: 0
@@ -85,17 +90,20 @@ MonoBehaviour:
8590
m_NormalColor: {r: 0.28235295, g: 0.28235295, b: 0.28235295, a: 1}
8691
m_HighlightedColor: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 1}
8792
m_PressedColor: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 1}
93+
m_SelectedColor: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 1}
8894
m_DisabledColor: {r: 0, g: 0, b: 0, a: 0}
8995
m_ColorMultiplier: 1
9096
m_FadeDuration: 0.1
9197
m_SpriteState:
9298
m_HighlightedSprite: {fileID: 0}
9399
m_PressedSprite: {fileID: 0}
100+
m_SelectedSprite: {fileID: 0}
94101
m_DisabledSprite: {fileID: 0}
95102
m_AnimationTriggers:
96103
m_NormalTrigger: Normal
97104
m_HighlightedTrigger: Highlighted
98105
m_PressedTrigger: Pressed
106+
m_SelectedTrigger: Highlighted
99107
m_DisabledTrigger: Disabled
100108
m_Interactable: 1
101109
m_TargetGraphic: {fileID: 3315238421043018405}
@@ -120,6 +128,76 @@ PrefabInstance:
120128
propertyPath: m_Name
121129
value: LabelAction
122130
objectReference: {fileID: 0}
131+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
132+
type: 3}
133+
propertyPath: m_havePropertiesChanged
134+
value: 0
135+
objectReference: {fileID: 0}
136+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
137+
type: 3}
138+
propertyPath: m_isInputParsingRequired
139+
value: 0
140+
objectReference: {fileID: 0}
141+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
142+
type: 3}
143+
propertyPath: m_text
144+
value: <color=#affeaf>(use object on yourself)</color>
145+
objectReference: {fileID: 0}
146+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
147+
type: 3}
148+
propertyPath: m_textInfo.characterCount
149+
value: 0
150+
objectReference: {fileID: 0}
151+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
152+
type: 3}
153+
propertyPath: m_textInfo.wordCount
154+
value: 0
155+
objectReference: {fileID: 0}
156+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
157+
type: 3}
158+
propertyPath: m_textInfo.lineCount
159+
value: 0
160+
objectReference: {fileID: 0}
161+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
162+
type: 3}
163+
propertyPath: m_textInfo.pageCount
164+
value: 0
165+
objectReference: {fileID: 0}
166+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
167+
type: 3}
168+
propertyPath: m_textInfo.spaceCount
169+
value: 0
170+
objectReference: {fileID: 0}
171+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
172+
type: 3}
173+
propertyPath: m_firstOverflowCharacterIndex
174+
value: 0
175+
objectReference: {fileID: 0}
176+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
177+
type: 3}
178+
propertyPath: m_fontSize
179+
value: 11
180+
objectReference: {fileID: 0}
181+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
182+
type: 3}
183+
propertyPath: m_fontSizeBase
184+
value: 11
185+
objectReference: {fileID: 0}
186+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
187+
type: 3}
188+
propertyPath: m_textAlignment
189+
value: 8193
190+
objectReference: {fileID: 0}
191+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
192+
type: 3}
193+
propertyPath: m_overflowMode
194+
value: 1
195+
objectReference: {fileID: 0}
196+
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
197+
type: 3}
198+
propertyPath: m_isTextTruncated
199+
value: 1
200+
objectReference: {fileID: 0}
123201
- target: {fileID: 1861785186114806433, guid: 54eba66ce4c99784c9bc8796c90e8b87,
124202
type: 3}
125203
propertyPath: m_LocalPosition.x
@@ -225,66 +303,6 @@ PrefabInstance:
225303
propertyPath: m_Pivot.y
226304
value: 0.5
227305
objectReference: {fileID: 0}
228-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
229-
type: 3}
230-
propertyPath: m_havePropertiesChanged
231-
value: 0
232-
objectReference: {fileID: 0}
233-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
234-
type: 3}
235-
propertyPath: m_isInputParsingRequired
236-
value: 0
237-
objectReference: {fileID: 0}
238-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
239-
type: 3}
240-
propertyPath: m_text
241-
value: <color=#affeaf>(use object on yourself)</color>
242-
objectReference: {fileID: 0}
243-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
244-
type: 3}
245-
propertyPath: m_textInfo.characterCount
246-
value: 24
247-
objectReference: {fileID: 0}
248-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
249-
type: 3}
250-
propertyPath: m_textInfo.wordCount
251-
value: 4
252-
objectReference: {fileID: 0}
253-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
254-
type: 3}
255-
propertyPath: m_textInfo.lineCount
256-
value: 21
257-
objectReference: {fileID: 0}
258-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
259-
type: 3}
260-
propertyPath: m_textInfo.pageCount
261-
value: 1
262-
objectReference: {fileID: 0}
263-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
264-
type: 3}
265-
propertyPath: m_textInfo.spaceCount
266-
value: 3
267-
objectReference: {fileID: 0}
268-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
269-
type: 3}
270-
propertyPath: m_firstOverflowCharacterIndex
271-
value: 0
272-
objectReference: {fileID: 0}
273-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
274-
type: 3}
275-
propertyPath: m_fontSize
276-
value: 11
277-
objectReference: {fileID: 0}
278-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
279-
type: 3}
280-
propertyPath: m_fontSizeBase
281-
value: 11
282-
objectReference: {fileID: 0}
283-
- target: {fileID: 1942319386908416228, guid: 54eba66ce4c99784c9bc8796c90e8b87,
284-
type: 3}
285-
propertyPath: m_textAlignment
286-
value: 8193
287-
objectReference: {fileID: 0}
288306
m_RemovedComponents: []
289307
m_SourcePrefab: {fileID: 100100000, guid: 54eba66ce4c99784c9bc8796c90e8b87, type: 3}
290308
--- !u!114 &1112518620548769155 stripped

OpenTibia/Assets/Prefabs/UI/InputFields/InputField.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ MonoBehaviour:
363363
m_MinWidth: -1
364364
m_MinHeight: -1
365365
m_PreferredWidth: -1
366-
m_PreferredHeight: 20
366+
m_PreferredHeight: 18
367367
m_FlexibleWidth: -1
368368
m_FlexibleHeight: -1
369369
m_LayoutPriority: 1

0 commit comments

Comments
 (0)