Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug Fix: Renaming connection methods in main menu #382

Merged
merged 3 commits into from
Oct 19, 2021
Merged

Bug Fix: Renaming connection methods in main menu #382

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
863308f
bug fix - changed main menu labels for connection types "RELAY" and "…
jilfranco-unity Oct 19, 2021
daee66f
whoops corrected "PHOTON" to "PHOTON RELAY"
jilfranco-unity Oct 19, 2021
8a4aa6f
made connection buttons wider and labels bigger!
jilfranco-unity Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 28 additions & 36 deletions Assets/BossRoom/Prefabs/UI/PopupPanel.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 70
m_fontSize: 56.15
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -2664,7 +2664,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 66.3
m_fontSize: 48.6
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -2715,15 +2715,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1982309448160183326, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
propertyPath: m_text
value: RELAY
objectReference: {fileID: 0}
- target: {fileID: 1982309448160183326, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
propertyPath: m_fontSize
value: 24
value: PHOTON RELAY
objectReference: {fileID: 0}
- target: {fileID: 1982309448160183326, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
propertyPath: m_fontSizeBase
value: 24
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4518466638098578806, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
propertyPath: m_AnchoredPosition.y
Expand Down Expand Up @@ -2831,33 +2827,33 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
--- !u!224 &6062741040261899507 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6512949122037871174, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_PrefabInstance: {fileID: 1027254346191754933}
m_PrefabAsset: {fileID: 0}
--- !u!114 &702700327215588270 stripped
--- !u!114 &5079393848174053012 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 540982105790756123, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_CorrespondingSourceObject: {fileID: 5205083276666228769, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_PrefabInstance: {fileID: 1027254346191754933}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5079393848174053012 stripped
--- !u!114 &702700327215588270 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5205083276666228769, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_CorrespondingSourceObject: {fileID: 540982105790756123, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_PrefabInstance: {fileID: 1027254346191754933}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6062741040261899507 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6512949122037871174, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
m_PrefabInstance: {fileID: 1027254346191754933}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2289874713279297078 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1262923837617807491, guid: 1229ed617a5124549b46c08c004b7d6b, type: 3}
Expand Down Expand Up @@ -2966,15 +2962,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3659563950709367200, guid: 661bcdeefbb3aef4cbaaefbf213c6310, type: 3}
propertyPath: m_text
value: U-RELAY
objectReference: {fileID: 0}
- target: {fileID: 3659563950709367200, guid: 661bcdeefbb3aef4cbaaefbf213c6310, type: 3}
propertyPath: m_fontSize
value: 24
value: UNITY RELAY
objectReference: {fileID: 0}
- target: {fileID: 3659563950709367200, guid: 661bcdeefbb3aef4cbaaefbf213c6310, type: 3}
propertyPath: m_fontSizeBase
value: 24
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4092997452673795389, guid: 661bcdeefbb3aef4cbaaefbf213c6310, type: 3}
propertyPath: m_Group
Expand Down Expand Up @@ -3178,17 +3170,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c3f6a30a7d785ef41a47b0cfd0c8b26d, type: 3}
--- !u!114 &8470479361425810124 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6243239769371671751, guid: c3f6a30a7d785ef41a47b0cfd0c8b26d, type: 3}
m_PrefabInstance: {fileID: 2533628164130561547}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &3521129445966426109 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1438005041722192374, guid: c3f6a30a7d785ef41a47b0cfd0c8b26d, type: 3}
Expand All @@ -3205,3 +3186,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 55aeec10c1bda27448c176abb6615c0f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8470479361425810124 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6243239769371671751, guid: c3f6a30a7d785ef41a47b0cfd0c8b26d, type: 3}
m_PrefabInstance: {fileID: 2533628164130561547}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier: