diff --git a/Assets/00.StaryEvo/Editor/BuildAsset/CreatDomainDirectory.cs b/Assets/00.StaryEvo/Editor/BuildAsset/CreatDomainDirectory.cs index 44a0779..b7c7ce7 100644 --- a/Assets/00.StaryEvo/Editor/BuildAsset/CreatDomainDirectory.cs +++ b/Assets/00.StaryEvo/Editor/BuildAsset/CreatDomainDirectory.cs @@ -17,15 +17,15 @@ namespace Stary.Evo Debug.Log(" 自动运行 "); - if (!PlayerPrefs.HasKey("StartUp")) + if (!EditorPrefs.HasKey("StartUp")) { // 通过标记记录是否已经执行过该方法 OnEditorStartUp(); - PlayerPrefs.SetInt("StartUp", 1); + EditorPrefs.SetInt("StartUp", 1); - if (PlayerPrefs.GetInt("CreatDomainDirectory") == 0) + if (EditorPrefs.GetInt("CreatDomainDirectory") == 0) { - PlayerPrefs.SetInt("CreatDomainDirectory", 1); + EditorPrefs.SetInt("CreatDomainDirectory", 1); bool isOk = EditorUtility.DisplayDialog("提示", "发现目录存在缺失，是否检索并创建缺失目录", "是", "否"); if (isOk) { @@ -65,7 +65,7 @@ namespace Stary.Evo /// private static void OnEditorQuit() { - PlayerPrefs.DeleteKey("StartUp"); + EditorPrefs.DeleteKey("StartUp"); } /// diff --git a/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs b/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs index 7f722ae..fde161b 100644 --- a/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs +++ b/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs @@ -300,7 +300,7 @@ namespace Stary.Evo.Editor CollectPath = assetPath, CollectorGUID = guid, CollectorType = ECollectorType.MainAssetCollector, - AddressRuleName = nameof(AddressByFolderAndFileName), + AddressRuleName = nameof(AddressByGroupAndFileName), AssetTags = groupName, }; diff --git a/Assets/00.StaryEvo/Editor/Resources.meta b/Assets/00.StaryEvo/Editor/Resources.meta new file mode 100644 index 0000000..9f5179b --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65c1f47a72467004ba34ba38e7946792 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt b/Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt new file mode 100644 index 0000000..b62544d --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt @@ -0,0 +1,12 @@ + +namespace NamespaceX +{ + public class ArchitectureX : Architecture + { + protected override void Init() + { + //注册示例 + //RegisterSystem(new ScoreSystem()); + } + } +} \ No newline at end of file diff --git a/Assets/UI/Scripts/UIFramework/Runtime/UIControlBinding/Scripts/LuaViewRunner.cs.meta b/Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt.meta similarity index 83% rename from Assets/UI/Scripts/UIFramework/Runtime/UIControlBinding/Scripts/LuaViewRunner.cs.meta rename to Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt.meta index a256e5a..6b6d4dc 100644 --- a/Assets/UI/Scripts/UIFramework/Runtime/UIControlBinding/Scripts/LuaViewRunner.cs.meta +++ b/Assets/00.StaryEvo/Editor/Resources/ArchitectureTemplate.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2d658df380e510e4891bee300ad300b6 +guid: 87dbc7ed6b6d56d4192c57f52677788e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt b/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt new file mode 100644 index 0000000..1e047d6 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt @@ -0,0 +1,18 @@ +{ + "name": "MODULE_IDENT", + "rootNamespace": "ROOT_NAMESPACE", + "references": [ + "GUID:d1a793c2b6959e04ea45b972eaa369c8", + "GUID:e34a5702dd353724aa315fb8011f08c3", + "GUID:f3fa071c399c4383a9ff8115e53dfefc" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": true, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt.meta b/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt.meta new file mode 100644 index 0000000..436b73e --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/AssemblyDefinitionTemplate.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f96d3c3c5e9b98439185f95d7135c9b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset b/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset new file mode 100644 index 0000000..ad6a592 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39a67460f559484da2b52def8ff05571, type: 3} + m_Name: BuildAssetDataSetting + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + packageName: J0001 + packageVersionX: 1 + packageVersionY: 0 + packageVersionZ: 0 + environmentType: 1 + selectedBuildPipelines: 1 + packageVersion: 1.0.0 + VersionType: 0 + viewer: + clearBuildCacheToggle: 0 + useAssetDependencyDBToggle: 1 + copyBuildinFileOption: 1 + copyBuildinFileParams: diff --git a/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset.meta b/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset.meta new file mode 100644 index 0000000..4a1ec6b --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/BuildAssetDataSetting.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c92d0b29ec1042db972ce28367bb147 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset b/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset new file mode 100644 index 0000000..e75d697 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset @@ -0,0 +1,54 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 16995157, guid: a811bde74b26b53498b4f6d872b09b6d, type: 3} + m_Name: DOTweenSettings + m_EditorClassIdentifier: + useSafeMode: 1 + safeModeOptions: + logBehaviour: 2 + nestedTweenFailureBehaviour: 0 + timeScale: 1 + unscaledTimeScale: 1 + useSmoothDeltaTime: 0 + maxSmoothUnscaledTime: 0.15 + rewindCallbackMode: 0 + showUnityEditorReport: 0 + logBehaviour: 0 + drawGizmos: 1 + defaultRecyclable: 0 + defaultAutoPlay: 3 + defaultUpdateType: 0 + defaultTimeScaleIndependent: 0 + defaultEaseType: 6 + defaultEaseOvershootOrAmplitude: 1.70158 + defaultEasePeriod: 0 + defaultAutoKill: 1 + defaultLoopType: 0 + debugMode: 0 + debugStoreTargetId: 1 + showPreviewPanel: 1 + storeSettingsLocation: 0 + modules: + showPanel: 0 + audioEnabled: 1 + physicsEnabled: 1 + physics2DEnabled: 1 + spriteEnabled: 1 + uiEnabled: 1 + textMeshProEnabled: 0 + tk2DEnabled: 0 + deAudioEnabled: 0 + deUnityExtendedEnabled: 0 + epoOutlineEnabled: 0 + createASMDEF: 1 + showPlayingTweens: 0 + showPausedTweens: 0 diff --git a/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset.meta b/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset.meta new file mode 100644 index 0000000..4675e87 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/DOTweenSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f3093ad85d81554e9bd2b48ad8107f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt b/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt new file mode 100644 index 0000000..f04c316 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt @@ -0,0 +1,48 @@ +using System.Threading.Tasks; +using Stary.Evo; +using UnityEngine; +namespace NamespaceX +{ + public class ClassNameXX :DomainBase,IController + { + public override void OnEnter(string param) + { + base.OnEnter(param); + Debug.Log("UnityEvo: OnEnter进入成功"); + } + + public override void OnExit() + { + base.OnExit(); + GetArchitecture().OnDispose(); + Debug.Log("UnityEvo: OnExit退出成功"); + } + + public override Task OnEnterAsync(string param) + { + Debug.Log("UnityEvo: OnEnterAsync进入成功"); + return base.OnEnterAsync(param); + } + + public override Task OnExitAsync() + { + Debug.Log("UnityEvo: OnEnterAsync退出成功"); + return base.OnExitAsync(); + } + + public IArchitecture GetArchitecture() + { + return ReturnArchitecture.Interface; + } + } + + + public class ArchitectureX : Architecture + { + protected override void Init() + { + //注册示例 + //RegisterSystem(new ScoreSystem()); + } + } +} \ No newline at end of file diff --git a/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt.meta b/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt.meta new file mode 100644 index 0000000..032cf0a --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/DomainTemplate.txt.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 021eede2852e4f19adfcb519fa2b7fbb +timeCreated: 1742540660 \ No newline at end of file diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource.meta b/Assets/00.StaryEvo/Editor/Resources/ImageSource.meta new file mode 100644 index 0000000..e1f6c74 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ImageSource.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f254dea8c7362f44786a14b71df03218 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images.meta b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images.meta new file mode 100644 index 0000000..cff725a --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6cf47ade551d4a4b8f09ce0e8474a66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png new file mode 100644 index 0000000..705b35f Binary files /dev/null and b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png differ diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png.meta b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png.meta new file mode 100644 index 0000000..f2f3696 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ImageSource/Images/shuimu.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: d3977e5818ca1d34092c4549ad995749 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset b/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset new file mode 100644 index 0000000..531e954 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d48b136013127442b937e501c984804c, type: 3} + m_Name: RKImageLib + m_EditorClassIdentifier: + m_GuidLow: 5135786987047100596 + m_GuidHigh: 15450990355053443760 + m_DataStore: + m_Storage: [] + m_Images: + - m_SerializedGuid: + m_GuidLow: 5744779408460923791 + m_GuidHigh: 5634450902290279836 + m_SerializedTextureGuid: + m_GuidLow: 2104334185301245528 + m_GuidHigh: 5284861657280228361 + m_Size: {x: 0.2, y: 0.20027064} + m_SpecifySize: 1 + m_Index: 1 + m_ImageQuality: 1 + m_Name: shuimu + m_Texture: {fileID: 0} diff --git a/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset.meta b/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset.meta new file mode 100644 index 0000000..c8118f6 --- /dev/null +++ b/Assets/00.StaryEvo/Editor/Resources/ImageSource/RKImageLib.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09fdcf33d6c60744287fac84ec8dbec8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/00.StaryEvo/Runtime/Tool/WebRequest/WebRequestSystem.cs b/Assets/00.StaryEvo/Runtime/Tool/WebRequest/WebRequestSystem.cs index 28780d4..b8f32b4 100644 --- a/Assets/00.StaryEvo/Runtime/Tool/WebRequest/WebRequestSystem.cs +++ b/Assets/00.StaryEvo/Runtime/Tool/WebRequest/WebRequestSystem.cs @@ -4,6 +4,7 @@ using System.IO; using System.Threading.Tasks; using Cysharp.Threading.Tasks; using Newtonsoft.Json; +using UnityEditor; using UnityEngine; using UnityEngine.Networking; @@ -13,6 +14,11 @@ namespace Stary.Evo { private static string authorization; + static WebRequestSystem() + { + authorization = EditorPrefs.GetString("Authorization"); + } + public static async Task Login(string url, string username, string password) { var data = new @@ -53,7 +59,7 @@ namespace Stary.Evo JsonConvert.DeserializeObject(authResponse.data.ToString()); Debug.Log("UnityEvo:AuthenticationResponse" + authResponseData.Token); authorization = authResponseData.Token; - PlayerPrefs.SetString("Authorization", authorization); + EditorPrefs.SetString("Authorization", authorization); Debug.Log("UnityEvo:登录成功"); return true; } @@ -76,7 +82,7 @@ namespace Stary.Evo /// public static async Task GetValidateToken(string url) { - authorization = PlayerPrefs.GetString("Authorization"); + authorization = EditorPrefs.GetString("Authorization"); try { using UnityWebRequest webRequest = UnityWebRequest.Get($"{url}?token={authorization}"); diff --git a/Assets/00.StaryEvo/package.json b/Assets/00.StaryEvo/package.json index eb82ce5..b02d4be 100644 --- a/Assets/00.StaryEvo/package.json +++ b/Assets/00.StaryEvo/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.main", - "version": "2.0.3", + "version": "2.0.4", "displayName": "00.StaryEvo", "description": "This is an Framework package(后台服务器版本，端口9527)", "unity": "2021.3", diff --git a/Assets/00.StaryEvoTools/Runtime/UIQueue.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue.meta new file mode 100644 index 0000000..2ea7d59 --- /dev/null +++ b/Assets/00.StaryEvoTools/Runtime/UIQueue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 837b1c9b253d1a64d95fca965f70a711 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.UIFarme/RunTime/Base.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/Base.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/Base.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Base.meta diff --git a/Assets/06.UIFarme/RunTime/Base/BasePanel.cs b/Assets/00.StaryEvoTools/Runtime/UIQueue/Base/BasePanel.cs similarity index 100% rename from Assets/06.UIFarme/RunTime/Base/BasePanel.cs rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Base/BasePanel.cs diff --git a/Assets/06.UIFarme/RunTime/Base/BasePanel.cs.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/Base/BasePanel.cs.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/Base/BasePanel.cs.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Base/BasePanel.cs.meta diff --git a/Assets/06.UIFarme/RunTime/Manager.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/Manager.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/Manager.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Manager.meta diff --git a/Assets/06.UIFarme/RunTime/Manager/PanelSystem.cs b/Assets/00.StaryEvoTools/Runtime/UIQueue/Manager/PanelSystem.cs similarity index 100% rename from Assets/06.UIFarme/RunTime/Manager/PanelSystem.cs rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Manager/PanelSystem.cs diff --git a/Assets/06.UIFarme/RunTime/Manager/PanelSystem.cs.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/Manager/PanelSystem.cs.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/Manager/PanelSystem.cs.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/Manager/PanelSystem.cs.meta diff --git a/Assets/06.UIFarme/RunTime/UITool.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/UITool.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/UITool.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/UITool.meta diff --git a/Assets/06.UIFarme/RunTime/UITool/UITool.cs b/Assets/00.StaryEvoTools/Runtime/UIQueue/UITool/UITool.cs similarity index 100% rename from Assets/06.UIFarme/RunTime/UITool/UITool.cs rename to Assets/00.StaryEvoTools/Runtime/UIQueue/UITool/UITool.cs diff --git a/Assets/06.UIFarme/RunTime/UITool/UITool.cs.meta b/Assets/00.StaryEvoTools/Runtime/UIQueue/UITool/UITool.cs.meta similarity index 100% rename from Assets/06.UIFarme/RunTime/UITool/UITool.cs.meta rename to Assets/00.StaryEvoTools/Runtime/UIQueue/UITool/UITool.cs.meta diff --git a/Assets/00.StaryEvoTools/Runtime/com.staryevo.tools.runtime.asmdef b/Assets/00.StaryEvoTools/Runtime/com.staryevo.tools.runtime.asmdef index 0118996..1978fe4 100644 --- a/Assets/00.StaryEvoTools/Runtime/com.staryevo.tools.runtime.asmdef +++ b/Assets/00.StaryEvoTools/Runtime/com.staryevo.tools.runtime.asmdef @@ -9,7 +9,7 @@ "GUID:e34a5702dd353724aa315fb8011f08c3", "GUID:ff70fce64a3314305977bdf5610ed86b", "GUID:ec45849e30ba03e4dab386099d8c697b", - "GUID:6a5d7223300a2ef48aa366288a446472" + "GUID:fad681b9bfe621d4fa07f4f69c311443" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index 0c50bb6..fd436e3 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.0.8", + "version": "1.1.0", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本，端口9527)", "unity": "2021.3", diff --git a/Assets/06.UIFarme/Editor/OverrideUICreate.cs b/Assets/06.UIFarme/Editor/OverrideUICreate.cs new file mode 100644 index 0000000..da652ee --- /dev/null +++ b/Assets/06.UIFarme/Editor/OverrideUICreate.cs @@ -0,0 +1,292 @@ +using System; +using System.Collections.Generic; +using TMPro; +using Unity.VisualScripting; +using UnityEditor; +using UnityEngine; +using UnityEngine.U2D; +using UnityEngine.UI; + +namespace Stary.Evo +{ + /* 获取内置图片 + * AssetDatabase.GetBuiltinExtraResource + * "UI/Skin/UISprite.psd" + "UI/Skin/Background.psd" + "UI/Skin/InputFieldBackground.psd" + "UI/Skin/Knob.psd" + "UI/Skin/Checkmark.psd" + "UI/Skin/DropdownArrow.psd" + "UI/Skin/UIMask.psd" + */ + public class OverrideUICreate + { + [MenuItem("GameObject/UI/Image", true)] + public static void IgnoreImage() + { + } + + [MenuItem("GameObject/UI/Image.")] + public static void CreateImage() + { + var image = Create(); + image.raycastTarget = false; + image.maskable = image.GetComponentInParent() != null || image.GetComponentInParent() != null; + image.gameObject.SetLayerRecursively(Layer.UI); + } + + [MenuItem("GameObject/UI/Raw Image", true)] + public static void IgnoreRawImage() + { + } + + [MenuItem("GameObject/UI/RawImage")] + public static void CreateRawImage() + { + var image = Create(); + image.raycastTarget = false; + image.maskable = image.GetComponentInParent() != null || image.GetComponentInParent() != null; + image.gameObject.SetLayerRecursively(Layer.UI); + } + + [MenuItem("GameObject/UI/Button")] + public static void CreateButton() + { + var image = Create("Button"); + var button = image.gameObject.AddComponent