各种修复

Assets/Mods/Basic/Basic_Manifest.asset

@@ -39,7 +39,7 @@ MonoBehaviour:
   - CardData_Basic_Slash
   - CardData_Basic_Strike
   - CardData_Basic_WindBlade
-  - CardData_Basic_CommomHolyWater
+  - CardData_Basic_CommonHolyWater
   - CardData_Basic_HiddenBlade
   - CardData
   - CardData_Basic_Cohesion

Assets/Mods/Basic/Cards/Scripts/Cleric/BlessedHolyWater.cs

@@ -11,8 +11,6 @@ namespace Continentis.Mods.Basic.Cards.Cleric
     {
         protected override List<CommandBase> PlayEffect(List<CharacterBase> targetList)
         {
-            base.PlayEffect(targetList);
-
             CommandGroup mainGroup = new CommandGroup(ExecutionMode.Sequential);
             mainGroup.AddCommand(new Cmd_PlayAnimation(user.characterView, "Skill"));
             mainGroup.AddCommand(new Cmd_Function(() =>

Assets/Mods/Basic/Characters/CombatBuffs/Cleric/FreedomOfMovement.cs

@@ -3,6 +3,7 @@ using Continentis.MainGame.Character;
 using SLSFramework.General;
 using System;
 using System.Collections.Generic;
+using Continentis.MainGame.Card;
 using UnityEngine;
 
 namespace Continentis.Mods.Basic.Buffs
@@ -13,20 +14,20 @@ namespace Continentis.Mods.Basic.Buffs
         {
             Initialize(BuffType.Positive, BuffDispelLevel.Basic);
             this.contentSubmodule = new ContentSubmodule(this)
-            .AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString());
+                .AddParameterGetter("Stack", () => unitedStackSubmodule.stackAmount.ToString());
 
             this.iconSubmodule = new IconSubmodule(this);
             this.unitedStackSubmodule = new UnitedStackSubmodule(this, stack);
 
             this.eventSubmodule = new EventSubmodule(this);
-            this.eventSubmodule.onBeforePlayCard.Add(this.GetType().FullName, new PrioritizedAction<MainGame.Card.CardInstance, System.Collections.Generic.List<CharacterBase>>(OnBeforePlayCard));
+            this.eventSubmodule.onBeforePlayCard.Add("FreedomOfMovement", new PrioritizedAction<CardInstance, List<CharacterBase>>(OnBeforePlayCard));
         }
 
-        private void OnBeforePlayCard(MainGame.Card.CardInstance instance, List<CharacterBase> list)
+        private void OnBeforePlayCard(CardInstance instance, List<CharacterBase> list)
         {
-            if (instance.cardLogic.contentSubmodule.cardType == MainGame.Card.CardType.Power)
+            if (instance.cardLogic.contentSubmodule.cardType == CardType.Power)
             {
-                this.attachedCharacter.deckSubmodule.DrawCards(unitedStackSubmodule.stackAmount);
+                CommandQueueManager.Instance.AddCommand(this.attachedCharacter.deckSubmodule.DrawCards(unitedStackSubmodule.stackAmount));
             }
         }
 

Assets/Mods/Basic/Characters/Data/CharacterData_Basic_Knight.asset

@@ -160,7 +160,7 @@ MonoBehaviour:
       index: 25
       isKeyDuplicated: 0
     - Key: DrawCardAmountPerAction
-      Value: 4
+      Value: 15
       index: 26
       isKeyDuplicated: 0
     - Key: Awareness

Assets/Mods/Basic/Characters/Data/New Material.mat

@@ -0,0 +1,137 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Material
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &3060163818772001751
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10

Assets/Mods/Basic/Characters/Data/New Material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a7e6e890cbcf4f64d92166428b365bad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: