Merge pull request #19

dev
VirtueSky · Sep 17, 2024 · 33322ea · 33322ea
2 parents 1a7f479 + b9e3159
commit 33322ea
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repo and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.0.3`
+for version `3.0.4`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.3",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.0.4",
 ```
 
 ## Includes modules

diff --git a/VirtueSky/Audio/Runtime/SoundComponent.cs b/VirtueSky/Audio/Runtime/SoundComponent.cs
@@ -33,6 +33,12 @@ private void Awake()
 
         internal void PlayAudioClip(AudioClip audioClip, bool isLooping, float volume)
         {
+            if (audioClip == null)
+            {
+                Debug.LogError($"AudioClip is null");
+                return;
+            }
+
             component.clip = audioClip;
             component.loop = isLooping;
             component.volume = volume;

diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.0.3";
+        public const string VersionSunflower = "3.0.4";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";

diff --git a/VirtueSky/Core/BaseSO.cs b/VirtueSky/Core/BaseSO.cs
@@ -1,11 +1,12 @@
 using UnityEngine;
+using VirtueSky.Inspector;
 
 
 namespace VirtueSky.Core
 {
     public class BaseSO : ScriptableObject, IEntity
     {
-        [Space(10)] [SerializeField] [TextArea(2, 5)]
+        [GUIColor(0.8f, 1.0f, 0.6f), Space(10), SerializeField, TextArea(2, 5)]
         private string description;
 
         public void Enable()

diff --git a/VirtueSky/Events/Runtime/Base_Event/BaseEvent.cs b/VirtueSky/Events/Runtime/Base_Event/BaseEvent.cs
@@ -16,7 +16,7 @@ public class BaseEvent : BaseSO, IEvent
 #if UNITY_EDITOR
 
         [ShowIf(nameof(ConditionShow))]
-        [Button("Raise")]
+        [GUIColor(0.6f, 0.9f, 1.0f), Button("Raise")]
         private void DebugRaiseEvent()
         {
             Raise();
@@ -82,11 +82,11 @@ public class BaseEvent<TType> : BaseSO, IEvent<TType>
         readonly List<IEventListener<TType>> listeners = new List<IEventListener<TType>>();
         private Action<TType> onRaised = null;
 #if UNITY_EDITOR
-        [Space(10)] [ShowIf(nameof(ConditionShow))] [SerializeField]
+        [Space(10)] [ShowIf(nameof(ConditionShow))] [GUIColor(0.6f, 0.9f, 1.0f), SerializeField]
         private TType valueDebug = default(TType);
 
         [ShowIf(nameof(ConditionShow))]
-        [Button("Raise")]
+        [GUIColor(0.6f, 0.9f, 1.0f), Button("Raise")]
         private void DebugRaiseEvent()
         {
             Raise(valueDebug);
@@ -153,14 +153,14 @@ public class BaseEvent<TType, TResult> : BaseSO, IEvent<TType, TResult>
         private Func<TType, TResult> onRaised = null;
 
 #if UNITY_EDITOR
-        [Space(10)] [ShowIf(nameof(ConditionShow))] [SerializeField]
+        [Space(10)] [ShowIf(nameof(ConditionShow))] [GUIColor(0.6f, 0.9f, 1.0f), SerializeField]
         private TType valueDebug = default(TType);
 
-        [ShowIf(nameof(ConditionShow))] [ReadOnly, SerializeField]
+        [ShowIf(nameof(ConditionShow))] [GUIColor(0.6f, 0.9f, 1.0f), ReadOnly, SerializeField]
         private TResult valueResult = default(TResult);
 
         [ShowIf(nameof(ConditionShow))]
-        [Button("Raise")]
+        [GUIColor(0.6f, 0.9f, 1.0f), Button("Raise")]
         private void DebugRaiseEvent()
         {
             valueResult = Raise(valueDebug);

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.virtuesky.sunflower",
   "displayName": "Sunflower",
   "description": "Core ScriptableObject Architecture for building Unity games",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",