Skip to content

Commit

Permalink
Adding names to the dialog system
Browse files Browse the repository at this point in the history
  • Loading branch information
TuomasTuoni committed Mar 9, 2022
1 parent 83bec4e commit 459bcb1
Show file tree
Hide file tree
Showing 3 changed files with 287 additions and 9 deletions.
139 changes: 137 additions & 2 deletions Assets/_CyberCombo/Prefabs/UI/TextBox_Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 49.65248, y: 37.700012}
m_SizeDelta: {x: 320.3391, y: 137.13}
m_AnchoredPosition: {x: 50, y: 35.399994}
m_SizeDelta: {x: 320.3391, y: 88.877}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &770412159660477075
CanvasRenderer:
Expand Down Expand Up @@ -515,6 +515,7 @@ RectTransform:
- {fileID: 770412159660477085}
- {fileID: 770412160943969139}
- {fileID: 5842684658345916721}
- {fileID: 8633706132310398699}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -686,6 +687,140 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_AspectMode: 2
m_AspectRatio: 0.14285715
--- !u!1 &2273595092083844880
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8633706132310398699}
- component: {fileID: 1402058033824054019}
- component: {fileID: 833454720980911984}
m_Layer: 5
m_Name: Text (TMP) (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8633706132310398699
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273595092083844880}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 770412161451405728}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 30.444, y: 118.30001}
m_SizeDelta: {x: 281.9229, y: 46.098907}
m_Pivot: {x: 0.5, y: -0.21913332}
--- !u!222 &1402058033824054019
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273595092083844880}
m_CullTransparentMesh: 1
--- !u!114 &833454720980911984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273595092083844880}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: IT-Support Dude
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
m_sharedMaterial: {fileID: 8594683809881388219, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4554091956443844257
GameObject:
m_ObjectHideFlags: 0
Expand Down
139 changes: 137 additions & 2 deletions Assets/_CyberCombo/Prefabs/UI/TextBox_Virus.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -74.5, y: 40.3}
m_SizeDelta: {x: 320.3391, y: 137.13}
m_AnchoredPosition: {x: -74.5, y: 37.99997}
m_SizeDelta: {x: 320.3391, y: 86.277}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &770412159660477075
CanvasRenderer:
Expand Down Expand Up @@ -515,6 +515,7 @@ RectTransform:
- {fileID: 770412159660477085}
- {fileID: 770412160943969139}
- {fileID: 5842684658345916721}
- {fileID: 2691300219417128720}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -761,3 +762,137 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7832918454838478979
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2691300219417128720}
- component: {fileID: 1648048332106216113}
- component: {fileID: 85734672915810658}
m_Layer: 5
m_Name: Text (TMP) (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2691300219417128720
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7832918454838478979}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 770412161451405728}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -94, y: 118.30001}
m_SizeDelta: {x: 281.9229, y: 46.098907}
m_Pivot: {x: 0.5, y: -0.21913332}
--- !u!222 &1648048332106216113
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7832918454838478979}
m_CullTransparentMesh: 1
--- !u!114 &85734672915810658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7832918454838478979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Mr. Mal Ware
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
m_sharedMaterial: {fileID: 8594683809881388219, guid: f60c314b2d7494c4c84544d32e6391fc, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
18 changes: 13 additions & 5 deletions Assets/_CyberCombo/Scenes/Level 0.unity
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 770412159660477084, guid: 818e10c4913af3249ae8199477bc0bae, type: 3}
propertyPath: m_text
value: "Silence you mortal technician! Play against me and we\u2019ll see how
you will cry on your failure and precious chips."
value: "Silence you mortal technician! \n\n\nPlay against me and we\u2019ll
see how you will cry on your failure and precious chips."
objectReference: {fileID: 0}
- target: {fileID: 770412159752783389, guid: 818e10c4913af3249ae8199477bc0bae, type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -1499,9 +1499,17 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 770412159660477084, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
propertyPath: m_text
value: "Let's check today's work order. Connection is slow and unstable and
everytime I try blah blah blah\u2026 Boooring. Let me just connect to the
system and check what is causing these problems."
value: "Let's check today's work order. \n\nConnection is slow and unstable
and everytime I try blah blah blah\u2026 Boooring. \n\nLet me just connect
to the system and check what is causing these problems."
objectReference: {fileID: 0}
- target: {fileID: 770412159660477085, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
propertyPath: m_SizeDelta.y
value: 94.8359
objectReference: {fileID: 0}
- target: {fileID: 770412159660477085, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 29.441101
objectReference: {fileID: 0}
- target: {fileID: 770412159752783389, guid: 4b83e2f7a39f9194eb78e3ce648385c2, type: 3}
propertyPath: m_AnchorMax.y
Expand Down

0 comments on commit 459bcb1

Please sign in to comment.