From a9d460f503f4d09a4c0e00164c6ca1ba3f8725dd Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 11 Sep 2021 19:50:15 +0800
Subject: *misc

---
 Assets/ActionTool/ActionTool_Ground_Shader.shader | 10 ++++----
 Assets/ActionTool/Editor/ActionEditor.cs          | 29 +++++++++++++++--------
 2 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'Assets/ActionTool')

diff --git a/Assets/ActionTool/ActionTool_Ground_Shader.shader b/Assets/ActionTool/ActionTool_Ground_Shader.shader
index 981eee5f..2fe0c438 100644
--- a/Assets/ActionTool/ActionTool_Ground_Shader.shader
+++ b/Assets/ActionTool/ActionTool_Ground_Shader.shader
@@ -57,7 +57,7 @@ Shader "ActionTool/ActionTool_Ground_Shader"
 			LOD 300
 
 
-			ZWrite Off
+			ZWrite On
 
 
 			// ------------------------------------------------------------------
@@ -68,7 +68,7 @@ Shader "ActionTool/ActionTool_Ground_Shader"
 				Tags { "LightMode" = "ForwardBase" }
 
 				Blend[_SrcBlend][_DstBlend]
-				ZWrite Off
+				ZWrite On
 
 				CGPROGRAM
 				#pragma target 3.0
@@ -105,7 +105,7 @@ Shader "ActionTool/ActionTool_Ground_Shader"
 				Tags { "LightMode" = "ForwardAdd" }
 				Blend[_SrcBlend] One
 				Fog { Color(0,0,0,0) } // in additive pass fog should be black
-				ZWrite Off
+				ZWrite On
 				ZTest LEqual
 
 				CGPROGRAM
@@ -237,7 +237,7 @@ Shader "ActionTool/ActionTool_Ground_Shader"
 				Tags { "LightMode" = "ForwardBase" }
 
 				Blend[_SrcBlend][_DstBlend]
-				ZWrite Off
+				ZWrite On
 
 				CGPROGRAM
 				#pragma target 2.0
@@ -271,7 +271,7 @@ Shader "ActionTool/ActionTool_Ground_Shader"
 				Tags { "LightMode" = "ForwardAdd" }
 				Blend[_SrcBlend] One
 				Fog { Color(0,0,0,0) } // in additive pass fog should be black
-				ZWrite Off
+				ZWrite On
 				ZTest LEqual
 
 				CGPROGRAM
diff --git a/Assets/ActionTool/Editor/ActionEditor.cs b/Assets/ActionTool/Editor/ActionEditor.cs
index 2abe9a2b..15b8e9f1 100644
--- a/Assets/ActionTool/Editor/ActionEditor.cs
+++ b/Assets/ActionTool/Editor/ActionEditor.cs
@@ -163,13 +163,8 @@ namespace ActionTool
 					bool isFavorite = false;
 					if (animationAssets != null && animationAssets.ContainsKey(file))
 					{
-						var labels = AssetDatabase.GetLabels(animationAssets[file]);
-						for (int j = 0; j < labels.Length; ++j)
-						{
-							if (labels[j] == "GoodAnimation")
-								isFavorite = true;
-						}
-					}
+                        isFavorite = IsFavoritAnimation(animationAssets[file]);
+                    }
 					if ((!animationAssets.ContainsKey(file) || animationAssets[file] == null) && coLoadAnimationAssets == null)
 					{
 						coLoadAnimationAssets = CoLoadAnimationAssets();
@@ -209,7 +204,18 @@ namespace ActionTool
             }
         }
 
-		IEnumerator CoLoadAnimationAssets()
+        bool IsFavoritAnimation(Object animationFile)
+        {
+            var labels = AssetDatabase.GetLabels(animationFile);
+            for (int j = 0; j < labels.Length; ++j)
+            {
+                if (labels[j] == "GoodAnimation")
+                    return true;
+            }
+            return false;
+        }
+
+        IEnumerator CoLoadAnimationAssets()
 		{
 			if (!ActionManager.HasSelectObj())
 				yield break;
@@ -237,8 +243,11 @@ namespace ActionTool
 				{
 					animationAssets.Add(file, animFile);
 				}
-				this.Repaint();
-				yield return null;
+                if (IsFavoritAnimation(animFile))
+                {
+				    this.Repaint();
+                }
+                yield return null;
 			}
 		}
 
-- 
cgit v1.1-26-g67d0