Closes #65 WorkBtn - WorkClean, WorkEngine

This commit is contained in:
IDMhan 2023-12-05 15:20:20 +09:00
parent 6f8da6455f
commit 75f31cfcc9
6080 changed files with 135268 additions and 54121 deletions

File diff suppressed because it is too large Load Diff

View File

@ -30,7 +30,7 @@ namespace BlueWaterProject
visualLook = transform.Find("UnitRoot");
ProximitySelector = GetComponent<ProximitySelector>();
rb = GetComponent<Rigidbody>();
spriteRenderer = visualLook.GetComponent<SpriteRenderer>();
spriteRenderer = visualLook.GetComponent<SpriteRenderer>();
}
protected override void Awake()
@ -44,6 +44,9 @@ namespace BlueWaterProject
base.Start();
TargetLayer = LayerMask.GetMask("Npc");
ProximitySelector.enabled = false;
UiManager.Inst.ConversationBtn.onClickEvent.AddListener(StartConversation);
UiManager.Inst.WorkBtn.onClickEvent.AddListener(OnWorkBtn);
}
protected override void FixedUpdate()
@ -213,6 +216,7 @@ namespace BlueWaterProject
interactionTarget.GetComponent<InShipNpc>()?.RestoreState();
UiManager.Inst.InShipInteraction.gameObject.SetActive(false);
UiManager.Inst.InShipInteractionInit();
}
public void EndConversation()
@ -227,5 +231,11 @@ namespace BlueWaterProject
EndInteraction();
interactionTarget.GetComponent<InShipNpc>().ChangeStateToOrderToJail();
}
private void OnWorkBtn()
{
UiManager.Inst.DefaultInShipInteractionOnOff(false);
UiManager.Inst.WorkInteractionOnOff(true);
}
}
}

View File

@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using Doozy.Runtime.Reactor.Animators;
using Doozy.Runtime.UIManager.Components;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.UI;
using Random = UnityEngine.Random;
@ -33,6 +35,11 @@ namespace BlueWaterProject
[Title("InteractionUI")]
private Transform defaultInteraction;
public Transform InShipInteraction { get; set; }
public UIButton WorkBtn { get; set; }
public UIButton OrderBtn { get; set; }
public UIButton ConversationBtn { get; set; }
public UIButton WorkCleanBtn { get; set; }
public UIButton WorkEngineBtn { get; set; }
private void Init()
@ -51,6 +58,11 @@ namespace BlueWaterProject
defaultInteraction = transform.Find("DefaultInteraction");
InShipInteraction = transform.Find("InShipPlayerInteractionUI");
WorkBtn = InShipInteraction.Find("WorkBtn").GetComponent<UIButton>();
OrderBtn = InShipInteraction.Find("OrderBtn").GetComponent<UIButton>();
ConversationBtn = InShipInteraction.Find("ConversationBtn").GetComponent<UIButton>();
WorkCleanBtn = InShipInteraction.Find("WorkCleanBtn").GetComponent<UIButton>();
WorkEngineBtn = InShipInteraction.Find("WorkEngineBtn").GetComponent<UIButton>();
}
protected override void OnAwake()
@ -65,12 +77,7 @@ namespace BlueWaterProject
//RadarTargetInit();
}
public void AddCard() //TODO Test button and function, delete later
{
Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
}
public void AimOnOff(bool isOn)
{
takeAim.SetActive(isOn);
@ -175,5 +182,27 @@ namespace BlueWaterProject
{
defaultInteraction.gameObject.SetActive(isOn);
}
public void DefaultInShipInteractionOnOff(bool isOn)
{
WorkBtn.gameObject.SetActive(isOn);
OrderBtn.gameObject.SetActive(isOn);
ConversationBtn.gameObject.SetActive(isOn);
}
public void WorkInteractionOnOff(bool isOn)
{
WorkCleanBtn.gameObject.SetActive(isOn);
WorkEngineBtn.gameObject.SetActive(isOn);
}
public void InShipInteractionInit()
{
WorkBtn.gameObject.SetActive(true);
OrderBtn.gameObject.SetActive(true);
ConversationBtn.gameObject.SetActive(true);
WorkCleanBtn.gameObject.SetActive(false);
WorkEngineBtn.gameObject.SetActive(false);
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -0,0 +1,112 @@
fileFormatVersion: 2
guid: 949e65b2b0649400c8d3e1748c49c55f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: 1
wrapV: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
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
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
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:

View File

@ -260854,7 +260854,7 @@ Material:
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0
- _OutlineWidth: 0.1
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.8333333

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: b71fb1cf411c4daf962e5456e1f96e6d
timeCreated: 1656009113
timeCreated: 1656009113
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Addons/AddonInfo.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: d22a6d3da4b34369b9b3f135c4d9dd6d
timeCreated: 1656072577
timeCreated: 1656072577
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Addons/AddonInfoDatabase.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: af115dd8573e413a83edc6207a403a73
timeCreated: 1643642953
timeCreated: 1643642953
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Automation/Generators/AssemblyDefinitionsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 590ecab8de164cd7968767ee6fda10d0
timeCreated: 1643642838
timeCreated: 1643642838
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Automation/Templates/Doozy.Editor.txt
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 89c5d07751fd40708d3351d83909818d
timeCreated: 1643642868
timeCreated: 1643642868
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Automation/Templates/Doozy.Runtime.txt
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 53e87c86d6d449fda822a3415e8f3f2f
timeCreated: 1626722152
timeCreated: 1626722152
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Drawers/CategoryNameIdUtils.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 677c56de0e3042fcacc9da457c4126cf
timeCreated: 1668085134
timeCreated: 1668085134
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Drawers/FormattedLabelDrawer.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: c04285b36fc1435bb16c2358bb460bb6
timeCreated: 1619280678
timeCreated: 1619280678
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Drawers/RandomFloatDrawer.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a052473cb93b4010a3ad6c5c3feae155
timeCreated: 1620982363
timeCreated: 1620982363
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Drawers/RandomIntDrawer.cs
uploadId: 605732

View File

@ -9,3 +9,10 @@ ScriptedImporter:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/CategoryNameItemCategoryRow.uss
uploadId: 605732

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/CategoryNameItemCategoryRow.uxml
uploadId: 605732

View File

@ -9,3 +9,10 @@ ScriptedImporter:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/CategoryNameItemNameRow.uss
uploadId: 605732

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/CategoryNameItemNameRow.uxml
uploadId: 605732

View File

@ -9,3 +9,10 @@ ScriptedImporter:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/PrefabLinkDatabaseItemRow.uss
uploadId: 605732

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/PrefabLinkDatabaseItemRow.uxml
uploadId: 605732

View File

@ -14,9 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupName: Common
Layouts:
- UxmlReference: {fileID: 9197481963319205126, guid: 54cea7f108349f44cbb7f0e0d153cd65,
type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 1fc29074d94fc3b4ca712d6d32cc5e63,
type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 921d2884992267947a311eb9eb6d1709,
type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 54cea7f108349f44cbb7f0e0d153cd65, type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 1fc29074d94fc3b4ca712d6d32cc5e63, type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 921d2884992267947a311eb9eb6d1709, type: 3}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/_LayoutGroup_Common.asset
uploadId: 605732

View File

@ -14,9 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupName: Common
Styles:
- UssReference: {fileID: 7433441132597879392, guid: 9ce449a0c2aa6c848955155eaab6b79a,
type: 3}
- UssReference: {fileID: 7433441132597879392, guid: 540249e9f4fb0244091f85332ff8cf49,
type: 3}
- UssReference: {fileID: 7433441132597879392, guid: 1251650b805391846aacd751ae9da845,
type: 3}
- UssReference: {fileID: 7433441132597879392, guid: 9ce449a0c2aa6c848955155eaab6b79a, type: 3}
- UssReference: {fileID: 7433441132597879392, guid: 540249e9f4fb0244091f85332ff8cf49, type: 3}
- UssReference: {fileID: 7433441132597879392, guid: 1251650b805391846aacd751ae9da845, type: 3}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editor/_StyleGroup_Common.asset
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 7f2939877cb34574899df2e3ed71992f
timeCreated: 1654685154
timeCreated: 1654685154
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Editors/PrefabLinkEditor.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: ad015e9d053d4b8ea4e63f2695fc47cf
timeCreated: 1616154483
timeCreated: 1616154483
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Extensions/SerializedPropertyExtensions.cs
uploadId: 605732

View File

@ -5,11 +5,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Doozy.Editor.EditorUI.Utils;
using UnityEditor;
using UnityEditor.Sprites;
using UnityEngine;
using Object = UnityEngine.Object;
// ReSharper disable MemberCanBePrivate.Global
namespace Doozy.Editor.Common.Extensions

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: af0250325505413e8662e4f767fa2bdc
timeCreated: 1645199395
timeCreated: 1645199395
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Extensions/SpriteExtensions.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 748540ec750240d7910554a1510307c6
timeCreated: 1645615974
timeCreated: 1645615974
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Extensions/TextureExtensions.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 915a06d9f5f9412cb1a469b05ae424ad
timeCreated: 1616243297
timeCreated: 1616243297
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Interfaces/IEditorDataDatabase.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 73f941da8d554284a2e0947a9f63a4a8
timeCreated: 1626725584
timeCreated: 1626725584
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Interfaces/IUpdateCallback.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 760d9d56358447c1a593aeef3bf91d52
timeCreated: 1625126583
timeCreated: 1625126583
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Layouts/CategoryNameGroupWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e8ebfdb64daf4a0c9c65ae3686aa55ba
timeCreated: 1625320870
timeCreated: 1625320870
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Layouts/CategoryNameItemCategoryRow.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: b94979d1028f4fc2b51737181ed01b38
timeCreated: 1625320858
timeCreated: 1625320858
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Layouts/CategoryNameItemNameRow.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: f0b150e8cd5c49debad47b66a6056e8b
timeCreated: 1654690237
timeCreated: 1654690237
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Layouts/PrefabLinkDatabaseItemRow.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 8becf6c5c3014addb90d28d2519b1cf2
timeCreated: 1654690276
timeCreated: 1654690276
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Layouts/PrefabLinkDatabaseWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 092e5e54911e444193752c00385094a8
timeCreated: 1611583832
timeCreated: 1611583832
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/ProductInfo.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 8af0e72cdaea46b9b5738f401a08fa3f
timeCreated: 1648228424
timeCreated: 1648228424
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/ScriptableObjects/DynamicSearchProvider.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: feebca0953c3444b91db5ba67a4450bf
timeCreated: 1616155025
timeCreated: 1616155025
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/ScriptableObjects/SingletonEditorScriptableObject.cs
uploadId: 605732

View File

@ -40,7 +40,13 @@ namespace Doozy.Editor.Common.ScriptableObjects
DelayedCall.Run(2f, Run);
return;
}
if(instance == null)
{
// Debug.Log($"[{nameof(UpdateBot)}] Update Bot instance is null");
return;
}
#if DOOZY_42
Debug.Log($"[{nameof(UpdateBot)}] Update Bot cannot automatically execute if 42 is enabled");
return;
@ -112,19 +118,26 @@ namespace Doozy.Editor.Common.ScriptableObjects
{
private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
{
//look if the UpdateBot was deleted
if (deletedAssets.Any(asset => asset.Contains(nameof(UpdateBot))))
{
// Debug.Log($"[{nameof(UpdateBot)}] Update Bot was deleted");
return;
}
#if DOOZY_42
// Debug.Log($"[{nameof(UpdateBot)}] Update Bot cannot automatically execute if 42 is enabled");
return;
#endif
#pragma warning disable CS0162
#pragma warning disable CS0162 //Unreachable code detected
if (!instance.Update)
return;
StopAutomatedUpdate();
RemoveOldFiles();
Execute();
#pragma warning restore CS0162
#pragma warning restore CS0162 //Unreachable code detected
}
}

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 5bb85a0dab364b12b45cd193d259769d
timeCreated: 1642759476
timeCreated: 1642759476
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/ScriptableObjects/UpdateBot.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: f921603cb13a44eaac7fc42934ee94e8
timeCreated: 1645618407
timeCreated: 1645618407
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Utils/AssetUtils.cs
uploadId: 605732

View File

@ -7,19 +7,37 @@ using System.Linq;
using System.Reflection;
using System.Text;
using UnityEditor;
using UnityEditor.Build;
using UnityEngine;
// ReSharper disable MemberCanBePrivate.Global
namespace Doozy.Editor.Common.Utils
{
public static class DefineSymbolsUtils
{
private static readonly StringBuilder StringBuilderContainer = new StringBuilder();
{
private static readonly StringBuilder StringBuilderContainer = new StringBuilder();
/// <summary> Add the passed global define if it's not already present </summary>
public static void AddGlobalDefine(string id)
{
bool flag = false;
int num = 0;
/// <summary> Add the passed global define if it's not already present </summary>
public static void AddGlobalDefine(string id)
{
bool flag = false;
int num = 0;
#if UNITY_2023_1_OR_NEWER
foreach (BuildTargetGroup buildTargetGroup in (BuildTargetGroup[]) Enum.GetValues(typeof(BuildTargetGroup)))
if (IsValidBuildTargetGroup(buildTargetGroup))
{
var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
string defineSymbolsForGroup = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget);
if (Array.IndexOf(defineSymbolsForGroup.Split(';'), id) != -1) continue;
flag = true;
++num;
string defines = defineSymbolsForGroup + (defineSymbolsForGroup.Length > 0 ? ";" + id : id);
PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, defines);
}
#else
foreach (BuildTargetGroup buildTargetGroup in (BuildTargetGroup[]) Enum.GetValues(typeof(BuildTargetGroup)))
if (IsValidBuildTargetGroup(buildTargetGroup))
{
@ -31,83 +49,122 @@ namespace Doozy.Editor.Common.Utils
PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, defines);
}
if (!flag) return;
Debug.Log($"Added global define \"{id}\" to {num} BuildTargetGroups");
}
#endif
/// <summary> Remove the passed global define if it's present</summary>
public static void RemoveGlobalDefine(string id)
{
bool flag = false;
int num = 0;
foreach (BuildTargetGroup buildTargetGroup in (BuildTargetGroup[]) Enum.GetValues(typeof(BuildTargetGroup)))
if (IsValidBuildTargetGroup(buildTargetGroup))
{
string[] array = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup).Split(';');
if (Array.IndexOf(array, id) == -1) continue;
flag = true;
++num;
StringBuilderContainer.Length = 0;
foreach (string t in array)
if (t != id)
{
if (StringBuilderContainer.Length > 0) StringBuilderContainer.Append(';');
StringBuilderContainer.Append(t);
}
if (!flag) return;
Debug.Log($"Added global define \"{id}\" to {num} BuildTargetGroups");
}
PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, StringBuilderContainer.ToString());
}
/// <summary> Remove the passed global define if it's present</summary>
public static void RemoveGlobalDefine(string id)
{
bool flag = false;
int num = 0;
#if UNITY_2023_1_OR_NEWER
foreach (BuildTargetGroup buildTargetGroup in (BuildTargetGroup[])Enum.GetValues(typeof(BuildTargetGroup)))
if (IsValidBuildTargetGroup(buildTargetGroup))
{
var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
string[] array = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget).Split(';');
if (Array.IndexOf(array, id) == -1) continue;
flag = true;
++num;
StringBuilderContainer.Length = 0;
foreach (string t in array)
if (t != id)
{
if (StringBuilderContainer.Length > 0) StringBuilderContainer.Append(';');
StringBuilderContainer.Append(t);
}
StringBuilderContainer.Length = 0;
if (!flag) return;
Debug.Log($"Removed global define \"{id}\" from {num} BuildTargetGroups");
}
PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, StringBuilderContainer.ToString());
}
#else
/// <summary>
/// Returns TRUE if the given global define is present in all the <see cref="T:UnityEditor.BuildTargetGroup" />
/// or only in the given <see cref="T:UnityEditor.BuildTargetGroup" />, depending on passed parameters.
/// <para />
/// </summary>
/// <param name="id"></param>
/// <param name="buildTargetGroup"><see cref="T:UnityEditor.BuildTargetGroup" />to use. Leave NULL to check in all of them.</param>
public static bool HasGlobalDefine(string id, BuildTargetGroup? buildTargetGroup = null)
{
BuildTargetGroup[] buildTargetGroupArray = buildTargetGroup.HasValue ? new[] {buildTargetGroup.Value} : (BuildTargetGroup[]) Enum.GetValues(typeof(BuildTargetGroup));
return buildTargetGroupArray.Where(IsValidBuildTargetGroup).Any(buildTargetGroup1 => Array.IndexOf(PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup1).Split(';'), id) != -1);
}
foreach (BuildTargetGroup buildTargetGroup in (BuildTargetGroup[])Enum.GetValues(typeof(BuildTargetGroup)))
if (IsValidBuildTargetGroup(buildTargetGroup))
{
string[] array = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup).Split(';');
if (Array.IndexOf(array, id) == -1) continue;
flag = true;
++num;
StringBuilderContainer.Length = 0;
foreach (string t in array)
if (t != id)
{
if (StringBuilderContainer.Length > 0) StringBuilderContainer.Append(';');
StringBuilderContainer.Append(t);
}
private static bool IsValidBuildTargetGroup(BuildTargetGroup group)
{
if (group == BuildTargetGroup.Unknown) return false;
var unityEditorModuleManagerType = Type.GetType("UnityEditor.Modules.ModuleManager, UnityEditor.dll");
if (unityEditorModuleManagerType == null) return true;
MethodInfo method1 = unityEditorModuleManagerType.GetMethod("GetTargetStringFromBuildTargetGroup", BindingFlags.Static | BindingFlags.NonPublic);
MethodInfo method2 = typeof(PlayerSettings).GetMethod("GetPlatformName", BindingFlags.Static | BindingFlags.NonPublic);
object[] parameters = new object[] {group};
if (method1 == null) return true;
string str1 = (string) method1.Invoke(null, parameters);
if (method2 == null) return true;
string str2 = (string) method2.Invoke(null, new object[] {group});
if (string.IsNullOrEmpty(str1)) return !string.IsNullOrEmpty(str2);
return true;
}
PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, StringBuilderContainer.ToString());
}
#endif
StringBuilderContainer.Length = 0;
if (!flag) return;
Debug.Log($"Removed global define \"{id}\" from {num} BuildTargetGroups");
}
private class SymbolsCleaner : UnityEditor.AssetModificationProcessor
{
private static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetOptions options)
{
bool deletingDoozy = assetPath.Equals(EditorPath.path);
// Debug.Log("OnWillDeleteAsset");
// Debug.Log(assetPath);
// Debug.Log(DoozyPath.BasePath);
// Debug.Log("Deleting Doozy: " + deletingDoozy);
if (deletingDoozy)
{
RemoveGlobalDefine("INPUT_SYSTEM_PACKAGE");
RemoveGlobalDefine("LEGACY_INPUT_MANAGER");
}
return AssetDeleteResult.DidNotDelete;
}
}
}
}
/// <summary>
/// Returns TRUE if the given global define is present in all the <see cref="T:UnityEditor.BuildTargetGroup" />
/// or only in the given <see cref="T:UnityEditor.BuildTargetGroup" />, depending on passed parameters.
/// <para />
/// </summary>
/// <param name="id"></param>
/// <param name="buildTargetGroup"><see cref="T:UnityEditor.BuildTargetGroup" />to use. Leave NULL to check in all of them.</param>
public static bool HasGlobalDefine(string id, BuildTargetGroup? buildTargetGroup = null)
{
BuildTargetGroup[] buildTargetGroupArray = buildTargetGroup.HasValue ? new[] { buildTargetGroup.Value } : (BuildTargetGroup[])Enum.GetValues(typeof(BuildTargetGroup));
foreach (BuildTargetGroup btg in buildTargetGroupArray.Where(IsValidBuildTargetGroup))
{
#if UNITY_2023_1_OR_NEWER
if (Array.IndexOf(PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(btg)).Split(';'), id) != -1)
return true;
#else
if (Array.IndexOf(PlayerSettings.GetScriptingDefineSymbolsForGroup(btg).Split(';'), id) != -1)
return true;
#endif
}
return false;
}
private static bool IsValidBuildTargetGroup(BuildTargetGroup group)
{
if (group == BuildTargetGroup.Unknown) return false;
var unityEditorModuleManagerType = Type.GetType("UnityEditor.Modules.ModuleManager, UnityEditor.dll");
if (unityEditorModuleManagerType == null) return true;
MethodInfo method1 = unityEditorModuleManagerType.GetMethod("GetTargetStringFromBuildTargetGroup", BindingFlags.Static | BindingFlags.NonPublic);
MethodInfo method2 = typeof(PlayerSettings).GetMethod("GetPlatformName", BindingFlags.Static | BindingFlags.NonPublic);
object[] parameters = new object[] { group };
if (method1 == null) return true;
string str1 = (string)method1.Invoke(null, parameters);
if (method2 == null) return true;
string str2 = (string)method2.Invoke(null, new object[] { group });
if (string.IsNullOrEmpty(str1)) return !string.IsNullOrEmpty(str2);
return true;
}
private class SymbolsCleaner : AssetModificationProcessor
{
private static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetOptions options)
{
bool deletingDoozy = assetPath.Equals(EditorPath.path);
// Debug.Log("OnWillDeleteAsset");
// Debug.Log(assetPath);
// Debug.Log(DoozyPath.BasePath);
// Debug.Log("Deleting Doozy: " + deletingDoozy);
if (deletingDoozy)
{
RemoveGlobalDefine("INPUT_SYSTEM_PACKAGE");
RemoveGlobalDefine("LEGACY_INPUT_MANAGER");
}
return AssetDeleteResult.DidNotDelete;
}
}
}
}

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 6f2a8f4c28a4430abbaa1d00e69a507f
timeCreated: 1641474442
timeCreated: 1641474442
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Utils/DefineSymbolsUtils.cs
uploadId: 605732

View File

@ -4,7 +4,6 @@
using System;
using UnityEditor;
using UnityEngine;
// ReSharper disable DelegateSubtraction
// ReSharper disable MemberCanBePrivate.Global
@ -15,32 +14,174 @@ namespace Doozy.Editor.Common.Utils
/// <summary> Executes a delayed call in the Editor </summary>
public class DelayedCall
{
private readonly float m_Delay;
private readonly Action m_Callback;
private readonly float m_StartupTime;
/// <summary> Triggered when the delayed call starts </summary>
public Action onStart { get; set; }
/// <summary> Triggered every frame until the delayed call finishes </summary>
public Action onUpdate { get; set; }
/// <summary> Triggered when the delayed call finishes </summary>
public Action onFinish { get; set; }
/// <summary> Triggered when the delayed call is canceled </summary>
public Action onCancel { get; set; }
/// <summary> Delay in seconds </summary>
public float delay { get; private set; }
/// <summary> Checks if the delayed call is running </summary>
public bool isRunning { get; private set; }
/// <summary> EditorApplication.timeSinceStartup when the delayed call started </summary>
private double startupTime { get; set; }
/// <summary>
/// Creates a delayed call. You need to set a delay and a callback (onFinish) before starting it.
/// eg. DelayedCall dc = new DelayedCall().SetDelay(1f).SetOnFinish(() => Debug.Log("Delayed call finished")).Start();
/// </summary>
public DelayedCall()
{
}
/// <summary>
/// Creates a delayed call that will execute after the specified delay.
/// This delayed call will automatically start.
/// </summary>
/// <param name="delay"> Delay in seconds </param>
/// <param name="callback"> Callback to execute when the delayed call finishes (onFinish) </param>
public DelayedCall(float delay, Action callback)
{
m_Delay = delay;
m_Callback = callback;
m_StartupTime = Time.realtimeSinceStartup;
EditorApplication.update += Update;
this.delay = delay;
onFinish = callback;
Start();
}
private void Update()
{
if (EditorApplication.timeSinceStartup - (double) m_StartupTime < m_Delay) return;
onUpdate?.Invoke();
if (EditorApplication.timeSinceStartup - startupTime < delay) return;
if (EditorApplication.update != null) EditorApplication.update -= Update;
m_Callback?.Invoke();
onFinish?.Invoke();
}
/// <summary> Starts the delayed call </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall Start()
{
startupTime = EditorApplication.timeSinceStartup;
onStart?.Invoke();
isRunning = true;
if (EditorApplication.update != null) EditorApplication.update -= Update;
EditorApplication.update += Update;
return this;
}
/// <summary> Stops the delayed call from running </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall Stop()
{
isRunning = false;
if (EditorApplication.update != null) EditorApplication.update -= Update;
return this;
}
/// <summary> Cancels the delayed call and triggers the onCancel callback </summary>
public void Cancel()
{
if (EditorApplication.update != null)
EditorApplication.update -= Update;
Stop();
onCancel?.Invoke();
}
/// <summary> Sets the delay in seconds </summary>
/// <param name="value"> Delay in seconds </param>
/// <returns> Self (for method chaining) </returns>
public DelayedCall SetDelay(float value)
{
delay = value;
return this;
}
/// <summary> Adds a callback that will be triggered when the delayed call starts </summary>
/// <param name="callback"> Callback to add </param>
/// <returns> Self (for method chaining) </returns>
public DelayedCall OnStart(Action callback)
{
onStart += callback;
return this;
}
/// <summary> Adds a callback that will be triggered every frame until the delayed call finishes </summary>
/// <param name="callback"> Callback to add </param>
/// <returns> Self (for method chaining) </returns>
public DelayedCall OnUpdate(Action callback)
{
onUpdate += callback;
return this;
}
/// <summary> Adds a callback that will be triggered when the delayed call finishes </summary>
/// <param name="callback"> Callback to add </param>
/// <returns> Self (for method chaining) </returns>
public DelayedCall OnFinish(Action callback)
{
onFinish += callback;
return this;
}
/// <summary> Adds a callback that will be triggered when the delayed call is canceled </summary>
/// <param name="callback"> Callback to add </param>
/// <returns> Self (for method chaining) </returns>
public DelayedCall OnCancel(Action callback)
{
onCancel += callback;
return this;
}
/// <summary> Removes all callbacks that will be triggered when the delayed call starts </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall ClearOnStart()
{
onStart = null;
return this;
}
/// <summary> Removes all callbacks that will be triggered every frame until the delayed call finishes </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall ClearOnUpdate()
{
onUpdate = null;
return this;
}
/// <summary> Removes all callbacks that will be triggered when the delayed call finishes </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall ClearOnFinish()
{
onFinish = null;
return this;
}
/// <summary> Removes all callbacks that will be triggered when the delayed call is canceled </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall ClearOnCancel()
{
onCancel = null;
return this;
}
/// <summary> Removes all callbacks that will be triggered when the delayed call starts, every frame until the delayed call finishes, when the delayed call finishes and when the delayed call is canceled </summary>
/// <returns> Self (for method chaining) </returns>
public DelayedCall ClearAllCallbacks()
{
ClearOnStart();
ClearOnUpdate();
ClearOnFinish();
ClearOnCancel();
return this;
}
public static DelayedCall Run(float delay, Action callback) =>
new DelayedCall(delay, callback);
}
}
}

View File

@ -9,3 +9,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Utils/DelayedCall.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 7af242d2661a4631a95b65ee500b2ee8
timeCreated: 1640634502
timeCreated: 1640634502
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Utils/DomainReloadHandler.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 738cba0ec8c74656af03b824010153c9
timeCreated: 1615110797
timeCreated: 1615110797
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Common/Utils/FileGenerator.cs
uploadId: 605732

View File

@ -9,3 +9,10 @@ ScriptedImporter:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Editor/DashboardWindow.uss
uploadId: 605732

View File

@ -8,3 +8,10 @@ ScriptedImporter:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Editor/DashboardWindow.uxml
uploadId: 605732

View File

@ -14,5 +14,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupName: Dashboard
Layouts:
- UxmlReference: {fileID: 9197481963319205126, guid: 69d8390eebc63d24fb849d6b341c0fd2,
type: 3}
- UxmlReference: {fileID: 9197481963319205126, guid: 69d8390eebc63d24fb849d6b341c0fd2, type: 3}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Editor/_LayoutGroup_Dashboard.asset
uploadId: 605732

View File

@ -14,5 +14,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
GroupName: Dashboard
Styles:
- UssReference: {fileID: 7433441132597879392, guid: b5ba34a27c9b77748858086de5b45a60,
type: 3}
- UssReference: {fileID: 7433441132597879392, guid: b5ba34a27c9b77748858086de5b45a60, type: 3}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Editor/_StyleGroup_Dashboard.asset
uploadId: 605732

View File

@ -94,3 +94,10 @@ TextureImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Images/Backgrounds/DashboardBackground.png
uploadId: 605732

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Images/Backgrounds/_TextureGroup_Backgrounds_Dashboard.asset
uploadId: 605732

View File

@ -16,7 +16,6 @@ using Doozy.Editor.Interfaces;
using Doozy.Editor.Reactor.Internal;
using Doozy.Editor.UIElements;
using Doozy.Runtime.Common.Extensions;
using Doozy.Runtime.Reactor;
using Doozy.Runtime.Reactor.Extensions;
using Doozy.Runtime.Reactor.Internal;
using Doozy.Runtime.Reactor.Reactions;
@ -47,7 +46,7 @@ namespace Doozy.Editor.Dashboard.Windows
private const int k_TitleFontSize = 18;
private const int k_SubtitleFontSize = 14;
private string selectedTab { get; set; }
internal string selectedTab { get; set; }
private string selectedTabKey => EditorPrefsKey($"{nameof(selectedTab)}");
private static IEnumerable<Texture2D> dashboardIconTextures => EditorSpriteSheets.EditorUI.Icons.Dashboard;
@ -122,7 +121,11 @@ namespace Doozy.Editor.Dashboard.Windows
.GetTexture2DReaction(dashboardIconTextures)
.SetEditorHeartbeat();
root.schedule.Execute(() => UpdateDoozyIconSize(EditorPrefs.GetBool(sideMenuIsCollapsedKey, false) ? k_MinIconSize : sideMenu.customWidth));
root.schedule.Execute(() =>
{
UpdateDoozyIconSize(EditorPrefs.GetBool(sideMenuIsCollapsedKey, false) ? k_MinIconSize : sideMenu.customWidth);
});
dashboardIconImage.RegisterCallback<PointerEnterEvent>(evt => reaction?.Play());
dashboardIconImage.AddManipulator(new Clickable(() => reaction?.Play()));
@ -171,6 +174,12 @@ namespace Doozy.Editor.Dashboard.Windows
.AddChild(dashboardTitleLabel)
.AddChild(dashboardSubtitleLabel);
if (sideMenuIsCollapsed)
{
dashboardTitleContainer.SetStyleOpacity(0f);
dashboardIconImage.SetStyleLeft(DesignUtils.k_Spacing);
}
sideMenu.headerContainer
.SetStyleDisplay(DisplayStyle.Flex)
.AddChild
@ -259,6 +268,8 @@ namespace Doozy.Editor.Dashboard.Windows
sideMenuButton.SetToggleAccentColor(((IDashboardWindowLayout)customWindowLayout).selectableAccentColor);
sideMenuButton.name = l.layoutName;
//SIDE MENU BUTTON - ON VALUE CHANGED
//show the appropriate window layout when the value of the side menu button changes
sideMenuButton.OnValueChanged += evt =>
@ -267,6 +278,7 @@ namespace Doozy.Editor.Dashboard.Windows
contentContainer.Clear();
contentContainer.Add(customWindowLayout);
EditorPrefs.SetString(selectedTabKey, l.layoutName);
selectedTab = l.layoutName;
};
}
@ -388,6 +400,5 @@ namespace Doozy.Editor.Dashboard.Windows
{
root.AddChild(footerContainer);
}
}
}

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: f8ff3fb76f814af1963be8e1a804c84c
timeCreated: 1655898159
timeCreated: 1655898159
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/Windows/DoozyDashboardWindow.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e5638362ba7e480d9c30f495984a1b68
timeCreated: 1678131399
timeCreated: 1678131399
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardAboutWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 903da6fa23174e039f311ea5d1a846c7
timeCreated: 1655927470
timeCreated: 1655927470
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardAddonsWindowLayout.cs
uploadId: 605732

