From 54bb83aff3cdb028490df46cf1a6f6504ab2d034 Mon Sep 17 00:00:00 2001 From: Deive_Ex Date: Wed, 19 Feb 2020 17:31:48 -0300 Subject: [PATCH 1/2] Support for UGUI All commands now work for TextMeshProUGU texts as well. --- .gitignore | 6 +- Assets/CharTween.meta | 2 - .../CharTween Example Full UGUI.unity | 541 ++++++++++++++++++ .../CharTween Example Full UGUI.unity.meta | 7 + .../Examples/CharTween Example Full.unity | 308 +++++----- .../Examples/CharTween Example Simple.unity | 121 ++-- .../Examples/CharTweenExampleFull.cs | 18 +- .../Scripts/CharTweener.Properties.cs | 2 +- .../CharTween/Scripts/CharTweener.Tweens.cs | 18 +- Assets/CharTween/Scripts/CharTweener.cs | 12 +- .../CharTween/Scripts/VertexGradientPlugin.cs | 5 + Logs/Packages-Update.log | 43 ++ Packages/manifest.json | 40 ++ ProjectSettings/PresetManager.asset | Bin 0 -> 4104 bytes ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | Bin 0 -> 4148 bytes UnityPackageManager/manifest.json | 4 - 17 files changed, 906 insertions(+), 223 deletions(-) create mode 100644 Assets/CharTween/Examples/CharTween Example Full UGUI.unity create mode 100644 Assets/CharTween/Examples/CharTween Example Full UGUI.unity.meta create mode 100644 Logs/Packages-Update.log create mode 100644 Packages/manifest.json create mode 100644 ProjectSettings/PresetManager.asset create mode 100644 ProjectSettings/VFXManager.asset delete mode 100644 UnityPackageManager/manifest.json diff --git a/.gitignore b/.gitignore index 32caeb6..048bc73 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,10 @@ /Assets/Demigiant.meta /Assets/TextMesh Pro/ /Assets/TextMesh Pro.meta +/Assets/DOTween +/Assets/DOTween.meta +/Assets/Resources +/Assets/Resources.meta # Visual Studio 2015 cache directory /.vs/ @@ -37,4 +41,4 @@ sysinfo.txt # Builds *.apk -*.unitypackage +*.unitypackage \ No newline at end of file diff --git a/Assets/CharTween.meta b/Assets/CharTween.meta index b569bc1..563e620 100644 --- a/Assets/CharTween.meta +++ b/Assets/CharTween.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 guid: 4c564779c1d8fa04a9229db640acb908 folderAsset: yes -timeCreated: 1525912432 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/CharTween/Examples/CharTween Example Full UGUI.unity b/Assets/CharTween/Examples/CharTween Example Full UGUI.unity new file mode 100644 index 0000000..d9f6980 --- /dev/null +++ b/Assets/CharTween/Examples/CharTween Example Full UGUI.unity @@ -0,0 +1,541 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &396927152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 396927155} + - component: {fileID: 396927154} + - component: {fileID: 396927153} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &396927153 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396927152} + m_Enabled: 1 +--- !u!20 &396927154 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396927152} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &396927155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 396927152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &783068792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 783068795} + - component: {fileID: 783068794} + - component: {fileID: 783068793} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &783068793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783068792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &783068794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783068792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &783068795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 783068792} + 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: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1727821165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1727821166} + - component: {fileID: 1727821169} + - component: {fileID: 1727821168} + - component: {fileID: 1727821167} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1727821166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727821165} + 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: 2080456737} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1225, y: 680.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1727821167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727821165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dae0cbb4a87099b45963dbfe1bcc3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + Target: {fileID: 1727821168} + radius: 25 + strenght: 2.5 + vibrato: 50 + randomness: 90 + height: 50 +--- !u!114 &1727821168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727821165} + 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_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'DETERMINATION + + DETERMINATION + + DETERMINATION + + DETERMINATION' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 100 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_textAlignment: 514 + 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_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + 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_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1727821168} + characterCount: 55 + spriteCount: 0 + spaceCount: 3 + wordCount: 4 + linkCount: 0 + lineCount: 4 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 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!222 &1727821169 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727821165} + m_CullTransparentMesh: 0 +--- !u!1 &2080456733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2080456737} + - component: {fileID: 2080456736} + - component: {fileID: 2080456735} + - component: {fileID: 2080456734} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2080456734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080456733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2080456735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080456733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &2080456736 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080456733} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2080456737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2080456733} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1727821166} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} diff --git a/Assets/CharTween/Examples/CharTween Example Full UGUI.unity.meta b/Assets/CharTween/Examples/CharTween Example Full UGUI.unity.meta new file mode 100644 index 0000000..25eb462 --- /dev/null +++ b/Assets/CharTween/Examples/CharTween Example Full UGUI.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 67cd4fce157cf0a4787ceac55a92a605 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CharTween/Examples/CharTween Example Full.unity b/Assets/CharTween/Examples/CharTween Example Full.unity index 8494c60..99b8431 100644 --- a/Assets/CharTween/Examples/CharTween Example Full.unity +++ b/Assets/CharTween/Examples/CharTween Example Full.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -113,35 +112,128 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1075228581 +--- !u!1 &1153254298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153254302} + - component: {fileID: 1153254301} + - component: {fileID: 1153254300} + - component: {fileID: 1153254299} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1153254299 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153254298} + m_Enabled: 1 +--- !u!124 &1153254300 +Behaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153254298} + m_Enabled: 1 +--- !u!20 &1153254301 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153254298} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.6353806, g: 0.7275885, b: 0.8308824, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 55 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1153254302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153254298} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1851160640 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - component: {fileID: 1075228586} - - component: {fileID: 1075228585} - - component: {fileID: 1075228587} - - component: {fileID: 1075228584} - - component: {fileID: 1075228583} - - component: {fileID: 1075228582} + - component: {fileID: 1851160645} + - component: {fileID: 1851160644} + - component: {fileID: 1851160643} + - component: {fileID: 1851160642} + - component: {fileID: 1851160641} + - component: {fileID: 1851160646} m_Layer: 0 - m_Name: TextMeshPro + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1075228582 +--- !u!114 &1851160641 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -806885394, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -150,8 +242,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: 'DETERMINATION DETERMINATION @@ -160,9 +250,8 @@ MonoBehaviour: DETERMINATION' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 843cb3f7719b79841b8864436d4b7a4c, type: 2} - m_sharedMaterial: {fileID: 21218518644432016, guid: 843cb3f7719b79841b8864436d4b7a4c, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -171,6 +260,7 @@ MonoBehaviour: 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} @@ -186,15 +276,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 15 + m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_fontSizeMin: 10 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 - m_isAlignmentEnumConverted: 1 + m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -204,9 +293,10 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 42 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -220,12 +310,13 @@ MonoBehaviour: m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: - textComponent: {fileID: 1075228582} + textComponent: {fileID: 1851160641} characterCount: 55 spriteCount: 0 spaceCount: 3 @@ -234,14 +325,11 @@ MonoBehaviour: lineCount: 4 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_renderer: {fileID: 1075228583} + m_renderer: {fileID: 1851160643} m_subTextObjects: - {fileID: 0} - {fileID: 0} @@ -252,12 +340,21 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} m_maskType: 0 ---- !u!23 &1075228583 +--- !u!222 &1851160642 +CanvasRenderer: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} + m_CullTransparentMesh: 0 +--- !u!23 &1851160643 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -265,8 +362,10 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - - {fileID: 21218518644432016, guid: 843cb3f7719b79841b8864436d4b7a4c, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -286,25 +385,21 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!222 &1075228584 -CanvasRenderer: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} ---- !u!33 &1075228585 +--- !u!33 &1851160644 MeshFilter: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} m_Mesh: {fileID: 0} ---- !u!224 &1075228586 +--- !u!224 &1851160645 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} 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} @@ -314,99 +409,24 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.032000005, y: 0.018} - m_SizeDelta: {x: 12.843, y: 9.583} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 13.261, y: 6.213} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1075228587 +--- !u!114 &1851160646 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1075228581} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851160640} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dae0cbb4a87099b45963dbfe1bcc3cc3, type: 3} m_Name: m_EditorClassIdentifier: - Target: {fileID: 1075228582} ---- !u!1 &1153254298 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1153254302} - - component: {fileID: 1153254301} - - component: {fileID: 1153254300} - - component: {fileID: 1153254299} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1153254299 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1153254298} - m_Enabled: 1 ---- !u!124 &1153254300 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1153254298} - m_Enabled: 1 ---- !u!20 &1153254301 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1153254298} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.6353806, g: 0.7275885, b: 0.8308824, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 55 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1153254302 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1153254298} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + Target: {fileID: 1851160641} + radius: 0.5 + strenght: 0.05 + vibrato: 50 + randomness: 90 + height: 1 diff --git a/Assets/CharTween/Examples/CharTween Example Simple.unity b/Assets/CharTween/Examples/CharTween Example Simple.unity index 5ee1b7f..f10ed27 100644 --- a/Assets/CharTween/Examples/CharTween Example Simple.unity +++ b/Assets/CharTween/Examples/CharTween Example Simple.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,16 +50,14 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -116,9 +115,10 @@ NavMeshSettings: --- !u!1 &1075228581 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1075228586} - component: {fileID: 1075228587} @@ -136,12 +136,13 @@ GameObject: --- !u!114 &1075228582 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -806885394, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -150,13 +151,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: here we go! + m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 843cb3f7719b79841b8864436d4b7a4c, type: 2} - m_sharedMaterial: {fileID: 21218518644432016, guid: 843cb3f7719b79841b8864436d4b7a4c, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -165,6 +163,7 @@ MonoBehaviour: 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} @@ -180,15 +179,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 - m_isAlignmentEnumConverted: 1 + m_textAlignment: 514 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -201,6 +199,7 @@ MonoBehaviour: m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -214,26 +213,24 @@ MonoBehaviour: m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 1075228582} - characterCount: 11 + characterCount: 0 spriteCount: 0 - spaceCount: 2 - wordCount: 3 + spaceCount: 0 + wordCount: 0 linkCount: 0 - lineCount: 1 - pageCount: 1 + lineCount: 0 + pageCount: 0 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_renderer: {fileID: 1075228583} m_subTextObjects: @@ -249,8 +246,9 @@ MonoBehaviour: --- !u!23 &1075228583 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} m_Enabled: 1 m_CastShadows: 0 @@ -259,8 +257,10 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - - {fileID: 21218518644432016, guid: 843cb3f7719b79841b8864436d4b7a4c, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -283,24 +283,28 @@ MeshRenderer: --- !u!222 &1075228584 CanvasRenderer: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} + m_CullTransparentMesh: 0 --- !u!33 &1075228585 MeshFilter: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} m_Mesh: {fileID: 0} --- !u!224 &1075228586 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} 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: 20} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -309,13 +313,14 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.032000005, y: 0.018} - m_SizeDelta: {x: 12.843, y: 9.583} + m_SizeDelta: {x: 39.614, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1075228587 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1075228581} m_Enabled: 1 m_EditorHideFlags: 0 @@ -325,9 +330,10 @@ MonoBehaviour: --- !u!1 &1153254298 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1153254302} - component: {fileID: 1153254301} @@ -343,27 +349,35 @@ GameObject: --- !u!81 &1153254299 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153254298} m_Enabled: 1 --- !u!124 &1153254300 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153254298} m_Enabled: 1 --- !u!20 &1153254301 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153254298} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.6353806, g: 0.7275885, b: 0.8308824, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -393,8 +407,9 @@ Camera: --- !u!4 &1153254302 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153254298} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} diff --git a/Assets/CharTween/Examples/CharTweenExampleFull.cs b/Assets/CharTween/Examples/CharTweenExampleFull.cs index bc9f193..5c77f29 100644 --- a/Assets/CharTween/Examples/CharTweenExampleFull.cs +++ b/Assets/CharTween/Examples/CharTweenExampleFull.cs @@ -10,6 +10,15 @@ public class CharTweenExampleFull : MonoBehaviour public TMP_Text Target; private CharTweener _tweener; + [Header("Tween 1")] + public float radius = 1; + [Header("Tween 2")] + public float strenght = 1; + public int vibrato = 1; + public float randomness = 1; + [Header("Tween 3")] + public float height = 1; + public void Start() { _tweener = Target.GetCharTweener(); @@ -24,8 +33,8 @@ private void Tween1(int start, int end) { for (var i = start; i <= end; ++i) { - var timeOffset = Mathf.Lerp(0, 1, (i - start) / (float) (end - start + 1)); - var circleTween = _tweener.DOCircle(i, 0.05f, 0.5f) + var timeOffset = Mathf.Lerp(0, 1, (i - start) / (float)(end - start + 1)); + var circleTween = _tweener.DOCircle(i, radius, 0.5f) .SetEase(Ease.Linear) .SetLoops(-1, LoopType.Restart); var colorTween = _tweener.DOColor(i, Color.yellow, 0.5f) @@ -41,7 +50,7 @@ private void Tween2(int start, int end) for (var i = start; i <= end; ++i) { var timeOffset = Mathf.Lerp(0, 1, (i - start) / (float)(end - start + 1)); - _tweener.DOShakePosition(i, 1, 0.05f, 50, 90, false, false) + _tweener.DOShakePosition(i, 1, strenght, vibrato, randomness, false, false) .SetLoops(-1, LoopType.Restart); var colorTween = _tweener.DOColor(i, UnityEngine.Random.ColorHSV(0, 1, 1, 1, 1, 1), UnityEngine.Random.Range(0.1f, 0.5f)) @@ -59,7 +68,7 @@ private void Tween3(int start, int end) { var timeOffset = Mathf.Lerp(0, 1, (i - start) / (float)(end - start + 1)); var charSequence = DOTween.Sequence(); - charSequence.Append(_tweener.DOLocalMoveY(i, 0.5f, 0.5f).SetEase(Ease.InOutCubic)) + charSequence.Append(_tweener.DOLocalMoveY(i, height, 0.5f).SetEase(Ease.InOutCubic)) .Join(_tweener.DOFade(i, 0, 0.5f).From()) .Join(_tweener.DOScale(i, 0, 0.5f).From().SetEase(Ease.OutBack, 5)) .Append(_tweener.DOLocalMoveY(i, 0, 0.5f).SetEase(Ease.OutBounce)); @@ -92,3 +101,4 @@ private void ApplyTweenToLine(int line, Action tween) } } } + diff --git a/Assets/CharTween/Scripts/CharTweener.Properties.cs b/Assets/CharTween/Scripts/CharTweener.Properties.cs index 96f3c53..6c9b6b7 100644 --- a/Assets/CharTween/Scripts/CharTweener.Properties.cs +++ b/Assets/CharTween/Scripts/CharTweener.Properties.cs @@ -46,7 +46,7 @@ public Vector3 GetPositionOffset(int charIndex) public void SetPositionOffset(int charIndex, Vector3 positionOffset) { - GetProxyTransform(charIndex).position = positionOffset; + GetProxyTransform(charIndex).localPosition = positionOffset; _updateVerticesPending = true; } diff --git a/Assets/CharTween/Scripts/CharTweener.Tweens.cs b/Assets/CharTween/Scripts/CharTweener.Tweens.cs index 7478fb3..cce2ac6 100644 --- a/Assets/CharTween/Scripts/CharTweener.Tweens.cs +++ b/Assets/CharTween/Scripts/CharTweener.Tweens.cs @@ -10,16 +10,18 @@ public partial class CharTweener : MonoBehaviour public Tweener DOCircle(int charIndex, float radius, float duration, int pathPoints = 8, PathType pathType = PathType.CatmullRom, PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null) { - var tweenPath = new Vector3[pathPoints + 1]; + var tweenPath = new Vector3[pathPoints]; for (var i = 0; i < tweenPath.Length; ++i) { var theta = Mathf.Lerp(0, 2 * Mathf.PI, i / (float)(tweenPath.Length - 1)); - tweenPath[i] = new Vector3(radius*Mathf.Cos(theta), radius*Mathf.Sin(theta), 0); + tweenPath[i] = new Vector3(radius * Mathf.Cos(theta), radius * Mathf.Sin(theta), 0); } - tweenPath[tweenPath.Length - 1] = new Vector3(radius, 0, 0); + //The first point of the path is the transform itself + GetProxyTransform(charIndex).localPosition = tweenPath[0]; + SetPositionOffset(charIndex, tweenPath[0]); - return DOPath(charIndex, tweenPath, duration, pathType, pathMode, resolution, gizmoColor); + return DOLocalPath(charIndex, tweenPath, duration, pathType, pathMode, resolution, gizmoColor, true); } // Color tweens @@ -186,15 +188,15 @@ public Tweener DOShakeScale(int charIndex, float duration, Vector3 strength, int } public Tweener DOPath(int charIndex, Vector3[] path, float duration, PathType pathType = PathType.Linear, - PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null) + PathMode pathMode = PathMode.Sidescroller2D, int resolution = 10, Color? gizmoColor = null, bool closePath = false) { - return MonitorTransformTween(GetProxyTransform(charIndex).DOPath(path, duration, pathType, pathMode, resolution, gizmoColor)); + return MonitorTransformTween(GetProxyTransform(charIndex).DOPath(path, duration, pathType, pathMode, resolution, gizmoColor).SetOptions(closePath)); } public Tweener DOLocalPath(int charIndex, Vector3[] path, float duration, PathType pathType = PathType.Linear, - PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null) + PathMode pathMode = PathMode.Full3D, int resolution = 10, Color? gizmoColor = null, bool closePath = false) { - return MonitorTransformTween(GetProxyTransform(charIndex).DOLocalPath(path, duration, pathType, pathMode, resolution, gizmoColor)); + return MonitorTransformTween(GetProxyTransform(charIndex).DOLocalPath(path, duration, pathType, pathMode, resolution, gizmoColor).SetOptions(closePath)); } public Tweener DOBlendableMoveBy(int charIndex, Vector3 byValue, float duration, bool snapping = false) diff --git a/Assets/CharTween/Scripts/CharTweener.cs b/Assets/CharTween/Scripts/CharTweener.cs index 6960bd9..cff7377 100644 --- a/Assets/CharTween/Scripts/CharTweener.cs +++ b/Assets/CharTween/Scripts/CharTweener.cs @@ -111,7 +111,9 @@ private void OnDestroy() if (proxyTransforms != null) { foreach (var pair in proxyTransforms) - Destroy(pair.Value.gameObject); + { + if (pair.Value != null) Destroy(pair.Value.gameObject); + } } foreach (var tween in _activeColorTweens) @@ -241,8 +243,9 @@ private Transform GetProxyTransform(int charIndex) private Transform CreateProxyTransform(int charIndex) { - var t = new GameObject().transform; + var t = new GameObject("CharTweener_Proxy_" + charIndex).transform; t.SetParent(Text.transform.parent, false); + t.localPosition = Vector3.zero; #if UNITY_EDITOR t.gameObject.hideFlags = HideFlags.HideAndDontSave; #endif @@ -265,8 +268,7 @@ private CharColor GetProxyColor(int charIndex) private CharColor CreateProxyColor(int charIndex) { - var color = new CharColor - { + var color = new CharColor { Color = Text.color, VertexGradient = Text.colorGradient }; @@ -290,7 +292,7 @@ private void UpdateVertexDataFromProxies() if (!charInfo.isVisible || !proxy) continue; - + var materialIndex = charInfo.materialReferenceIndex; var vertexIndex = charInfo.vertexIndex; var sourceVertices = _meshCache[materialIndex].vertices; diff --git a/Assets/CharTween/Scripts/VertexGradientPlugin.cs b/Assets/CharTween/Scripts/VertexGradientPlugin.cs index faac44b..58f13fd 100644 --- a/Assets/CharTween/Scripts/VertexGradientPlugin.cs +++ b/Assets/CharTween/Scripts/VertexGradientPlugin.cs @@ -81,5 +81,10 @@ private static VertexGradient Multiply(VertexGradient left, float right) left.bottomLeft * right, left.bottomRight * right); } + + public override void SetFrom(TweenerCore t, VertexGradient fromValue, bool setImmediately) + { + throw new System.NotImplementedException(); + } } // Class } // Namespace diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..aff78c1 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,43 @@ + +=== Wed Feb 19 17:02:26 2020 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.analytics@3.2.2 + com.unity.purchasing@2.0.3 + com.unity.ads@2.0.8 + com.unity.textmeshpro@1.4.1 + com.unity.package-manager-ui@2.0.8 + com.unity.collab-proxy@1.2.15 + com.unity.modules.ai@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..215430d --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,40 @@ +{ + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.8", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000000000000000000000000000000000000..7d1c32fa8084f6cabe2534ef19f5bf329819999a GIT binary patch literal 4104 zcmeH_yGlbr5Qb-S^?uhzL41K|BzOS{79l8Jh+-d(dNeUnG&u?u!gfA^wl*P^jbdeG zXKi8Yqj>!P-6+O45O!eB%zQgLyZa|1(J7IE4iOndL=c&sNiU=_sdVNbEuUc+Dg`(> z-Po2etb8_a@3K!f_piCNtLEI>7?z&lY@yAIXlw~hp~;mrqoN;`=oldTtSfm3??cW0 z2%>1NMN}FYojgkZLLQY5uyO3+96F7B0`aKTA1Bo0F-aj^gmX>;(ek*NlSRoHNphHy zxRfHIH<0(hDF{tT!t@uBv%k|YZFmZIDWPU>*AI`&3iugnp4*LR&rP(wi)W~1&QG?z ztC!q(Qns*@?_y1zERPx8u2FM-KVs`$ZS&19xy(KG{@=O{vL8l%i^%!B%Mc-q_h}$L zz{!W+Mx!-yUn{*V|7PPFk`{ rSxmGUUPQBBlm7e{Y~{XA0jGddz$xGqa0)mDoB~b(r+`!7e=G0>aRQ@t literal 0 HcmV?d00001 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e6cd1f9..4c21eea 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.3.0f3 +m_EditorVersion: 2018.4.14f1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000000000000000000000000000000000000..a39229a56b46732406a271d46c029fe46879ad0c GIT binary patch literal 4148 zcmeH_%}N4M6vxl?qYwLrphb%o?L|Ydz$8>8A;Hw7T}*k^3BMReFxt#g@dctq(546I z1$u#ch1$0437Y=rP8jF|w7CZkbI#9m{&Vl&A@Yrg)?-ApfhQhBdy(jVI2Mk^YEk-j zT~`ReQ1By8uDewZJlu_wn_r)mUh!qu#S+~kd4wZQZm1&N>E5LJwVJdhL#2-Ow^5XBh!xDPEJ@oo+w~r=Dyf02md%zd z*|Lj1ZwxZBX&a2xExo()`8oI_)S(^F4rm9o1KI)YfObGTpdHW-Xa}?d|L?$PI83~~ Ho*e!FYfN;8 literal 0 HcmV?d00001 diff --git a/UnityPackageManager/manifest.json b/UnityPackageManager/manifest.json deleted file mode 100644 index 526aca6..0000000 --- a/UnityPackageManager/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "dependencies": { - } -} From f35582e2421721f6e1627c3a829e79fee8698fb3 Mon Sep 17 00:00:00 2001 From: Deive_Ex Date: Wed, 19 Feb 2020 17:32:35 -0300 Subject: [PATCH 2/2] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7c85a80..04b6c4b 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ private void Start() - Tween position, rotation, scale, and color. Includes the special transform extensions like DOPunch, DOShake - Controlled like normal tweens. Kill, SetDelay, SetLoops, etc. work. Sequences work. - If you tween a character at an index that doesn't exist, the tween still happens. For example, you could oscillate the first 100 characters of an empty input field and the animation will happen as the user types in characters. +- Compatibility with TextMeshProUGUI #### Limitations - Performance overhead; my laptop dips below 60FPS when tweening 3000 characters.