diff --git a/.github/README.md b/.github/README.md index 7d11193..28e22b3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -6,7 +6,6 @@ ![license](https://img.shields.io/github/license/ls9512/UTween) [![openupm](https://img.shields.io/npm/v/com.ls9512.utween?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.ls9512.utween/) -[![Release Version](https://img.shields.io/badge/release-1.1.1-red.svg)](https://github.com/ls9512/UTween/releases) ![topLanguage](https://img.shields.io/github/languages/top/ls9512/UTween) ![size](https://img.shields.io/github/languages/code-size/ls9512/UTween) ![last](https://img.shields.io/github/last-commit/ls9512/UTween) diff --git a/.github/README_CN.md b/.github/README_CN.md index 83f4531..be296e4 100644 --- a/.github/README_CN.md +++ b/.github/README_CN.md @@ -7,7 +7,6 @@ ![license](https://img.shields.io/github/license/ls9512/UTween) [![openupm](https://img.shields.io/npm/v/com.ls9512.utween?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.ls9512.utween/) -[![Release Version](https://img.shields.io/badge/release-1.1.1-red.svg)](https://github.com/ls9512/UTween/releases) ![topLanguage](https://img.shields.io/github/languages/top/ls9512/UTween) ![size](https://img.shields.io/github/languages/code-size/ls9512/UTween) ![last](https://img.shields.io/github/last-commit/ls9512/UTween) diff --git a/Extension/RubyTextMeshPro.meta b/Extension/RubyTextMeshPro.meta deleted file mode 100644 index a1a4843..0000000 --- a/Extension/RubyTextMeshPro.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 73af550f04c48d345a6682699b5e6577 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef b/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef deleted file mode 100644 index 38a4955..0000000 --- a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Aya.Tween.RubyTextMeshPro", - "references": [ - "GUID:57592e70a947482449506b44d46f0195", - "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:3c1dce29f1b96f04f8ef3d60a4926a2e" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": true, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef.meta b/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef.meta deleted file mode 100644 index 0ad2a91..0000000 --- a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f6c69b9071009884289fe543d5d6870a -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script.meta b/Extension/RubyTextMeshPro/Script.meta deleted file mode 100644 index 2554f7e..0000000 --- a/Extension/RubyTextMeshPro/Script.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2bfee338fe5f7714bb8000618cb3c4d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/Editor.meta b/Extension/RubyTextMeshPro/Script/Editor.meta deleted file mode 100644 index 7e36ade..0000000 --- a/Extension/RubyTextMeshPro/Script/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c1198c19225fca4c9126361e543d190 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs deleted file mode 100644 index b5be52e..0000000 --- a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs +++ /dev/null @@ -1,28 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// Script : TweenRubyTextMeshProEditor.cs -// Info : TweenRubyTextMeshPro 编辑器 -// Author : ls9512 2020 -// E-mail : ls9512@vip.qq.com -// -///////////////////////////////////////////////////////////////////////////// -#define RUBYTEXTMESHPRO -#if UNITY_EDITOR && RUBYTEXTMESHPRO - -namespace Aya.Tween -{ - [TweenerEditor(TweenTypeRubyTextMeshPro.RubyTextMeshPro)] - public class TweenRubyTextMeshProEditor : TweenStringBaseEditor - { - public override int Type => TweenTypeRubyTextMeshPro.RubyTextMeshPro; - public override int RequireCurveCount => 1; - public override bool AllowQuickOperation => true; - public new TweenText Tweener => Target as TweenText; - - public override bool DoDrawQuickOpt() - { - return false; - } - } -} -#endif diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs.meta b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs.meta deleted file mode 100644 index b3e60a3..0000000 --- a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7e8b925b44d9d0b43be9da145a47a8e4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs deleted file mode 100644 index fbcebfd..0000000 --- a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs +++ /dev/null @@ -1,28 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// Script : TweenRubyTextMeshProUGUIEditor.cs -// Info : TweenRubyTextMeshProUGUI 编辑器 -// Author : ls9512 2020 -// E-mail : ls9512@vip.qq.com -// -///////////////////////////////////////////////////////////////////////////// -#define RUBYTEXTMESHPRO -#if UNITY_EDITOR && RUBYTEXTMESHPRO - -namespace Aya.Tween -{ - [TweenerEditor(TweenTypeRubyTextMeshPro.RubyTextMeshProUGUI)] - public class TweenRubyTextMeshProUGUIEditor : TweenStringBaseEditor - { - public override int Type => TweenTypeRubyTextMeshPro.RubyTextMeshProUGUI; - public override int RequireCurveCount => 1; - public override bool AllowQuickOperation => true; - public new TweenText Tweener => Target as TweenText; - - public override bool DoDrawQuickOpt() - { - return false; - } - } -} -#endif diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs.meta b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs.meta deleted file mode 100644 index 7d7e17a..0000000 --- a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 27a41e6e50373d3429dc1895324128d6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs deleted file mode 100644 index 4981bbb..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// Script : TweenRubyTextMeshPro.cs -// Info : RubyTextMeshPro 文本显示长度 插值 -// Author : ls9512 2020 -// E-mail : ls9512@vip.qq.com -// -///////////////////////////////////////////////////////////////////////////// -#define RUBYTEXTMESHPRO -#if RUBYTEXTMESHPRO -using UnityEngine; -using TMPro; - -namespace Aya.Tween -{ - [RequireComponent(typeof(RubyTextMeshPro))] - [Tweener(TweenTypeRubyTextMeshPro.RubyTextMeshPro)] - public class TweenRubyTextMeshPro : TweenStringBase - { - public override int Type => TweenTypeRubyTextMeshPro.RubyTextMeshPro; - - public override string GetString() - { - return Component.text; - } - - public override void SetString(string str) - { - Component.text = str; - } - - public override bool GetSupportRichText() - { - return Component.richText; - } - } -} -#endif \ No newline at end of file diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs.meta b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs.meta deleted file mode 100644 index 6975951..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 65dd2fce297ad254db4dbd7561461bac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs deleted file mode 100644 index c8eb3c7..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// Script : TweenRubyTextMeshProUGUI.cs -// Info : RubyTextMeshProUGUI 文本显示长度 插值 -// Author : ls9512 2020 -// E-mail : ls9512@vip.qq.com -// -///////////////////////////////////////////////////////////////////////////// -#define RUBYTEXTMESHPRO -#if RUBYTEXTMESHPRO -using UnityEngine; -using TMPro; - -namespace Aya.Tween -{ - [RequireComponent(typeof(RubyTextMeshProUGUI))] - [Tweener(TweenTypeRubyTextMeshPro.RubyTextMeshProUGUI)] - public class TweenRubyTextMeshProUGUI : TweenStringBase - { - public override int Type => TweenTypeRubyTextMeshPro.RubyTextMeshProUGUI; - - public override string GetString() - { - return Component.text; - } - - public override void SetString(string str) - { - Component.text = str; - } - - public override bool GetSupportRichText() - { - return Component.richText; - } - } -} -#endif \ No newline at end of file diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs.meta b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs.meta deleted file mode 100644 index 99bc0d7..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fecbba7076f64e541a7c6e9f4f48d023 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs b/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs deleted file mode 100644 index bccea7b..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// -// Script : TweenTypeRubyTextMeshPro.cs -// Info : 插值动画类型枚举 -// Author : ls9512 2020 -// E-mail : ls9512@vip.qq.com -// -///////////////////////////////////////////////////////////////////////////// -#define RUBYTEXTMESHPRO -#if RUBYTEXTMESHPRO - -namespace Aya.Tween -{ - [EnumClass("TweenType")] - public static class TweenTypeRubyTextMeshPro - { -#if UNITY_EDITOR - [UnityEditor.InitializeOnLoadMethod] -#else - [UnityEngine.RuntimeInitializeOnLoadMethod] -#endif - public static void Init() - { - SerializeEnumAttribute.CacheSerializeEnum(typeof(TweenTypeRubyTextMeshPro)); - } - - [EnumProperty("Ruby TextMeshPro", "Ruby TextMeshPro")] - public const int RubyTextMeshPro = 353; - [EnumProperty("Ruby TextMeshPro", "Ruby TextMeshPro UGUI")] - public const int RubyTextMeshProUGUI = 354; - } -} -#endif \ No newline at end of file diff --git a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs.meta b/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs.meta deleted file mode 100644 index 2ad1d48..0000000 --- a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 64a7f3ff42c981648852d62a2a4d3bed -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Extension/TextMeshPro/Aya.Tween.TextMeshPro.asmdef b/Extension/TextMeshPro/Aya.Tween.TextMeshPro.asmdef index 2639726..7cc3cda 100644 --- a/Extension/TextMeshPro/Aya.Tween.TextMeshPro.asmdef +++ b/Extension/TextMeshPro/Aya.Tween.TextMeshPro.asmdef @@ -11,6 +11,12 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [], + "versionDefines": [ + { + "name": "com.unity.textmeshpro", + "expression": "1.0.0", + "define": "UTWEEN_TEXTMESHPRO" + } + ], "noEngineReferences": false } \ No newline at end of file diff --git a/Extension/TextMeshPro/Script/Editor/TweenTextMeshProEditor.cs b/Extension/TextMeshPro/Script/Editor/TweenTextMeshProEditor.cs index 4cc7940..b9cd655 100644 --- a/Extension/TextMeshPro/Script/Editor/TweenTextMeshProEditor.cs +++ b/Extension/TextMeshPro/Script/Editor/TweenTextMeshProEditor.cs @@ -6,8 +6,7 @@ // E-mail : ls9512@vip.qq.com // ///////////////////////////////////////////////////////////////////////////// -#define TEXTMESHPRO -#if UNITY_EDITOR && TEXTMESHPRO +#if UNITY_EDITOR && UTWEEN_TEXTMESHPRO namespace Aya.Tween { diff --git a/Extension/TextMeshPro/Script/Editor/TweenTextMeshProUGUIEditor.cs b/Extension/TextMeshPro/Script/Editor/TweenTextMeshProUGUIEditor.cs index 46a341f..ca71cb8 100644 --- a/Extension/TextMeshPro/Script/Editor/TweenTextMeshProUGUIEditor.cs +++ b/Extension/TextMeshPro/Script/Editor/TweenTextMeshProUGUIEditor.cs @@ -6,8 +6,7 @@ // E-mail : ls9512@vip.qq.com // ///////////////////////////////////////////////////////////////////////////// -#define TEXTMESHPRO -#if UNITY_EDITOR && TEXTMESHPRO +#if UNITY_EDITOR && UTWEEN_TEXTMESHPRO namespace Aya.Tween { diff --git a/Extension/TextMeshPro/Script/TweenTextMeshPro.cs b/Extension/TextMeshPro/Script/TweenTextMeshPro.cs index a34b2a9..502ace2 100644 --- a/Extension/TextMeshPro/Script/TweenTextMeshPro.cs +++ b/Extension/TextMeshPro/Script/TweenTextMeshPro.cs @@ -6,8 +6,7 @@ // E-mail : ls9512@vip.qq.com // ///////////////////////////////////////////////////////////////////////////// -#define TEXTMESHPRO -#if TEXTMESHPRO +#if UTWEEN_TEXTMESHPRO using UnityEngine; using TMPro; diff --git a/Extension/TextMeshPro/Script/TweenTextMeshProUGUI.cs b/Extension/TextMeshPro/Script/TweenTextMeshProUGUI.cs index 92a5917..d525a42 100644 --- a/Extension/TextMeshPro/Script/TweenTextMeshProUGUI.cs +++ b/Extension/TextMeshPro/Script/TweenTextMeshProUGUI.cs @@ -6,8 +6,7 @@ // E-mail : ls9512@vip.qq.com // ///////////////////////////////////////////////////////////////////////////// -#define TEXTMESHPRO -#if TEXTMESHPRO +#if UTWEEN_TEXTMESHPRO using UnityEngine; using TMPro; diff --git a/Extension/TextMeshPro/Script/TweenTypeTextMeshPro.cs b/Extension/TextMeshPro/Script/TweenTypeTextMeshPro.cs index 750896b..c55d37d 100644 --- a/Extension/TextMeshPro/Script/TweenTypeTextMeshPro.cs +++ b/Extension/TextMeshPro/Script/TweenTypeTextMeshPro.cs @@ -6,9 +6,7 @@ // E-mail : ls9512@vip.qq.com // ///////////////////////////////////////////////////////////////////////////// -#define TEXTMESHPRO -#if TEXTMESHPRO - +#if UTWEEN_TEXTMESHPRO namespace Aya.Tween { [EnumClass("TweenType")] diff --git a/package.json b/package.json index bc6e9d7..50ef5d2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.ls9512.utween", "displayName": "UTween", "description": "UTween is an interpolation animation component for Unity. You can quickly configure animations through built-in components or write animations through code.", - "version": "1.1.1", + "version": "1.1.2", "unity": "2019.4.3f1", "license": "MIT", "repository": { @@ -29,11 +29,6 @@ "displayName": "TextMeshPro Support", "description": "TextMeshPro Support", "path": "Extension~/TextMeshPro" - }, - { - "displayName": "RubyTextMeshPro Support", - "description": "RubyTextMeshPro Support", - "path": "Extension~/RubyTextMeshPro" } ] } \ No newline at end of file