1.Remove Extension/RubtyTextMeshPro

2.Organize Extension with Version Define
ls9512 · Apr 8, 2021 · 3cc5049 · 3cc5049
1 parent 33f1784
commit 3cc5049
Show file tree

Hide file tree

Showing 24 changed files with 13 additions and 288 deletions.
diff --git 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&registry_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
@@ -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&registry_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
diff --git a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef b/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef
diff --git a/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef.meta b/Extension/RubyTextMeshPro/Aya.Tween.RubyTextMeshPro.asmdef.meta
diff --git a/Extension/RubyTextMeshPro/Script.meta b/Extension/RubyTextMeshPro/Script.meta
diff --git a/Extension/RubyTextMeshPro/Script/Editor.meta b/Extension/RubyTextMeshPro/Script/Editor.meta
diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs
diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs.meta b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProEditor.cs.meta
diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs
diff --git a/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs.meta b/Extension/RubyTextMeshPro/Script/Editor/TweenRubyTextMeshProUGUIEditor.cs.meta
diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs
diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs.meta b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshPro.cs.meta
diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs
diff --git a/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs.meta b/Extension/RubyTextMeshPro/Script/TweenRubyTextMeshProUGUI.cs.meta
diff --git a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs b/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs
diff --git a/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs.meta b/Extension/RubyTextMeshPro/Script/TweenTypeRubyTextMeshPro.cs.meta
diff --git 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
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     }
   ]
 }