From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Component/UI/Decorate/Effect/SpriteEffect.cs |   98 ++++++++++++++++++++++++-------------------------
 1 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/Main/Component/UI/Decorate/Effect/SpriteEffect.cs b/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
index d2724bd..77ba33e 100644
--- a/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
+++ b/Main/Component/UI/Decorate/Effect/SpriteEffect.cs
@@ -1,69 +1,67 @@
 锘�//--------------------------------------------------------
-//    [Author]:           绗簩涓栫晫
+//    [Author]:           鐜╀釜娓告垙
 //    [  Date ]:           Tuesday, August 22, 2017
 //--------------------------------------------------------
 using UnityEngine;
 using System.Collections;
 using UnityEngine.UI;
 
-namespace vnxbqy.UI {
 
-    [RequireComponent(typeof(Image))]
-    public class SpriteEffect:MonoBehaviour {
+[RequireComponent(typeof(Image))]
+public class SpriteEffect:MonoBehaviour {
 
-        [SerializeField]
-        Effect m_Effect = Effect.None;
+    [SerializeField]
+    Effect m_Effect = Effect.None;
 
-        CanvasAddition m_CanvasAddition;
-        public CanvasAddition canvasAddition {
-            get {
-                return this.m_CanvasAddition ?? (this.m_CanvasAddition = this.GetComponentInParent<CanvasAddition>());
+    CanvasAddition m_CanvasAddition;
+    public CanvasAddition canvasAddition {
+        get {
+            return this.m_CanvasAddition ?? (this.m_CanvasAddition = this.GetComponentInParent<CanvasAddition>());
+        }
+    }
+
+    Image m_Image;
+    public Image image {
+        get {
+            return m_Image ?? (m_Image = this.AddMissingComponent<Image>());
+        }
+    }
+
+    Material m_TwinkleMaterial;
+    Material twinleMaterial {
+        get {
+            return m_TwinkleMaterial??(m_TwinkleMaterial=MaterialUtility.GetDefaultSpriteGrayMaterial());
+        }
+    }
+
+
+
+    private void OnEnable() {
+        if(this.image != null) {
+            switch(this.m_Effect) {
+                case Effect.Gray:
+                    this.image.material = canvasAddition.spriteGrayMaterial;
+                    break;
+                case Effect.Twinkle:
+                    this.image.material = this.canvasAddition.spriteGrayMaterial;
+                    break;
+                case Effect.None:
+                    this.image.material = null;
+                    break;
+                default:
+                    break;
             }
         }
+    }
 
-        Image m_Image;
-        public Image image {
-            get {
-                return m_Image ?? (m_Image = this.AddMissingComponent<Image>());
-            }
-        }
-
-        Material m_TwinkleMaterial;
-        Material twinleMaterial {
-            get {
-                return m_TwinkleMaterial??(m_TwinkleMaterial=MaterialUtility.GetDefaultSpriteGrayMaterial());
-            }
-        }
-
-
-
-        private void OnEnable() {
-            if(this.image != null) {
-                switch(this.m_Effect) {
-                    case Effect.Gray:
-                        this.image.material = canvasAddition.spriteGrayMaterial;
-                        break;
-                    case Effect.Twinkle:
-                        this.image.material = this.canvasAddition.spriteGrayMaterial;
-                        break;
-                    case Effect.None:
-                        this.image.material = null;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        public enum Effect {
-            None,
-            Gray,
-            Twinkle,
-        }
-
+    public enum Effect {
+        None,
+        Gray,
+        Twinkle,
     }
 
 }
 
 
 
+

--
Gitblit v1.8.0