删除无用log; 优化数据初始化;

NoSLoofah · NoSLoofah · commit 105ed2548456 · 2024-01-12T16:29:15.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,75 @@
+# This .gitignore file should be placed at the root of your Unity project directory
+#
+# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
+#
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Recordings can get excessive in size
+/[Rr]ecordings/
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
+
+# Visual Studio cache directory
+.vs/
+
+# idea
+.idea/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.aab
+*.unitypackage
+*.app
+
+# Crashlytics generated file
+crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
diff --git a/.vsconfig b/.vsconfig
@@ -0,0 +1,6 @@
+﻿{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffBase/Buff.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffBase/Buff.cs
@@ -71,7 +71,6 @@ public virtual void OnBuffAwake()
             Layer = 0;
             ModifyLayer(1);
             firstFrame = true;
-            Debug.Log(Layer);
         }
         public abstract void OnBuffRemove();
 
@@ -80,7 +79,6 @@ public virtual void OnBuffDestroy()
             if (mutilAddType == BuffMutilAddType.multipleLayer || mutilAddType == BuffMutilAddType.multipleLayerAndResetTime)
             {
                 ModifyLayer(-Layer);
-                isEffective = false;
             }
             RealModifyLayer();
         }
@@ -145,6 +143,7 @@ public void OnBuffUpdate()
                     timer = duration;
                     ModifyLayer(-1);
                 }
+                else isEffective = false;
             }
             RealModifyLayer();
             if (!runTickTimer) return;
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffHandler/BuffHandler.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/BuffHandler/BuffHandler.cs
@@ -34,27 +34,6 @@ private void AddBuff(IBuff buff, GameObject caster)
             bf.Initialize(this, caster);
             bf.OnBuffAwake();
 
-            //Tag处理：
-            //只在有BuffTagManager注册时处理互斥
-            //特殊的None：如果tag为none则认为不会有任何Tag处理
-            //if (buffTagManager != null && bf.BuffTag != BuffTag.none)
-            //{
-            //    for (int i = buffs.Count - 1; i >= 0; i--)
-            //    {
-            //        //首先：如果有已有buff能抵消新buff，则直接抵消
-            //        if (buffs.Any(b => buffTagManager.IsTagRemovedBy(bf.BuffTag, b.BuffTag)))
-            //        {
-            //            bf.OnBuffDestroy();
-            //            return;
-            //        }
-            //        //之后：如果新buff没有被抵消，则新buff抵消已有的buff
-            //        if (buffTagManager.IsTagConflictWith(bf.BuffTag, buffs[i].BuffTag))
-            //        {
-            //            InteruptBuff(buffs[i]);
-            //        }
-            //    }
-            //}
-
             //确定能添加Buff时
             onAddBuff?.Invoke();
             //检查是否已有同样的Buff
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Editor/BitType/CustomBitBuffTagManager.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Editor/BitType/CustomBitBuffTagManager.cs
@@ -14,18 +14,18 @@ private void OnEnable()
         }
         public override void OnInspectorGUI()
         {
-            serializedObject.UpdateIfRequiredOrScript();
+            //serializedObject.UpdateIfRequiredOrScript();
 
-            EditorGUILayout.BeginHorizontal();
-            EditorGUILayout.PropertyField(data);
-            if (GUILayout.Button(new GUIContent("New")))
-            {
+            //EditorGUILayout.BeginHorizontal();
+            //EditorGUILayout.PropertyField(data);
+            //if (GUILayout.Button(new GUIContent("New")))
+            //{
 
-                AssetDatabase.CreateAsset(CreateInstance<BitBuffTagData>(), EditorUtility.SaveFilePanelInProject("保存新BitBuffTag数据", "NewBitBuffData", "asset", "输入文件名"));
-            }
-            EditorGUILayout.EndHorizontal();
+            //    AssetDatabase.CreateAsset(CreateInstance<BitBuffTagData>(), EditorUtility.SaveFilePanelInProject("保存新BitBuffTag数据", "NewBitBuffData", "asset", "输入文件名"));
+            //}
+            //EditorGUILayout.EndHorizontal();
 
-            serializedObject.ApplyModifiedProperties();
+            //serializedObject.ApplyModifiedProperties();
         }
     }
 }
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Editor/BuffEditor.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Editor/BuffEditor.cs
@@ -155,6 +155,7 @@ private void CreateBuffTagAsset()
             string dir = Path.Combine(SO_PATH, defaultTagSOName);
             if (File.Exists(dir)) return;
             BitBuffTagData b = CreateInstance<BitBuffTagData>();
+            b.Initialize();
             AssetDatabase.CreateAsset(b, dir);
         }
         /// <summary>
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Tag/BitType/BitBuffTagData.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Tag/BitType/BitBuffTagData.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 namespace NoSLoofah.BuffSystem
 {
@@ -8,8 +10,8 @@ namespace NoSLoofah.BuffSystem
     /// </summary>
     public class BitBuffTagData : BuffTagData
     {
-        [Tooltip("这些tag的旧Buff会被挤掉")][SerializeField] private List<int> removedTags = new List<int>(32);
-        [Tooltip("存在这些tag的Buff时新Buff无法被添加")][SerializeField] private List<int> blockTags = new List<int>(32);
+        [Tooltip("这些tag的旧Buff会被挤掉")][SerializeField] private List<int> removedTags;
+        [Tooltip("存在这些tag的Buff时新Buff无法被添加")][SerializeField] private List<int> blockTags;
 
         public int[] RemovedTags => removedTags.ToArray();
         public int[] BlockTags => blockTags.ToArray();
@@ -26,5 +28,11 @@ public static int GetIndex(BuffTag tag)
             while (((int)tag & (1 << i)) == 0) i++;
             return i + 1;
         }
+
+        public void Initialize()
+        {
+            removedTags = Enumerable.Repeat(0, 32).ToList();
+            blockTags = Enumerable.Repeat(0, 32).ToList();
+        }
     }
 }
diff --git a/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Tag/BitType/BitBuffTagManager.cs b/Assets/NoSLoofah_BuffSystem/BuffSystem/Base/Tag/BitType/BitBuffTagManager.cs
@@ -28,7 +28,7 @@ public override bool IsTagRemoveOther(BuffTag tag, BuffTag other)
         }
 
         public override bool IsTagCanAddWhenHaveOther(BuffTag tag, BuffTag other)
-        {
+        {            
             if (tag == 0) return false;
             if (tag < 0) throw new System.Exception("使用了负标签");
             int index = BitBuffTagData.GetIndex(tag);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ public virtual void OnBuffAwake()`
`71`	`71`	`Layer = 0;`
`72`	`72`	`ModifyLayer(1);`
`73`	`73`	`firstFrame = true;`
`74`		`- Debug.Log(Layer);`
`75`	`74`	`}`
`76`	`75`	`public abstract void OnBuffRemove();`
`77`	`76`
`@@ -80,7 +79,6 @@ public virtual void OnBuffDestroy()`
`80`	`79`	`if (mutilAddType == BuffMutilAddType.multipleLayer \|\| mutilAddType == BuffMutilAddType.multipleLayerAndResetTime)`
`81`	`80`	`{`
`82`	`81`	`ModifyLayer(-Layer);`
`83`		`- isEffective = false;`
`84`	`82`	`}`
`85`	`83`	`RealModifyLayer();`
`86`	`84`	`}`
`@@ -145,6 +143,7 @@ public void OnBuffUpdate()`
`145`	`143`	`timer = duration;`
`146`	`144`	`ModifyLayer(-1);`
`147`	`145`	`}`
	`146`	`+ else isEffective = false;`
`148`	`147`	`}`
`149`	`148`	`RealModifyLayer();`
`150`	`149`	`if (!runTickTimer) return;`
Original file line number	Diff line number	Diff line change
`@@ -14,18 +14,18 @@ private void OnEnable()`
`14`	`14`	`}`
`15`	`15`	`public override void OnInspectorGUI()`
`16`	`16`	`{`
`17`		`- serializedObject.UpdateIfRequiredOrScript();`
	`17`	`+ //serializedObject.UpdateIfRequiredOrScript();`
`18`	`18`
`19`		`- EditorGUILayout.BeginHorizontal();`
`20`		`- EditorGUILayout.PropertyField(data);`
`21`		`- if (GUILayout.Button(new GUIContent("New")))`
`22`		`- {`
	`19`	`+ //EditorGUILayout.BeginHorizontal();`
	`20`	`+ //EditorGUILayout.PropertyField(data);`
	`21`	`+ //if (GUILayout.Button(new GUIContent("New")))`
	`22`	`+ //{`
`23`	`23`
`24`		`- AssetDatabase.CreateAsset(CreateInstance<BitBuffTagData>(), EditorUtility.SaveFilePanelInProject("保存新BitBuffTag数据", "NewBitBuffData", "asset", "输入文件名"));`
`25`		`- }`
`26`		`- EditorGUILayout.EndHorizontal();`
	`24`	`+ // AssetDatabase.CreateAsset(CreateInstance<BitBuffTagData>(), EditorUtility.SaveFilePanelInProject("保存新BitBuffTag数据", "NewBitBuffData", "asset", "输入文件名"));`
	`25`	`+ //}`
	`26`	`+ //EditorGUILayout.EndHorizontal();`
`27`	`27`
`28`		`- serializedObject.ApplyModifiedProperties();`
	`28`	`+ //serializedObject.ApplyModifiedProperties();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ private void CreateBuffTagAsset()`
`155`	`155`	`string dir = Path.Combine(SO_PATH, defaultTagSOName);`
`156`	`156`	`if (File.Exists(dir)) return;`
`157`	`157`	`BitBuffTagData b = CreateInstance<BitBuffTagData>();`
	`158`	`+ b.Initialize();`
`158`	`159`	`AssetDatabase.CreateAsset(b, dir);`
`159`	`160`	`}`
`160`	`161`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Collections;`
`2`	`3`	`using System.Collections.Generic;`
	`4`	`+using System.Linq;`
`3`	`5`	`using UnityEngine;`
`4`	`6`	`namespace NoSLoofah.BuffSystem`
`5`	`7`	`{`
`@@ -8,8 +10,8 @@ namespace NoSLoofah.BuffSystem`
`8`	`10`	`/// </summary>`
`9`	`11`	`public class BitBuffTagData : BuffTagData`
`10`	`12`	`{`
`11`		`- [Tooltip("这些tag的旧Buff会被挤掉")][SerializeField] private List<int> removedTags = new List<int>(32);`
`12`		`- [Tooltip("存在这些tag的Buff时新Buff无法被添加")][SerializeField] private List<int> blockTags = new List<int>(32);`
	`13`	`+ [Tooltip("这些tag的旧Buff会被挤掉")][SerializeField] private List<int> removedTags;`
	`14`	`+ [Tooltip("存在这些tag的Buff时新Buff无法被添加")][SerializeField] private List<int> blockTags;`
`13`	`15`
`14`	`16`	`public int[] RemovedTags => removedTags.ToArray();`
`15`	`17`	`public int[] BlockTags => blockTags.ToArray();`
`@@ -26,5 +28,11 @@ public static int GetIndex(BuffTag tag)`
`26`	`28`	`while (((int)tag & (1 << i)) == 0) i++;`
`27`	`29`	`return i + 1;`
`28`	`30`	`}`
	`31`	`+`
	`32`	`+ public void Initialize()`
	`33`	`+ {`
	`34`	`+ removedTags = Enumerable.Repeat(0, 32).ToList();`
	`35`	`+ blockTags = Enumerable.Repeat(0, 32).ToList();`
	`36`	`+ }`
`29`	`37`	`}`
`30`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override bool IsTagRemoveOther(BuffTag tag, BuffTag other)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public override bool IsTagCanAddWhenHaveOther(BuffTag tag, BuffTag other)`
`31`		`- {`
	`31`	`+ {`
`32`	`32`	`if (tag == 0) return false;`
`33`	`33`	`if (tag < 0) throw new System.Exception("使用了负标签");`
`34`	`34`	`int index = BitBuffTagData.GetIndex(tag);`