Skip to content

Commit 459bcb1

Browse files
TuomasTuoniTuomasTuoni
committed
Adding names to the dialog system
1 parent 83bec4e commit 459bcb1

File tree

3 files changed

+287
-9
lines changed

3 files changed

+287
-9
lines changed

‎Assets/_CyberCombo/Prefabs/UI/TextBox_Player.prefab

+137-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RectTransform:
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
m_AnchorMin: {x: 0.5, y: 0}
3636
m_AnchorMax: {x: 0.5, y: 0}
37-
m_AnchoredPosition: {x: 49.65248, y: 37.700012}
38-
m_SizeDelta: {x: 320.3391, y: 137.13}
37+
m_AnchoredPosition: {x: 50, y: 35.399994}
38+
m_SizeDelta: {x: 320.3391, y: 88.877}
3939
m_Pivot: {x: 0.5, y: 0}
4040
--- !u!222 &770412159660477075
4141
CanvasRenderer:
@@ -515,6 +515,7 @@ RectTransform:
515515
- {fileID: 770412159660477085}
516516
- {fileID: 770412160943969139}
517517
- {fileID: 5842684658345916721}
518+
- {fileID: 8633706132310398699}
518519
m_Father: {fileID: 0}
519520
m_RootOrder: 0
520521
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -686,6 +687,140 @@ MonoBehaviour:
686687
m_EditorClassIdentifier:
687688
m_AspectMode: 2
688689
m_AspectRatio: 0.14285715
690+
--- !u!1 &2273595092083844880
691+
GameObject:
692+
m_ObjectHideFlags: 0
693+
m_CorrespondingSourceObject: {fileID: 0}
694+
m_PrefabInstance: {fileID: 0}
695+
m_PrefabAsset: {fileID: 0}
696+
serializedVersion: 6
697+
m_Component:
698+
- component: {fileID: 8633706132310398699}
699+
- component: {fileID: 1402058033824054019}
700+
- component: {fileID: 833454720980911984}
701+
m_Layer: 5
702+
m_Name: Text (TMP) (1)
703+
m_TagString: Untagged
704+
m_Icon: {fileID: 0}
705+
m_NavMeshLayer: 0
706+
m_StaticEditorFlags: 0
707+
m_IsActive: 1
708+
--- !u!224 &8633706132310398699
709+
RectTransform:
710+
m_ObjectHideFlags: 0
711+
m_CorrespondingSourceObject: {fileID: 0}
712+
m_PrefabInstance: {fileID: 0}
713+
m_PrefabAsset: {fileID: 0}
714+
m_GameObject: {fileID: 2273595092083844880}
715+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
716+
m_LocalPosition: {x: 0, y: 0, z: 0}
717+
m_LocalScale: {x: 1, y: 1, z: 1}
718+
m_Children: []
719+
m_Father: {fileID: 770412161451405728}
720+
m_RootOrder: 4
721+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
722+
m_AnchorMin: {x: 0.5, y: 0}
723+
m_AnchorMax: {x: 0.5, y: 0}
724+
m_AnchoredPosition: {x: 30.444, y: 118.30001}
725+
m_SizeDelta: {x: 281.9229, y: 46.098907}
726+
m_Pivot: {x: 0.5, y: -0.21913332}
727+
--- !u!222 &1402058033824054019
728+
CanvasRenderer:
729+
m_ObjectHideFlags: 0
730+
m_CorrespondingSourceObject: {fileID: 0}
731+
m_PrefabInstance: {fileID: 0}
732+
m_PrefabAsset: {fileID: 0}
733+
m_GameObject: {fileID: 2273595092083844880}
734+
m_CullTransparentMesh: 1
735+
--- !u!114 &833454720980911984
736+
MonoBehaviour:
737+
m_ObjectHideFlags: 0
738+
m_CorrespondingSourceObject: {fileID: 0}
739+
m_PrefabInstance: {fileID: 0}
740+
m_PrefabAsset: {fileID: 0}
741+
m_GameObject: {fileID: 2273595092083844880}
742+
m_Enabled: 1
743+
m_EditorHideFlags: 0
744+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
745+
m_Name:
746+
m_EditorClassIdentifier:
747+
m_Material: {fileID: 0}
748+
m_Color: {r: 1, g: 1, b: 1, a: 1}
749+
m_RaycastTarget: 1
750+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
751+
m_Maskable: 1
752+
m_OnCullStateChanged:
753+
m_PersistentCalls:
754+
m_Calls: []
755+
m_text: IT-Support Dude
756+
m_isRightToLeft: 0
757+
m_fontAsset: {fileID: 11400000, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
758+
m_sharedMaterial: {fileID: 8594683809881388219, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
759+
m_fontSharedMaterials: []
760+
m_fontMaterial: {fileID: 0}
761+
m_fontMaterials: []
762+
m_fontColor32:
763+
serializedVersion: 2
764+
rgba: 4294967295
765+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
766+
m_enableVertexGradient: 0
767+
m_colorMode: 3
768+
m_fontColorGradient:
769+
topLeft: {r: 1, g: 1, b: 1, a: 1}
770+
topRight: {r: 1, g: 1, b: 1, a: 1}
771+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
772+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
773+
m_fontColorGradientPreset: {fileID: 0}
774+
m_spriteAsset: {fileID: 0}
775+
m_tintAllSprites: 0
776+
m_StyleSheet: {fileID: 0}
777+
m_TextStyleHashCode: -1183493901
778+
m_overrideHtmlColors: 0
779+
m_faceColor:
780+
serializedVersion: 2
781+
rgba: 4294967295
782+
m_fontSize: 36
783+
m_fontSizeBase: 36
784+
m_fontWeight: 400
785+
m_enableAutoSizing: 0
786+
m_fontSizeMin: 18
787+
m_fontSizeMax: 72
788+
m_fontStyle: 0
789+
m_HorizontalAlignment: 1
790+
m_VerticalAlignment: 256
791+
m_textAlignment: 65535
792+
m_characterSpacing: 0
793+
m_wordSpacing: 0
794+
m_lineSpacing: 0
795+
m_lineSpacingMax: 0
796+
m_paragraphSpacing: 0
797+
m_charWidthMaxAdj: 0
798+
m_enableWordWrapping: 1
799+
m_wordWrappingRatios: 0.4
800+
m_overflowMode: 0
801+
m_linkedTextComponent: {fileID: 0}
802+
parentLinkedComponent: {fileID: 0}
803+
m_enableKerning: 1
804+
m_enableExtraPadding: 0
805+
checkPaddingRequired: 0
806+
m_isRichText: 1
807+
m_parseCtrlCharacters: 1
808+
m_isOrthographic: 1
809+
m_isCullingEnabled: 0
810+
m_horizontalMapping: 0
811+
m_verticalMapping: 0
812+
m_uvLineOffset: 0
813+
m_geometrySortingOrder: 0
814+
m_IsTextObjectScaleStatic: 0
815+
m_VertexBufferAutoSizeReduction: 0
816+
m_useMaxVisibleDescender: 1
817+
m_pageToDisplay: 1
818+
m_margin: {x: 0, y: 0, z: 0, w: 0}
819+
m_isUsingLegacyAnimationComponent: 0
820+
m_isVolumetricText: 0
821+
m_hasFontAssetChanged: 0
822+
m_baseMaterial: {fileID: 0}
823+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
689824
--- !u!1 &4554091956443844257
690825
GameObject:
691826
m_ObjectHideFlags: 0

‎Assets/_CyberCombo/Prefabs/UI/TextBox_Virus.prefab

+137-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RectTransform:
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
m_AnchorMin: {x: 0.5, y: 0}
3636
m_AnchorMax: {x: 0.5, y: 0}
37-
m_AnchoredPosition: {x: -74.5, y: 40.3}
38-
m_SizeDelta: {x: 320.3391, y: 137.13}
37+
m_AnchoredPosition: {x: -74.5, y: 37.99997}
38+
m_SizeDelta: {x: 320.3391, y: 86.277}
3939
m_Pivot: {x: 0.5, y: 0}
4040
--- !u!222 &770412159660477075
4141
CanvasRenderer:
@@ -515,6 +515,7 @@ RectTransform:
515515
- {fileID: 770412159660477085}
516516
- {fileID: 770412160943969139}
517517
- {fileID: 5842684658345916721}
518+
- {fileID: 2691300219417128720}
518519
m_Father: {fileID: 0}
519520
m_RootOrder: 0
520521
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -761,3 +762,137 @@ MonoBehaviour:
761762
m_FillOrigin: 0
762763
m_UseSpriteMesh: 0
763764
m_PixelsPerUnitMultiplier: 1
765+
--- !u!1 &7832918454838478979
766+
GameObject:
767+
m_ObjectHideFlags: 0
768+
m_CorrespondingSourceObject: {fileID: 0}
769+
m_PrefabInstance: {fileID: 0}
770+
m_PrefabAsset: {fileID: 0}
771+
serializedVersion: 6
772+
m_Component:
773+
- component: {fileID: 2691300219417128720}
774+
- component: {fileID: 1648048332106216113}
775+
- component: {fileID: 85734672915810658}
776+
m_Layer: 5
777+
m_Name: Text (TMP) (1)
778+
m_TagString: Untagged
779+
m_Icon: {fileID: 0}
780+
m_NavMeshLayer: 0
781+
m_StaticEditorFlags: 0
782+
m_IsActive: 1
783+
--- !u!224 &2691300219417128720
784+
RectTransform:
785+
m_ObjectHideFlags: 0
786+
m_CorrespondingSourceObject: {fileID: 0}
787+
m_PrefabInstance: {fileID: 0}
788+
m_PrefabAsset: {fileID: 0}
789+
m_GameObject: {fileID: 7832918454838478979}
790+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
791+
m_LocalPosition: {x: 0, y: 0, z: 0}
792+
m_LocalScale: {x: 1, y: 1, z: 1}
793+
m_Children: []
794+
m_Father: {fileID: 770412161451405728}
795+
m_RootOrder: 4
796+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
797+
m_AnchorMin: {x: 0.5, y: 0}
798+
m_AnchorMax: {x: 0.5, y: 0}
799+
m_AnchoredPosition: {x: -94, y: 118.30001}
800+
m_SizeDelta: {x: 281.9229, y: 46.098907}
801+
m_Pivot: {x: 0.5, y: -0.21913332}
802+
--- !u!222 &1648048332106216113
803+
CanvasRenderer:
804+
m_ObjectHideFlags: 0
805+
m_CorrespondingSourceObject: {fileID: 0}
806+
m_PrefabInstance: {fileID: 0}
807+
m_PrefabAsset: {fileID: 0}
808+
m_GameObject: {fileID: 7832918454838478979}
809+
m_CullTransparentMesh: 1
810+
--- !u!114 &85734672915810658
811+
MonoBehaviour:
812+
m_ObjectHideFlags: 0
813+
m_CorrespondingSourceObject: {fileID: 0}
814+
m_PrefabInstance: {fileID: 0}
815+
m_PrefabAsset: {fileID: 0}
816+
m_GameObject: {fileID: 7832918454838478979}
817+
m_Enabled: 1
818+
m_EditorHideFlags: 0
819+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
820+
m_Name:
821+
m_EditorClassIdentifier:
822+
m_Material: {fileID: 0}
823+
m_Color: {r: 1, g: 1, b: 1, a: 1}
824+
m_RaycastTarget: 1
825+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
826+
m_Maskable: 1
827+
m_OnCullStateChanged:
828+
m_PersistentCalls:
829+
m_Calls: []
830+
m_text: Mr. Mal Ware
831+
m_isRightToLeft: 0
832+
m_fontAsset: {fileID: 11400000, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
833+
m_sharedMaterial: {fileID: 8594683809881388219, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
834+
m_fontSharedMaterials: []
835+
m_fontMaterial: {fileID: 0}
836+
m_fontMaterials: []
837+
m_fontColor32:
838+
serializedVersion: 2
839+
rgba: 4294967295
840+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
841+
m_enableVertexGradient: 0
842+
m_colorMode: 3
843+
m_fontColorGradient:
844+
topLeft: {r: 1, g: 1, b: 1, a: 1}
845+
topRight: {r: 1, g: 1, b: 1, a: 1}
846+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
847+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
848+
m_fontColorGradientPreset: {fileID: 0}
849+
m_spriteAsset: {fileID: 0}
850+
m_tintAllSprites: 0
851+
m_StyleSheet: {fileID: 0}
852+
m_TextStyleHashCode: -1183493901
853+
m_overrideHtmlColors: 0
854+
m_faceColor:
855+
serializedVersion: 2
856+
rgba: 4294967295
857+
m_fontSize: 36
858+
m_fontSizeBase: 36
859+
m_fontWeight: 400
860+
m_enableAutoSizing: 0
861+
m_fontSizeMin: 18
862+
m_fontSizeMax: 72
863+
m_fontStyle: 0
864+
m_HorizontalAlignment: 1
865+
m_VerticalAlignment: 256
866+
m_textAlignment: 65535
867+
m_characterSpacing: 0
868+
m_wordSpacing: 0
869+
m_lineSpacing: 0
870+
m_lineSpacingMax: 0
871+
m_paragraphSpacing: 0
872+
m_charWidthMaxAdj: 0
873+
m_enableWordWrapping: 1
874+
m_wordWrappingRatios: 0.4
875+
m_overflowMode: 0
876+
m_linkedTextComponent: {fileID: 0}
877+
parentLinkedComponent: {fileID: 0}
878+
m_enableKerning: 1
879+
m_enableExtraPadding: 0
880+
checkPaddingRequired: 0
881+
m_isRichText: 1
882+
m_parseCtrlCharacters: 1
883+
m_isOrthographic: 1
884+
m_isCullingEnabled: 0
885+
m_horizontalMapping: 0
886+
m_verticalMapping: 0
887+
m_uvLineOffset: 0
888+
m_geometrySortingOrder: 0
889+
m_IsTextObjectScaleStatic: 0
890+
m_VertexBufferAutoSizeReduction: 0
891+
m_useMaxVisibleDescender: 1
892+
m_pageToDisplay: 1
893+
m_margin: {x: 0, y: 0, z: 0, w: 0}
894+
m_isUsingLegacyAnimationComponent: 0
895+
m_isVolumetricText: 0
896+
m_hasFontAssetChanged: 0
897+
m_baseMaterial: {fileID: 0}
898+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

‎Assets/_CyberCombo/Scenes/Level 0.unity

+13-5
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ PrefabInstance:
137137
m_Modifications:
138138
- target: {fileID: 770412159660477084, guid: 818e10c4913af3249ae8199477bc0bae, type: 3}
139139
propertyPath: m_text
140-
value: "Silence you mortal technician! Play against me and we\u2019ll see how
141-
you will cry on your failure and precious chips."
140+
value: "Silence you mortal technician! \n\n\nPlay against me and we\u2019ll
141+
see how you will cry on your failure and precious chips."
142142
objectReference: {fileID: 0}
143143
- target: {fileID: 770412159752783389, guid: 818e10c4913af3249ae8199477bc0bae, type: 3}
144144
propertyPath: m_AnchorMax.y
@@ -1499,9 +1499,17 @@ PrefabInstance:
14991499
m_Modifications:
15001500
- target: {fileID: 770412159660477084, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
15011501
propertyPath: m_text
1502-
value: "Let's check today's work order. Connection is slow and unstable and
1503-
everytime I try blah blah blah\u2026 Boooring. Let me just connect to the
1504-
system and check what is causing these problems."
1502+
value: "Let's check today's work order. \n\nConnection is slow and unstable
1503+
and everytime I try blah blah blah\u2026 Boooring. \n\nLet me just connect
1504+
to the system and check what is causing these problems."
1505+
objectReference: {fileID: 0}
1506+
- target: {fileID: 770412159660477085, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
1507+
propertyPath: m_SizeDelta.y
1508+
value: 94.8359
1509+
objectReference: {fileID: 0}
1510+
- target: {fileID: 770412159660477085, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
1511+
propertyPath: m_AnchoredPosition.y
1512+
value: 29.441101
15051513
objectReference: {fileID: 0}
15061514
- target: {fileID: 770412159752783389, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
15071515
propertyPath: m_AnchorMax.y

0 commit comments

Comments
 (0)