Merge branch 'main' into 快捷菜单

Assets/ModuleEditor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ed61f5627e04e114eb2c086ae01dc7b4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ModuleEditor/ModuleEditor.asmdef

@@ -1,18 +0,0 @@
-{
-    "name": "ModuleEditor",
-    "rootNamespace": "",
-    "references": [
-        "GUID:432b70115e987f44abb984cfe7de384f"
-    ],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Assets/ModuleEditor/ModuleEditor.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 779534da92936794a829f8bf18309372
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ModuleEditor/TestEditorWindow.cs

@@ -1,27 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-public class TestEditorWindow : EditorWindow {
-	[SerializeField]
-	private VisualTreeAsset m_VisualTreeAsset = default;
-
-	[MenuItem("Window/MuHua/TestEditorWindow")]
-	public static void ShowExample() {
-		TestEditorWindow wnd = GetWindow<TestEditorWindow>();
-		wnd.titleContent = new GUIContent("TestEditorWindow");
-	}
-
-	public void CreateGUI() {
-		// Each editor window contains a root VisualElement object
-		VisualElement root = rootVisualElement;
-
-		// VisualElements objects can contain other VisualElement following a tree hierarchy.
-		VisualElement label = new Label("Hello World! From C#");
-		root.Add(label);
-
-		// Instantiate UXML
-		VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
-		root.Add(labelFromUXML);
-	}
-}

Assets/ModuleEditor/TestEditorWindow.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ccbcb6aee5874ac4ba30fcb269d7c7ba
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences:
-  - m_VisualTreeAsset: {fileID: 9197481963319205126, guid: d23b67a16b48c2243aabe57056dbfbed, type: 3}
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/UI Toolkit/Component/Dropdown/Dropdown.uxml

@@ -5,7 +5,7 @@
         <ui:Label tabindex="-1" text="下拉框" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="dropdown-title" />
         <ui:VisualElement name="Input" class="dropdown-input">
             <ui:Label tabindex="-1" text="标签" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Tag" class="dropdown-tag" />
-            <ui:VisualElement name="Icon" class="dropdown-icon" style="background-image: url(&quot;project://database/Assets/UI%20Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss?fileID=4154780841294389669&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#arrow-down&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
+            <ui:VisualElement name="Icon" class="dropdown-icon" style="background-image: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=4154780841294389669&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#arrow-down&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
             <ui:VisualElement name="Positioner" class="dropdown-scrollview" />
             <ui:VisualElement name="DropdownScrollView" class="scrollview dropdown-scrollview dropdown-hide">
                 <ui:VisualElement name="Viewport" class="scrollview-viewport" style="margin-right: 0; margin-bottom: 0; margin-top: 0; margin-left: 0; background-color: rgb(255, 255, 255); border-top-left-radius: 3px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;">

Assets/UI Toolkit/Component/Dropdown/DropdownTemplate.uxml

@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/UI%20Toolkit/Component/Dropdown/Dropdown.uss?fileID=7433441132597879392&amp;guid=1e0657eb9266c804ea6adea1a16c74b2&amp;type=3#Dropdown" />
     <ui:Button text="Button" parse-escape-sequences="true" display-tooltip-when-elided="true" class="dropdown-unit">
-        <ui:VisualElement name="Check" class="dropdown-hide" style="width: 20px; height: 20px; background-image: url(&quot;project://database/Assets/UI%20Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss?fileID=-6090568113533005507&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#check&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
+        <ui:VisualElement name="Check" class="dropdown-hide" style="width: 20px; height: 20px; background-image: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=-6090568113533005507&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#check&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
     </ui:Button>
 </ui:UXML>

Assets/UI Toolkit/GamePanel/ShortcutMenu/ShortcutMenu.uss

@@ -23,7 +23,7 @@
     flex-grow: 0;
     height: 30px;
     width: 30px;
-    background-image: url("project://database/Assets/UI%20Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss?fileID=-1087164816274819069&guid=05f864e67ee1ecb4bbe67427564d394c&type=3#arrow-right@2x");
+    background-image: url("project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=-1087164816274819069&guid=05f864e67ee1ecb4bbe67427564d394c&type=3#arrow-right@2x");
     -unity-background-image-tint-color: rgb(51, 51, 51);
 }
 

Assets/UI Toolkit/GamePopup/Guidance/Guidance.uxml

@@ -9,7 +9,7 @@
                     <ui:VisualElement class="toggle" style="flex-direction: row-reverse;">
                         <ui:Label tabindex="-1" text="不在提示" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Title" class="toggle-title" style="color: rgb(28, 28, 28); padding-bottom: 5px; padding-top: 3px; padding-right: 3px; padding-left: 3px;" />
                         <ui:VisualElement name="Input" class="toggle-input">
-                            <ui:VisualElement name="Check" class="toggle-check toggle-check-hide" style="background-image: url(&quot;project://database/Assets/UI%20Toolkit/DefaultTheme/UnityDefaultRuntimeTheme.tss?fileID=-6090568113533005507&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#check&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
+                            <ui:VisualElement name="Check" class="toggle-check toggle-check-hide" style="background-image: url(&quot;project://database/Assets/UI%20Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss?fileID=-6090568113533005507&amp;guid=05f864e67ee1ecb4bbe67427564d394c&amp;type=3#check&quot;); -unity-background-image-tint-color: rgb(51, 51, 51);" />
                         </ui:VisualElement>
                     </ui:VisualElement>
                 </ui:VisualElement>