Skip to content

Commit e0dd651

Browse files
committed
Naming convention & NPCTrade
- Fixed naming convention for most of the project. - Implemented NPCTrade - Fixed communication with NPCs - Corrected a few functions to behave correctly. - Fixed a possible stack-overflow
1 parent c225102 commit e0dd651

257 files changed

Lines changed: 9526 additions & 8710 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

OpenTibia/Assets/Editor/Core/Components/DraggableEditor.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ namespace OpenTibiaUnity.Core.Components
77
[CanEditMultipleObjects]
88
public class DraggableTransformEditor : Editor
99
{
10-
SerializedProperty m_BindRectToParent;
11-
SerializedProperty m_DraggablePolicy;
12-
SerializedProperty m_DragBoxSize;
10+
SerializedProperty _bindRectToParent;
11+
SerializedProperty _draggablePolicy;
12+
SerializedProperty _dragBoxSize;
1313

1414
protected virtual void OnEnable() {
15-
m_BindRectToParent = serializedObject.FindProperty("bindRectToParent");
16-
m_DraggablePolicy = serializedObject.FindProperty("draggingPolicy");
17-
m_DragBoxSize = serializedObject.FindProperty("draggingBoxSize");
15+
_bindRectToParent = serializedObject.FindProperty("bindRectToParent");
16+
_draggablePolicy = serializedObject.FindProperty("draggingPolicy");
17+
_dragBoxSize = serializedObject.FindProperty("draggingBoxSize");
1818
}
1919

2020
public override void OnInspectorGUI() {
2121
serializedObject.Update();
2222

2323
EditorGUILayout.Space();
24-
EditorGUILayout.PropertyField(m_BindRectToParent);
24+
EditorGUILayout.PropertyField(_bindRectToParent);
2525
EditorGUILayout.Separator();
26-
EditorGUILayout.PropertyField(m_DraggablePolicy);
26+
EditorGUILayout.PropertyField(_draggablePolicy);
2727

28-
if (m_DraggablePolicy.enumValueIndex != 0) {
29-
EditorGUILayout.PropertyField(m_DragBoxSize);
28+
if (_draggablePolicy.enumValueIndex != 0) {
29+
EditorGUILayout.PropertyField(_dragBoxSize);
3030
}
3131

3232
serializedObject.ApplyModifiedProperties();

OpenTibia/Assets/Materials/OutfitTypeMaterial.mat

Lines changed: 4 additions & 4 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, g: 1, b: 1, a: 1}
82+
- _DetailColor: {r: 0.42857143, g: 0.42857143, b: 0.42857143, a: 1}
8383
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
84-
- _HeadColor: {r: 0.14285715, g: 0.14285715, b: 0.14285715, a: 1}
84+
- _HeadColor: {r: 1, g: 0.6666667, b: 0, a: 1}
8585
- _HighlightColor: {r: 1, g: 0.88235295, b: 0.21568628, a: 1}
86-
- _LegsColor: {r: 0.14285715, g: 0.14285715, b: 0.14285715, a: 1}
87-
- _TorsoColor: {r: 0.14285715, g: 0.14285715, b: 0.14285715, 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}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ MonoBehaviour:
3939
m_Script: {fileID: 11500000, guid: 854737dacbb8c3e48bca3d23a035be57, type: 3}
4040
m_Name:
4141
m_EditorClassIdentifier:
42-
m_ItemImage: {fileID: 82320535}
43-
m_ItemText: {fileID: 596662722835986782}
44-
m_ShowAmount: 0
45-
m_ObjectAmount: 1
46-
m_ClothSlot: 0
42+
_itemImage: {fileID: 82320535}
43+
_itemText: {fileID: 596662722835986782}
44+
_showAmount: 0
45+
_objectAmount: 1
46+
_blothSlot: 1
4747
--- !u!114 &82320535
4848
MonoBehaviour:
4949
m_ObjectHideFlags: 0
@@ -252,7 +252,8 @@ PrefabInstance:
252252
type: 3}
253253
propertyPath: m_sharedMaterial
254254
value:
255-
objectReference: {fileID: 2100000, guid: f81d624ada977994599e52a93d874880, type: 2}
255+
objectReference: {fileID: 21963141150122312, guid: 09788a34279d69c4b801d0781c4b76db,
256+
type: 2}
256257
m_RemovedComponents: []
257258
m_SourcePrefab: {fileID: 100100000, guid: 54eba66ce4c99784c9bc8796c90e8b87, type: 3}
258259
--- !u!114 &596662722835986782 stripped

0 commit comments

Comments
 (0)