Skip to content

Commit 6693c2d

Browse files
committed
Missing entries for prefabs.
- Assigning missing entries for several prefabs that gone missing for some reason - Fixing invalid constructors and some strange names due to the auto-refactoring. - Fixed Protobuf appearances which shouldn't have been affected by this refactoring at all.
1 parent e0dd651 commit 6693c2d

92 files changed

Lines changed: 6537 additions & 1286 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.

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# do not install anything extra onto the image
2+
language: generic
3+
4+
# use a Mac OSX image
5+
os: osx
6+
7+
# run the script to download and install Unity editor
8+
install:
9+
- sudo -E sh ./scripts/install.sh
10+
11+
# run the script for unit tests and builds
12+
script:
13+
- sudo -E sh ./scripts/build.sh
14+
15+
env:
16+
global:
17+
- UNITYCI_PROJECT_NAME="OpenTibia"

CACerts.pem

Lines changed: 4925 additions & 0 deletions
Large diffs are not rendered by default.
File renamed without changes.

OpenTibia/Assets/Prefabs/UI/Checkboxes/Checkbox.prefab

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,20 @@ MonoBehaviour:
7070
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
7171
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
7272
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
73+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
7374
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
7475
m_ColorMultiplier: 1
7576
m_FadeDuration: 0.1
7677
m_SpriteState:
7778
m_HighlightedSprite: {fileID: 0}
7879
m_PressedSprite: {fileID: 0}
80+
m_SelectedSprite: {fileID: 0}
7981
m_DisabledSprite: {fileID: 0}
8082
m_AnimationTriggers:
8183
m_NormalTrigger: Normal
8284
m_HighlightedTrigger: Highlighted
8385
m_PressedTrigger: Pressed
86+
m_SelectedTrigger: Highlighted
8487
m_DisabledTrigger: Disabled
8588
m_Interactable: 1
8689
m_TargetGraphic: {fileID: 2833283979256161998}
@@ -134,6 +137,6 @@ MonoBehaviour:
134137
m_Script: {fileID: 11500000, guid: 6219a11fdff902240a2713d32eae5138, type: 3}
135138
m_Name:
136139
m_EditorClassIdentifier:
137-
m_OnSprite: {fileID: 21300000, guid: 42e1ca54e96a62145a7cb9175af7531a, type: 3}
138-
m_OffSprite: {fileID: 21300000, guid: 1c9627ed564608f489eef0392a8d017f, type: 3}
139-
m_DisabledOnSprite: {fileID: 21300000, guid: ee4923b2f4ffd324aaf702cb69145f3a, type: 3}
140+
_onSprite: {fileID: 21300000, guid: 42e1ca54e96a62145a7cb9175af7531a, type: 3}
141+
_offSprite: {fileID: 21300000, guid: 1c9627ed564608f489eef0392a8d017f, type: 3}
142+
_disabledOnSprite: {fileID: 21300000, guid: ee4923b2f4ffd324aaf702cb69145f3a, type: 3}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MonoBehaviour:
3232
m_Script: {fileID: 11500000, guid: 09ec603c990e318488ea56c7c091bf8b, type: 3}
3333
m_Name:
3434
m_EditorClassIdentifier:
35-
m_ChannelNameLabel: {fileID: 3343621506608058245}
35+
_channelNameLabel: {fileID: 3343621506608058245}
3636
--- !u!114 &8719823734738887578
3737
MonoBehaviour:
3838
m_ObjectHideFlags: 0
@@ -58,7 +58,7 @@ PrefabInstance:
5858
- target: {fileID: 1225904021088943946, guid: 6ad8373a7bca5c64a89914afd4a53d70,
5959
type: 3}
6060
propertyPath: m_Name
61-
value: ChannelButton
61+
value: ChannelTab
6262
objectReference: {fileID: 0}
6363
- target: {fileID: 4837015657985786659, guid: 6ad8373a7bca5c64a89914afd4a53d70,
6464
type: 3}

0 commit comments

Comments
 (0)