合并

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/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv

@@ -11,7 +11,7 @@
 2015,1,2,1,15,yellow>4,53,5&3,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
 2017,1,1,83,3,yellow>4,93,1,none,0_0,EffectCardIcon/死亡印记,1,3,0,死亡印记,none
 2018,1,1,84;85,1;1,yellow>5,33,1,none,0_0,EffectCardIcon/暗影步,1,2,0,暗影步,none
-2019,1,3,94,10,red>12,95,5&2,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
+2019,1,3,94,10,red>12,95,5&2,94,0_0,EffectCardIcon/影舞步,0,2,0,影舞步,none
 2021,1,1,90,1,blue>7,89,1,none,0_0,EffectCardIcon/血怒,0,3,1,血怒,none
 2022,1,3,68,1,red>5,69,1,68,0_0,EffectCardIcon/抽血,1,3,0,抽血,none
 2023,1,1,52,2,yellow>5,52,3,52,0_0,EffectCardIcon/踢击,1,1,0,踢击,none
@@ -35,4 +35,4 @@
 2044,1,1,12;102,1;10,none,none,none,none,0_0,EffectCardIcon/战吼,1,1,0,背刺,none
 2045,1,1,101,7,blue>5,12,1,none,0_0,EffectCardIcon/战吼,1,1,0,践踏,none
 2046,1,1,100,1,yellow>7,16,2,none,0_0,EffectCardIcon/战吼,0,2,0,狂战,none
-2047,1,1,1,22,blue>9,103,22&2,1,0_0,EffectCardIcon/战吼,1,2,0,斩杀,如果击杀，回复2点能量
+2047,1,2,1,22,blue>9,103,22&2,1,0_0,EffectCardIcon/战吼,1,2,0,斩杀,如果击杀，回复2点能量