NeonTea/quakeball
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix text issues

Browse Source
This commit is contained in:
Jens Pitkänen 2020-08-07 05:39:10 +03:00
parent 98055d7711
commit 634ec2fe7c
5 changed files with 612 additions and 2276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2828
Assets/Fonts/SourceCodePro-Regular SDF.asset
View File

File diff suppressed because one or more lines are too long

2
Assets/Fonts/SourceCodePro-Regular SDF.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d203ccb39cd2eba42ab935f79171e4c7 guid: c780c2251e690fb498319dc38127843c
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0

2
Assets/Fonts/SourceCodePro-Regular.ttf.meta
View File

@ -15,7 +15,7 @@ TrueTypeFontImporter:
fontRenderingMode: 0 fontRenderingMode: 0
ascentCalculationMode: 1 ascentCalculationMode: 1
useLegacyBoundsCalculation: 0 useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1 shouldRoundAdvanceValue: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

14
Assets/Prefabs/UI/TerminalRoot.prefab
View File

@ -198,8 +198,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_fontAsset: {fileID: 11400000, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_sharedMaterial: {fileID: 3761255574237046509, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_sharedMaterial: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -661,7 +661,7 @@ MonoBehaviour:
m_CaretWidth: 1 m_CaretWidth: 1
m_ReadOnly: 0 m_ReadOnly: 0
m_RichText: 1 m_RichText: 1
m_GlobalFontAsset: {fileID: 11400000, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_GlobalFontAsset: {fileID: 11400000, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_OnFocusSelectAll: 1 m_OnFocusSelectAll: 1
m_ResetOnDeActivation: 1 m_ResetOnDeActivation: 1
m_RestoreOriginalTextOnEscape: 1 m_RestoreOriginalTextOnEscape: 1
@ -735,8 +735,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: "\u200B" m_text: "\u200B"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_fontAsset: {fileID: 11400000, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_sharedMaterial: {fileID: 3761255574237046509, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_sharedMaterial: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -906,8 +906,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_fontAsset: {fileID: 11400000, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_sharedMaterial: {fileID: 3761255574237046509, guid: d203ccb39cd2eba42ab935f79171e4c7, type: 2} m_sharedMaterial: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []

42
Assets/Scenes/TestScene.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_IndirectSpecularColor: {r: 0.17393494, g: 0.2174847, b: 0.299652, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -1499,7 +1499,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165724 m_Name: pb_Mesh16548
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -3223,7 +3223,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165602 m_Name: pb_Mesh16484
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -3923,7 +3923,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165832 m_Name: pb_Mesh16628
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -4592,7 +4592,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165378 m_Name: pb_Mesh16328
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -5977,7 +5977,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165802 m_Name: pb_Mesh16598
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -7921,7 +7921,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165944 m_Name: pb_Mesh16694
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -11379,7 +11379,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165308 m_Name: pb_Mesh16288
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -12885,7 +12885,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165704 m_Name: pb_Mesh16528
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -16649,7 +16649,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165354 m_Name: pb_Mesh16314
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -17103,7 +17103,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165762 m_Name: pb_Mesh16576
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -17571,7 +17571,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165874 m_Name: pb_Mesh16652
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -17827,7 +17827,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165886 m_Name: pb_Mesh16664
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -18165,7 +18165,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165282 m_Name: pb_Mesh16268
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -18329,7 +18329,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh165542 m_Name: pb_Mesh16434
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -18690,6 +18690,14 @@ PrefabInstance:
propertyPath: m_Color.a propertyPath: m_Color.a
value: 0.7294118 value: 0.7294118
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1980657648274802554, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
- target: {fileID: 2608858240125250513, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
- target: {fileID: 2654296452177192280, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - target: {fileID: 2654296452177192280, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3}
propertyPath: EventSystem propertyPath: EventSystem
value: value:
@ -18698,6 +18706,10 @@ PrefabInstance:
propertyPath: Player propertyPath: Player
value: value:
objectReference: {fileID: 876278657} objectReference: {fileID: 876278657}
- target: {fileID: 4807139487522286296, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 4067991147299334843, guid: c780c2251e690fb498319dc38127843c, type: 2}
- target: {fileID: 5023538681700148317, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3} - target: {fileID: 5023538681700148317, guid: 68b0b7d9f7cd54f4a9f3382b9452d809, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0 value: 0