diff --git a/Unity Project/IC Viewer/Assets/Scripts/Body.cs b/Unity Project/IC Viewer/Assets/Scripts/Body.cs index cd20347..86ef597 100644 --- a/Unity Project/IC Viewer/Assets/Scripts/Body.cs +++ b/Unity Project/IC Viewer/Assets/Scripts/Body.cs @@ -171,8 +171,12 @@ private void Update() } nameText.color = c; - planeRay.GetComponent().color = c2; - planeShadow.GetComponent().color = c2; + + if (dplane < EditorManager.minFadeDistanceStart || dplane < EditorManager.maxFadeDistanceStart) + { + planeRay.GetComponent().color = c2; + planeShadow.GetComponent().color = c2; + } } diff --git a/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs b/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs new file mode 100644 index 0000000..3c1e033 --- /dev/null +++ b/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BodyFinder : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs.meta b/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs.meta new file mode 100644 index 0000000..b80a324 --- /dev/null +++ b/Unity Project/IC Viewer/Assets/Scripts/BodyFinder.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 3526f7ac4eb7a26489dd92571b7284d0 +timeCreated: 1534112674 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/IC Viewer/Assets/Plugins/Editor.meta b/Unity Project/IC Viewer/Assets/UI/Button.meta similarity index 70% rename from Unity Project/IC Viewer/Assets/Plugins/Editor.meta rename to Unity Project/IC Viewer/Assets/UI/Button.meta index da83db8..97de769 100644 --- a/Unity Project/IC Viewer/Assets/Plugins/Editor.meta +++ b/Unity Project/IC Viewer/Assets/UI/Button.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 5eb3edb00542a436ebb911b052bace70 +guid: 53db59d98a048fb4196f825fd867013e folderAsset: yes -timeCreated: 1533957759 +timeCreated: 1534114546 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png b/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png new file mode 100644 index 0000000..989aaac Binary files /dev/null and b/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png differ diff --git a/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png.meta b/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png.meta new file mode 100644 index 0000000..1394d22 --- /dev/null +++ b/Unity Project/IC Viewer/Assets/UI/InputField/InputField_BackGround.png.meta @@ -0,0 +1,87 @@ +fileFormatVersion: 2 +guid: aa6750843fb9ad244808a03224170fb6 +timeCreated: 1534113946 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab b/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab index 78732ac..21076c8 100644 --- a/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab +++ b/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab @@ -9,18 +9,18 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1927008802539538} + m_RootGameObject: {fileID: 1920039966116290} m_IsPrefabParent: 1 ---- !u!1 &1343338544577932 +--- !u!1 &1590069649808898 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224668568044016310} - - component: {fileID: 222360829103182242} - - component: {fileID: 114098002277639152} + - component: {fileID: 224786215892134154} + - component: {fileID: 222698136409646296} + - component: {fileID: 114482453281405024} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -28,16 +28,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1501653526828654 +--- !u!1 &1641666702425716 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224586878391282662} - - component: {fileID: 222834247158594410} - - component: {fileID: 114220565553232270} + - component: {fileID: 224832160063730842} + - component: {fileID: 222563724307069530} + - component: {fileID: 114464797555682682} m_Layer: 5 m_Name: Placeholder m_TagString: Untagged @@ -45,17 +45,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1927008802539538 +--- !u!1 &1661532710775194 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224388576699537526} - - component: {fileID: 222302592547060656} - - component: {fileID: 114290588334527650} - - component: {fileID: 114844082239794116} + - component: {fileID: 224685239515194628} + - component: {fileID: 114410522868077342} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1920039966116290 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224124627994300998} + - component: {fileID: 222484190487235404} + - component: {fileID: 114591014891960622} + - component: {fileID: 114646991150860552} m_Layer: 5 m_Name: Template InputField m_TagString: Untagged @@ -63,15 +79,26 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &114098002277639152 +--- !u!114 &114410522868077342 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1661532710775194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114464797555682682 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1343338544577932} + m_GameObject: {fileID: 1641666702425716} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -82,89 +109,249 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!114 &114220565553232270 + m_text: TEMPLATE PLACEHOLDER + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2133996082 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_enableVertexGradient: 0 + 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_textAlignment: 257 + m_isAlignmentEnumConverted: 1 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 114464797555682682} + characterCount: 20 + spriteCount: 0 + spaceCount: 1 + wordCount: 2 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 0 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 0 + m_inputSource: 0 + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &114482453281405024 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1501653526828654} + m_GameObject: {fileID: 1590069649808898} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: This is a template text ---- !u!114 &114290588334527650 + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 715b80e429c437e40867928a4e1fc975, 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_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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + m_textAlignment: 257 + m_isAlignmentEnumConverted: 1 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 1 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 114482453281405024} + characterCount: 1 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_havePropertiesChanged: 0 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_isInputParsingRequired: 0 + m_inputSource: 0 + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &114591014891960622 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1927008802539538} + m_GameObject: {fileID: 1920039966116290} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.34509805, g: 0.34117648, b: 0.33333334, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: aa6750843fb9ad244808a03224170fb6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114844082239794116 +--- !u!114 &114646991150860552 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1927008802539538} + m_GameObject: {fileID: 1920039966116290} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -1620774994, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -191,9 +378,13 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 114290588334527650} - m_TextComponent: {fileID: 114098002277639152} - m_Placeholder: {fileID: 114220565553232270} + m_TargetGraphic: {fileID: 114591014891960622} + m_TextViewport: {fileID: 224685239515194628} + m_TextComponent: {fileID: 114482453281405024} + m_Placeholder: {fileID: 114464797555682682} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_ScrollSensitivity: 1 m_ContentType: 0 m_InputType: 0 m_AsteriskChar: 42 @@ -201,16 +392,43 @@ MonoBehaviour: m_LineType: 0 m_HideMobileInput: 0 m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, + m_TypeName: TMPro.TMP_InputField+SubmitEvent, TextMeshPro-2017.3-Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TMPro.TMP_InputField+SubmitEvent, TextMeshPro-2017.3-Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TMPro.TMP_InputField+SelectionEvent, TextMeshPro-2017.3-Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TMPro.TMP_InputField+SelectionEvent, TextMeshPro-2017.3-Runtime, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TMPro.TMP_InputField+TextSelectionEvent, TextMeshPro-2017.3-Runtime, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_TypeName: TMPro.TMP_InputField+TextSelectionEvent, TextMeshPro-2017.3-Runtime, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, + m_TypeName: TMPro.TMP_InputField+OnChangeEvent, TextMeshPro-2017.3-Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 @@ -219,55 +437,63 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 ---- !u!222 &222302592547060656 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 715b80e429c437e40867928a4e1fc975, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 1 + m_InputValidator: {fileID: 0} +--- !u!222 &222484190487235404 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1927008802539538} ---- !u!222 &222360829103182242 + m_GameObject: {fileID: 1920039966116290} +--- !u!222 &222563724307069530 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1343338544577932} ---- !u!222 &222834247158594410 + m_GameObject: {fileID: 1641666702425716} +--- !u!222 &222698136409646296 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1501653526828654} ---- !u!224 &224388576699537526 + m_GameObject: {fileID: 1590069649808898} +--- !u!224 &224124627994300998 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1927008802539538} + m_GameObject: {fileID: 1920039966116290} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224586878391282662} - - {fileID: 224668568044016310} + - {fileID: 224685239515194628} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 110.1, y: 90.9} - m_SizeDelta: {x: 200, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 117.079056, y: -240.6} + m_SizeDelta: {x: 214.44, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224586878391282662 +--- !u!224 &224685239515194628 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1501653526828654} + m_GameObject: {fileID: 1661532710775194} 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: 224388576699537526} + m_Children: + - {fileID: 224832160063730842} + - {fileID: 224786215892134154} + m_Father: {fileID: 224124627994300998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -275,21 +501,39 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224668568044016310 +--- !u!224 &224786215892134154 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1343338544577932} + m_GameObject: {fileID: 1590069649808898} 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: 224388576699537526} + m_Father: {fileID: 224685239515194628} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224832160063730842 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1641666702425716} + 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: 224685239515194628} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab.meta b/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab.meta index 766962f..4fa32e5 100644 --- a/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab.meta +++ b/Unity Project/IC Viewer/Assets/UI/InputField/Template InputField.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 83cd8fd9d334f9d4da4d92e38344d0b8 -timeCreated: 1534097204 +timeCreated: 1534114524 licenseType: Free NativeFormatImporter: externalObjects: {} diff --git a/Unity Project/IC Viewer/Assets/UI/TextBox.meta b/Unity Project/IC Viewer/Assets/UI/TextBox.meta new file mode 100644 index 0000000..89ed240 --- /dev/null +++ b/Unity Project/IC Viewer/Assets/UI/TextBox.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c2040c5e665184141b87454be677a61f +folderAsset: yes +timeCreated: 1534113915 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: