0825合并修理

ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5b07afdbcf13e43438545d591cfd2e4b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -6540,12 +6540,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 39a3ce44fce07564a84479ba3c899d55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isWeaponSettle: 1
+  isWeaponSettle: 0
   enemyWeaponObject: {fileID: 123995918}
   playerUsingWeapon: {fileID: 0}
   enemyUsingWeapon: {fileID: 0}
   isMapChange: 0
-  isWeaponNodeChange: 1
+  isWeaponNodeChange: 0
   playerWeaponNodeList: {fileID: 2109090871}
   enemyWeaponNodeList: {fileID: 1930541759}
 --- !u!1 &142863955
@@ -58057,6 +58057,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faf6dab97669f174e974440ec8967888, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  nodeWithItemList: []
 --- !u!1 &1225743230
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scripts/Item/BlockNode/BlockNode.cs

@@ -11,7 +11,7 @@ public class BlockNode : MonoBehaviour
 
     private void OnEnable()
     {
-        Resgiste();    
+      //  Resgiste();    
     }
     private void OnDisable()
     {
@@ -45,6 +45,7 @@ public class BlockNode : MonoBehaviour
     {
         inMapUnity.blockNode = this;
         inMapUnity.blocked = true;
+        Resgiste();
     }
     public virtual void SettleEffect()
     {