diff --git a/Assets/MuHua.meta b/Assets/ModuleMuHua.meta similarity index 100% rename from Assets/MuHua.meta rename to Assets/ModuleMuHua.meta diff --git a/Assets/MuHua/LabelFollow.meta b/Assets/ModuleMuHua/LabelFollow.meta similarity index 100% rename from Assets/MuHua/LabelFollow.meta rename to Assets/ModuleMuHua/LabelFollow.meta diff --git a/Assets/MuHua/LabelFollow/Prefabs.meta b/Assets/ModuleMuHua/LabelFollow/Prefabs.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs.meta rename to Assets/ModuleMuHua/LabelFollow/Prefabs.meta diff --git a/Assets/MuHua/LabelFollow/Prefabs/LabelController.prefab b/Assets/ModuleMuHua/LabelFollow/Prefabs/LabelController.prefab similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/LabelController.prefab rename to Assets/ModuleMuHua/LabelFollow/Prefabs/LabelController.prefab diff --git a/Assets/MuHua/LabelFollow/Prefabs/LabelController.prefab.meta b/Assets/ModuleMuHua/LabelFollow/Prefabs/LabelController.prefab.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/LabelController.prefab.meta rename to Assets/ModuleMuHua/LabelFollow/Prefabs/LabelController.prefab.meta diff --git a/Assets/MuHua/LabelFollow/Prefabs/LabelFollower.prefab b/Assets/ModuleMuHua/LabelFollow/Prefabs/LabelFollower.prefab similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/LabelFollower.prefab rename to Assets/ModuleMuHua/LabelFollow/Prefabs/LabelFollower.prefab diff --git a/Assets/MuHua/LabelFollow/Prefabs/LabelFollower.prefab.meta b/Assets/ModuleMuHua/LabelFollow/Prefabs/LabelFollower.prefab.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/LabelFollower.prefab.meta rename to Assets/ModuleMuHua/LabelFollow/Prefabs/LabelFollower.prefab.meta diff --git a/Assets/MuHua/LabelFollow/Prefabs/StandardLabel.prefab b/Assets/ModuleMuHua/LabelFollow/Prefabs/StandardLabel.prefab similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/StandardLabel.prefab rename to Assets/ModuleMuHua/LabelFollow/Prefabs/StandardLabel.prefab diff --git a/Assets/MuHua/LabelFollow/Prefabs/StandardLabel.prefab.meta b/Assets/ModuleMuHua/LabelFollow/Prefabs/StandardLabel.prefab.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Prefabs/StandardLabel.prefab.meta rename to Assets/ModuleMuHua/LabelFollow/Prefabs/StandardLabel.prefab.meta diff --git a/Assets/MuHua/LabelFollow/Script.meta b/Assets/ModuleMuHua/LabelFollow/Script.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Script.meta rename to Assets/ModuleMuHua/LabelFollow/Script.meta diff --git a/Assets/MuHua/LabelFollow/Script/StandardLabel.cs b/Assets/ModuleMuHua/LabelFollow/Script/StandardLabel.cs similarity index 100% rename from Assets/MuHua/LabelFollow/Script/StandardLabel.cs rename to Assets/ModuleMuHua/LabelFollow/Script/StandardLabel.cs diff --git a/Assets/MuHua/LabelFollow/Script/StandardLabel.cs.meta b/Assets/ModuleMuHua/LabelFollow/Script/StandardLabel.cs.meta similarity index 100% rename from Assets/MuHua/LabelFollow/Script/StandardLabel.cs.meta rename to Assets/ModuleMuHua/LabelFollow/Script/StandardLabel.cs.meta diff --git a/Assets/MuHua/UITool.meta b/Assets/ModuleMuHua/UITool.meta similarity index 100% rename from Assets/MuHua/UITool.meta rename to Assets/ModuleMuHua/UITool.meta diff --git a/Assets/MuHua/UITool/DefaultTheme.meta b/Assets/ModuleMuHua/UITool/DefaultTheme.meta similarity index 100% rename from Assets/MuHua/UITool/DefaultTheme.meta rename to Assets/ModuleMuHua/UITool/DefaultTheme.meta diff --git a/Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset b/Assets/ModuleMuHua/UITool/DefaultTheme/PanelSettings.asset similarity index 100% rename from Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset rename to Assets/ModuleMuHua/UITool/DefaultTheme/PanelSettings.asset diff --git a/Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset.meta b/Assets/ModuleMuHua/UITool/DefaultTheme/PanelSettings.asset.meta similarity index 100% rename from Assets/MuHua/UITool/DefaultTheme/PanelSettings.asset.meta rename to Assets/ModuleMuHua/UITool/DefaultTheme/PanelSettings.asset.meta diff --git a/Assets/ModuleMuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss b/Assets/ModuleMuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss new file mode 100644 index 0000000..c183494 --- /dev/null +++ b/Assets/ModuleMuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss @@ -0,0 +1,22 @@ +@import url("unity-theme://default"); + +@import url("/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss"); +@import url("/Assets/ModuleMuHua/UITool/USS/InputField.uss"); +@import url("/Assets/ModuleMuHua/UITool/USS/Scroller.uss"); +@import url("/Assets/ModuleMuHua/UITool/USS/ScrollView.uss"); +@import url("/Assets/ModuleMuHua/UITool/USS/Slider.uss"); +@import url("/Assets/ModuleMuHua/UITool/USS/Window.uss"); + + + + + + + + + + + + + +VisualElement {} diff --git a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta b/Assets/ModuleMuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta similarity index 100% rename from Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta rename to Assets/ModuleMuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss.meta diff --git a/Assets/MuHua/UITool/FontLibrary.meta b/Assets/ModuleMuHua/UITool/FontLibrary.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary.meta rename to Assets/ModuleMuHua/UITool/FontLibrary.meta diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts.meta b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/Fonts.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/Fonts.meta diff --git a/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss new file mode 100644 index 0000000..da7dd5b --- /dev/null +++ b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss @@ -0,0 +1,3 @@ +.unity-text-element { + -unity-font: url("project://database/Assets/ModuleMuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf?fileID=12800000&guid=3ceb88ff2ced01a439c5b2d1b63c86a5&type=3#SourceHanSansCN-Medium"); +} diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts.uss.meta b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/Fonts.uss.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/Fonts.uss.meta diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf rename to Assets/ModuleMuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta b/Assets/ModuleMuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/Fonts/SourceHanSansCN-Medium.otf.meta diff --git a/Assets/MuHua/UITool/FontLibrary/FontsTest.uxml b/Assets/ModuleMuHua/UITool/FontLibrary/FontsTest.uxml similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/FontsTest.uxml rename to Assets/ModuleMuHua/UITool/FontLibrary/FontsTest.uxml diff --git a/Assets/MuHua/UITool/FontLibrary/FontsTest.uxml.meta b/Assets/ModuleMuHua/UITool/FontLibrary/FontsTest.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/FontsTest.uxml.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/FontsTest.uxml.meta diff --git a/Assets/MuHua/UITool/FontLibrary/TMP.meta b/Assets/ModuleMuHua/UITool/FontLibrary/TMP.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/TMP.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/TMP.meta diff --git a/Assets/MuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset b/Assets/ModuleMuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset rename to Assets/ModuleMuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset diff --git a/Assets/MuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta b/Assets/ModuleMuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta similarity index 100% rename from Assets/MuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta rename to Assets/ModuleMuHua/UITool/FontLibrary/TMP/SourceHanSansCN-Medium SDF.asset.meta diff --git a/Assets/MuHua/UITool/USS.meta b/Assets/ModuleMuHua/UITool/USS.meta similarity index 100% rename from Assets/MuHua/UITool/USS.meta rename to Assets/ModuleMuHua/UITool/USS.meta diff --git a/Assets/MuHua/UITool/USS/InputField.uss b/Assets/ModuleMuHua/UITool/USS/InputField.uss similarity index 100% rename from Assets/MuHua/UITool/USS/InputField.uss rename to Assets/ModuleMuHua/UITool/USS/InputField.uss diff --git a/Assets/MuHua/UITool/USS/InputField.uss.meta b/Assets/ModuleMuHua/UITool/USS/InputField.uss.meta similarity index 100% rename from Assets/MuHua/UITool/USS/InputField.uss.meta rename to Assets/ModuleMuHua/UITool/USS/InputField.uss.meta diff --git a/Assets/MuHua/UITool/USS/ScrollView.uss b/Assets/ModuleMuHua/UITool/USS/ScrollView.uss similarity index 100% rename from Assets/MuHua/UITool/USS/ScrollView.uss rename to Assets/ModuleMuHua/UITool/USS/ScrollView.uss diff --git a/Assets/MuHua/UITool/USS/ScrollView.uss.meta b/Assets/ModuleMuHua/UITool/USS/ScrollView.uss.meta similarity index 100% rename from Assets/MuHua/UITool/USS/ScrollView.uss.meta rename to Assets/ModuleMuHua/UITool/USS/ScrollView.uss.meta diff --git a/Assets/MuHua/UITool/USS/Scroller.uss b/Assets/ModuleMuHua/UITool/USS/Scroller.uss similarity index 100% rename from Assets/MuHua/UITool/USS/Scroller.uss rename to Assets/ModuleMuHua/UITool/USS/Scroller.uss diff --git a/Assets/MuHua/UITool/USS/Scroller.uss.meta b/Assets/ModuleMuHua/UITool/USS/Scroller.uss.meta similarity index 100% rename from Assets/MuHua/UITool/USS/Scroller.uss.meta rename to Assets/ModuleMuHua/UITool/USS/Scroller.uss.meta diff --git a/Assets/MuHua/UITool/USS/Slider.uss b/Assets/ModuleMuHua/UITool/USS/Slider.uss similarity index 100% rename from Assets/MuHua/UITool/USS/Slider.uss rename to Assets/ModuleMuHua/UITool/USS/Slider.uss diff --git a/Assets/MuHua/UITool/USS/Slider.uss.meta b/Assets/ModuleMuHua/UITool/USS/Slider.uss.meta similarity index 100% rename from Assets/MuHua/UITool/USS/Slider.uss.meta rename to Assets/ModuleMuHua/UITool/USS/Slider.uss.meta diff --git a/Assets/MuHua/UITool/USS/Window.uss b/Assets/ModuleMuHua/UITool/USS/Window.uss similarity index 100% rename from Assets/MuHua/UITool/USS/Window.uss rename to Assets/ModuleMuHua/UITool/USS/Window.uss diff --git a/Assets/MuHua/UITool/USS/Window.uss.meta b/Assets/ModuleMuHua/UITool/USS/Window.uss.meta similarity index 100% rename from Assets/MuHua/UITool/USS/Window.uss.meta rename to Assets/ModuleMuHua/UITool/USS/Window.uss.meta diff --git a/Assets/MuHua/UITool/UXML.meta b/Assets/ModuleMuHua/UITool/UXML.meta similarity index 100% rename from Assets/MuHua/UITool/UXML.meta rename to Assets/ModuleMuHua/UITool/UXML.meta diff --git a/Assets/MuHua/UITool/UXML/InputField.meta b/Assets/ModuleMuHua/UITool/UXML/InputField.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField.meta rename to Assets/ModuleMuHua/UITool/UXML/InputField.meta diff --git a/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml b/Assets/ModuleMuHua/UITool/UXML/InputField/FloatField.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/FloatField.uxml rename to Assets/ModuleMuHua/UITool/UXML/InputField/FloatField.uxml diff --git a/Assets/MuHua/UITool/UXML/InputField/FloatField.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/InputField/FloatField.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/FloatField.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/InputField/FloatField.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/InputField/LongField.uxml b/Assets/ModuleMuHua/UITool/UXML/InputField/LongField.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/LongField.uxml rename to Assets/ModuleMuHua/UITool/UXML/InputField/LongField.uxml diff --git a/Assets/MuHua/UITool/UXML/InputField/LongField.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/InputField/LongField.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/LongField.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/InputField/LongField.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/InputField/TextField.uxml b/Assets/ModuleMuHua/UITool/UXML/InputField/TextField.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/TextField.uxml rename to Assets/ModuleMuHua/UITool/UXML/InputField/TextField.uxml diff --git a/Assets/MuHua/UITool/UXML/InputField/TextField.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/InputField/TextField.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/InputField/TextField.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/InputField/TextField.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/ScrollView.meta b/Assets/ModuleMuHua/UITool/UXML/ScrollView.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView.meta rename to Assets/ModuleMuHua/UITool/UXML/ScrollView.meta diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollView.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollView.uxml diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollView.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewHorizontal.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml diff --git a/Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/ScrollView/ScrollViewVertical.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/Scroller.uxml b/Assets/ModuleMuHua/UITool/UXML/Scroller.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/Scroller.uxml rename to Assets/ModuleMuHua/UITool/UXML/Scroller.uxml diff --git a/Assets/MuHua/UITool/UXML/Scroller.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/Scroller.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/Scroller.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/Scroller.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/Slider.uxml b/Assets/ModuleMuHua/UITool/UXML/Slider.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/Slider.uxml rename to Assets/ModuleMuHua/UITool/UXML/Slider.uxml diff --git a/Assets/MuHua/UITool/UXML/Slider.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/Slider.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/Slider.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/Slider.uxml.meta diff --git a/Assets/MuHua/UITool/UXML/Window.uxml b/Assets/ModuleMuHua/UITool/UXML/Window.uxml similarity index 100% rename from Assets/MuHua/UITool/UXML/Window.uxml rename to Assets/ModuleMuHua/UITool/UXML/Window.uxml diff --git a/Assets/MuHua/UITool/UXML/Window.uxml.meta b/Assets/ModuleMuHua/UITool/UXML/Window.uxml.meta similarity index 100% rename from Assets/MuHua/UITool/UXML/Window.uxml.meta rename to Assets/ModuleMuHua/UITool/UXML/Window.uxml.meta diff --git a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss b/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss deleted file mode 100644 index f8644bb..0000000 --- a/Assets/MuHua/UITool/DefaultTheme/UnityDefaultRuntimeTheme.tss +++ /dev/null @@ -1,21 +0,0 @@ -@import url("unity-theme://default"); - -@import url("/Assets/MuHua/UITool/FontLibrary/Fonts.uss"); -@import url("/Assets/MuHua/UITool/USS/InputField.uss"); -@import url("/Assets/MuHua/UITool/USS/Scroller.uss"); -@import url("/Assets/MuHua/UITool/USS/ScrollView.uss"); -@import url("/Assets/MuHua/UITool/USS/Slider.uss"); -@import url("/Assets/MuHua/UITool/USS/Window.uss"); - - - - - - - - - - - - -VisualElement {} diff --git a/Assets/MuHua/UITool/FontLibrary/Fonts.uss b/Assets/MuHua/UITool/FontLibrary/Fonts.uss deleted file mode 100644 index 1de021a..0000000 --- a/Assets/MuHua/UITool/FontLibrary/Fonts.uss +++ /dev/null @@ -1,3 +0,0 @@ -.unity-text-element { - -unity-font: url("project://database/Assets/MuHua/UITool/FontLibrary/SourceHanSansCN-Medium.otf?fileID=12800000&guid=3ceb88ff2ced01a439c5b2d1b63c86a5&type=3#SourceHanSansCN-Medium"); -} diff --git a/Packages/LabelFollow/Samples~/Sample.unitypackage b/Packages/LabelFollow/Samples~/Sample.unitypackage index ddf84cb..3b7ee4b 100644 Binary files a/Packages/LabelFollow/Samples~/Sample.unitypackage and b/Packages/LabelFollow/Samples~/Sample.unitypackage differ diff --git a/Packages/UITool/Samples~/Sample.unitypackage b/Packages/UITool/Samples~/Sample.unitypackage index acd6b19..2c63b4f 100644 Binary files a/Packages/UITool/Samples~/Sample.unitypackage and b/Packages/UITool/Samples~/Sample.unitypackage differ