View File

@ -21,7 +21,7 @@ namespace Doozy.Editor.Dashboard.WindowsLayouts
{
public bool isValid => validLayoutsCount > 0;
public int order => 50;
public int order => 10;
public override string layoutName => "Databases";
public override Texture2D staticIconTexture => EditorTextures.EditorUI.Icons.GenericDatabase;

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 9d2f9e194fe3438485b4a57a89206a5d
timeCreated: 1655927094
timeCreated: 1655927094
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardDatabasesWindowLayout.cs
uploadId: 605732

View File

@ -21,7 +21,7 @@ namespace Doozy.Editor.Dashboard.WindowsLayouts
{
public bool isValid => true;
public int order => 900;
public int order => 440;
public override string layoutName => "Editor UI";
public sealed override List<Texture2D> animatedIconTextures => EditorSpriteSheets.EditorUI.Icons.EditorUI;

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 7ea23acb0c3641e08931b1058e8dce79
timeCreated: 1655968990
timeCreated: 1655968990
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardEditorUIWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: e4e697208c274a7293a2f59d4e92a466
timeCreated: 1655912012
timeCreated: 1655912012
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardHelpWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a0ab5d21367f4f50b52030592b1090ac
timeCreated: 1678146717
timeCreated: 1678146717
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardHomeWindowLayout.HomeSection.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 4e4c10fb071d4db4a5927658650c26f4
timeCreated: 1678147854
timeCreated: 1678147854
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardHomeWindowLayout.QuickActionSection.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 58fc62a0a9fd4d3fb6b0ff60ec8291c0
timeCreated: 1655926760
timeCreated: 1655926760
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardHomeWindowLayout.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 0d6157fcb2404b6fa5493745858f8579
timeCreated: 1678148168
timeCreated: 1678148168
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardHomeWindowQuickActions.cs
uploadId: 605732

View File

@ -22,7 +22,7 @@ namespace Doozy.Editor.Dashboard.WindowsLayouts
{
public bool isValid => validLayoutsCount > 0;
public int order => 890;
public int order => 1000;
public override string layoutName => "Settings";
public sealed override List<Texture2D> animatedIconTextures => EditorSpriteSheets.EditorUI.Icons.Settings;

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: bc99588449774511adb90293ad317cad
timeCreated: 1655927364
timeCreated: 1655927364
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Dashboard/WindowsLayouts/DashboardSettingsWindowLayout.cs
uploadId: 605732

View File

@ -15,14 +15,17 @@ MonoBehaviour:
DatabaseName: Editor Colors
DatabaseDescription: Collections of Colors used in the Editor
Database:
- {fileID: 11400000, guid: 7c3b0c463497e644d96f1ec70a93c063, type: 2}
- {fileID: 11400000, guid: ab84a950b6837974a84244f70b2c4dba, type: 2}
- {fileID: 11400000, guid: c22609bfe63e3a74681c85c4119d0eae, type: 2}
- {fileID: 11400000, guid: 5e576459bef7bde408e40affc1fa0898, type: 2}
- {fileID: 11400000, guid: b947be3bcea91e640af948937bb14759, type: 2}
- {fileID: 11400000, guid: c6cda8f879189d24dbde39b29bbc49d0, type: 2}
- {fileID: 11400000, guid: 04074e268a6805f43b96062b0094cd66, type: 2}
- {fileID: 11400000, guid: 1266caa45597d8a45a108143e34617b3, type: 2}
- {fileID: 11400000, guid: 6b78d633d7e82b14eab693b75ba6aa98, type: 2}
- {fileID: 11400000, guid: ed0965bdca9f8ae46998c1febb8b20df, type: 2}
- {fileID: 11400000, guid: 7fb07497fa973504c93708d9db21b05e, type: 2}
- {fileID: 11400000, guid: a4ecabf25ccd50f4e940cb9c43bed529, type: 2}
- {fileID: 11400000, guid: 2e6af9a8d5f66da45bcf38449daea187, type: 2}
- {fileID: 11400000, guid: f8b7d94c24361d54ca347499c8196e4d, type: 2}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataColorDatabase.asset
uploadId: 605732

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataFontDatabase.asset
uploadId: 605732

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataLayoutDatabase.asset
uploadId: 605732

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataMicroAnimationDatabase.asset
uploadId: 605732

View File

@ -15,13 +15,16 @@ MonoBehaviour:
DatabaseName: Editor SelectableColors
DatabaseDescription: Collections of SelectableColors used in the Editor
Database:
- {fileID: 11400000, guid: 19d88f70daae7994dbbac328cb8ec5f8, type: 2}
- {fileID: 11400000, guid: ce1adab48641be948ab59368c956b292, type: 2}
- {fileID: 11400000, guid: 2236038c5e970dc498edaa7f3be98650, type: 2}
- {fileID: 11400000, guid: d07bf33c06289454ca7cd841b38eee42, type: 2}
- {fileID: 11400000, guid: 74bab1c0dcbc2fa459e03e45697b47a8, type: 2}
- {fileID: 11400000, guid: 74ca398a6761fb645b35ebe9324a1095, type: 2}
- {fileID: 11400000, guid: 21f105703d2721e4d9bcd8be4fa42fb9, type: 2}
- {fileID: 11400000, guid: 14f967e41b878c543aecf08c3b6abb63, type: 2}
- {fileID: 11400000, guid: 05581089df3d0ec4a951deee2e51d136, type: 2}
- {fileID: 11400000, guid: acfcbce914da46f459e359da80f7320a, type: 2}
- {fileID: 11400000, guid: ca78851bbfa336a40819f8c35b968a6b, type: 2}
- {fileID: 11400000, guid: 7bee4f4ab61c05741985a2e4426f8002, type: 2}
- {fileID: 11400000, guid: 144f2aea406528c46aedb4396818cda0, type: 2}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataSelectableColorDatabase.asset
uploadId: 605732

View File

@ -15,6 +15,7 @@ MonoBehaviour:
DatabaseName: Editor SpriteSheets
DatabaseDescription: Collection of SpriteSheets used in the Editor
Database:
- {fileID: 11400000, guid: 164e9e1b9f436a74ea45d905a375cead, type: 2}
- {fileID: 11400000, guid: 64119521d701266418493433669b830a, type: 2}
- {fileID: 11400000, guid: b4c224f7b48e88e4db035e7ce60ae2e8, type: 2}
- {fileID: 11400000, guid: 958a40b671e80c54bb9198284b536b9e, type: 2}
@ -28,6 +29,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: ea2744c5a1a8afe428e22ef395182ca2, type: 2}
- {fileID: 11400000, guid: 4d9a560e5bef2b74791a12099dca3411, type: 2}
- {fileID: 11400000, guid: badafcb649f6d8b4486b4dcabf1e9254, type: 2}
- {fileID: 11400000, guid: bb8c70699e8be3c41851462477dad107, type: 2}
- {fileID: 11400000, guid: 5203cbeb7c4095f40922d8519dfb4767, type: 2}
- {fileID: 11400000, guid: 8b1fd8442ea40b3488f7b4cd28aeb7db, type: 2}
- {fileID: 11400000, guid: 106c1fdbfce99d540b3a622cb95f78e5, type: 2}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataSpriteSheetDatabase.asset
uploadId: 605732

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataStyleDatabase.asset
uploadId: 605732

View File

@ -15,6 +15,7 @@ MonoBehaviour:
DatabaseName: Editor Textures
DatabaseDescription: Collection of Textures used in the Editor
Database:
- {fileID: 11400000, guid: 40260dd3187850e4ba55bfa145e708ff, type: 2}
- {fileID: 11400000, guid: 9a5adb9bb6ce4584d94d152695e4d681, type: 2}
- {fileID: 11400000, guid: 54fc8207348e6da4fbabaf4c4d95c42b, type: 2}
- {fileID: 11400000, guid: b4142c3bc2d62984fa63e559281341f1, type: 2}
@ -29,6 +30,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 821e42e22f9bb824cb0a33129c6a3a59, type: 2}
- {fileID: 11400000, guid: c1903a27f1ea32541a9f8916f7d99c9c, type: 2}
- {fileID: 11400000, guid: 32cc7b0682f8d0349afaf97df07f6986, type: 2}
- {fileID: 11400000, guid: c12309ec7bc3daf42863ee8a8099bd2f, type: 2}
- {fileID: 11400000, guid: 954d610b1f407424fae4c2751272bf67, type: 2}
- {fileID: 11400000, guid: 34ae48c4110448546bb0413a96f03cae, type: 2}
- {fileID: 11400000, guid: 1c11dd9f49d1c2444bc72051736df7bb, type: 2}

View File

@ -6,3 +6,10 @@ NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorDataTextureDatabase.asset
uploadId: 605732

View File

@ -1,8 +1,15 @@
fileFormatVersion: 2
guid: 35cb5a84d2d58ae44bd32a5ce77a45b9
guid: e0a7f0137d3c27e43bc012148161cb47
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Data/EditorUISettings.asset
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a26f5b1a96ac407593c1a911c02b7063
timeCreated: 1644596451
timeCreated: 1644596451
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/Doozy.Editor.md
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: a4300b7182f34f02a6d36226d0bc9ebb
timeCreated: 1615466821
timeCreated: 1615466821
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorPath.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: d4c1ee6a24c840f68127f1e43a31dcf4
timeCreated: 1616339273
timeCreated: 1616339273
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorColorsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 32e0dd5d50b543d1a91972e36df25d9b
timeCreated: 1616242366
timeCreated: 1616242366
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorFontsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: cbb9961adb9f4afda69b758c40de02bf
timeCreated: 1616485328
timeCreated: 1616485328
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorLayoutsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: b1c004ac866f4f9abb4382181a093930
timeCreated: 1616428727
timeCreated: 1616428727
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorMicroAnimationsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 79602a316dfd442ea02e84c1b64d1433
timeCreated: 1616967671
timeCreated: 1616967671
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorSelectableColorsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 0b3b166bf7de49b591f6fcc1050bbbfc
timeCreated: 1645274740
timeCreated: 1645274740
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorSpriteSheetsGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: 2c00fded322242eab4a8dea71feaa167
timeCreated: 1616490686
timeCreated: 1616490686
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorStylesGenerator.cs
uploadId: 605732

View File

@ -1,3 +1,10 @@
fileFormatVersion: 2
guid: ed8118dcb0a14805b7c87f51388e5a09
timeCreated: 1616414286
timeCreated: 1616414286
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Generators/EditorTexturesGenerator.cs
uploadId: 605732

View File

@ -5,3 +5,10 @@ TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Templates/Copyright.txt
uploadId: 605732

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Templates/EditorColors.cst
uploadId: 605732

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Templates/EditorDataColorPalette.cst
uploadId: 605732

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Templates/EditorDataFontFamily.cst
uploadId: 605732

View File

@ -5,3 +5,10 @@ DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 249738
packageName: Doozy UI Manager
packageVersion: 2023.1.2
assetPath: Assets/Doozy/Editor/EditorUI/Automation/Templates/EditorDataLayoutGroup.cst
uploadId: 605732

Some files were not shown because too many files have changed in this diff Show More