diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory.meta b/Assets/Addressables_Temp.meta similarity index 77% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory.meta rename to Assets/Addressables_Temp.meta index 054f7327..56925c02 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory.meta +++ b/Assets/Addressables_Temp.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98f8932fb6bc2614da0d1659eed46714 +guid: 41c6967b65fb20042a1b8fa469099a74 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Addressables_Temp/link.xml b/Assets/Addressables_Temp/link.xml new file mode 100644 index 00000000..208ccf28 --- /dev/null +++ b/Assets/Addressables_Temp/link.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Addressables_Temp/link.xml.meta similarity index 75% rename from Assets/Resources/PerformanceTestRunSettings.json.meta rename to Assets/Addressables_Temp/link.xml.meta index 212a91da..1a49d768 100644 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ b/Assets/Addressables_Temp/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03cdb179703a09c4888dd569a5974d90 +guid: c40e0fa9c48b251409b16474d4fa193c TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Mods/Basic/Basic_Manifest.asset b/Assets/Mods/Basic/Basic_Manifest.asset index 98512083..fce2aa76 100644 --- a/Assets/Mods/Basic/Basic_Manifest.asset +++ b/Assets/Mods/Basic/Basic_Manifest.asset @@ -18,14 +18,14 @@ MonoBehaviour: - KeywordData_Basic_Buff_Assassin - KeywordData_Basic_Default cardDataIDList: - - CardData_Basic_AblazeInPurgatory - - CardData_Basic_HellfireBrand - - CardData_Basic_SoulCleave - CardData_Basic_ArmyOfTheDead - CardData_Basic_GreatswordSweep - CardData_Basic_HellfireBlast - CardData_Basic_NecromanticInfusion - CardData_Basic_WrathOfUnderworld + - CardData_Basic_SkeletonGuardDefense + - CardData_Basic_SkeletonGuardIgnite + - CardData_Basic_SkeletonGuardSlash - CardData_Basic_Rouse - CardData_Basic_Tactic - CardData_Basic_Whimsy diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs deleted file mode 100644 index 6187dd00..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections.Generic; -using Continentis.MainGame.Card; -using Continentis.MainGame.Character; -using Continentis.MainGame.Commands; -using Continentis.Mods.Basic.Buffs; -using SLSFramework.General; -using UnityEngine; - -namespace Continentis.Mods.Basic.Cards -{ - public class AblazeInPurgatory : CardLogicBase - { - public override void TargetingEffect(CharacterBase target) - { - card.SetAttribute("DisplayHellfireStack", card.GetAttribute("HellfireStack")); - } - - public override void UntargetingEffect() - { - card.SetAttribute("DisplayHellfireStack", card.GetAttribute("HellfireStack")); - } - - public override List PlayEffect(List targetList) - { - CommandGroup mainGroup = TargetListCommandGroup(targetList, ExecutionMode.Parallel, ExecutionMode.Parallel, - new Cmd_ParamFunction(0.2f, target => - { - Debug.Log(target.data.className + " is ablaze in purgatory!"); - - Basic_Hellfire buff = new Basic_Hellfire(card.GetAttribute("HellfireStack")); - buff.Apply(target, user, this); - })); - - return new List { mainGroup }; - } - - public override void ApplyAttributeChangesByCard() - { - int offsetFromInt = user.GetAttribute("OffsetFromIntelligence"); - card.SetVariableAttribute("HellfireStack", offsetFromInt); - } - } -} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta deleted file mode 100644 index 9b0a595b..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/AblazeInPurgatory.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 9785c79f83b4b9d4baa2d261f06ee45d \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand.meta deleted file mode 100644 index 8a086fb3..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc1b860b5dd164b4a8d1213cbd2e6afa -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs deleted file mode 100644 index d8a172cb..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public class HellfireBrand : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta deleted file mode 100644 index 269e49f5..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/HellfireBrand.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 102fb406dd495f14b9441687aebc4462 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs deleted file mode 100644 index e4fe2b43..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Collections.Generic; -using Continentis.MainGame.Card; -using Continentis.MainGame.Character; -using Continentis.MainGame.Commands; -using Continentis.Mods.Basic.Buffs; -using SLSFramework.General; -using UnityEngine; - -namespace Continentis.Mods.Basic.Cards -{ - public class SoulCleave : CardLogicBase - { - public override void SetUpLogicComponents() - { - AddLogicComponent(); - AddLogicComponent(); - } - - public override List PlayEffect(List targetList) - { - base.PlayEffect(targetList); - - CommandGroup mainGroup = TargetListCommandGroup(targetList, - new Cmd_ParamFunction(0.2f, target => - { - int hurt = user.Attack(target, GetTargetedFinalDamage(target)).hurtDamage; - LogicComponent().LifeSteal(hurt); - - Basic_Hellfire hellfireBuff = target.combatBuffSubmodule.GetBuff(); - hellfireBuff?.unitedStackSubmodule.ClearAllStacks(); - })); - - return new List { mainGroup }; - } - - public override int GetTargetedFinalDamage(CharacterBase target, List elementalTags = null) - { - int damage = base.GetTargetedFinalDamage(target, elementalTags); - Basic_Hellfire hellfireBuff = target.combatBuffSubmodule.GetBuff(); - int hellfireStack = hellfireBuff != null ? hellfireBuff.unitedStackSubmodule.stackAmount : 0; - damage += hellfireStack * 2; - return damage; - } - - public override void ApplyAttributeChangesByCard() - { - LogicComponent().SetDamage_Strike(); - } - } -} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs.meta deleted file mode 100644 index 27c7519a..00000000 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/SoulCleave.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 49fc9f9a93733cd409519d499531a199 \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard.meta similarity index 77% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard.meta index 48d67b17..735cea42 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71a1d3135da07c74a9b6bd8f4ee79d75 +guid: 447ca0bb546708e4297099da51eb4aa2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset similarity index 52% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset index 85786b3c..f1f8c907 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset @@ -10,22 +10,39 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} - m_Name: CardData_Basic_SoulCleave + m_Name: CardData_Basic_SkeletonGuardDefense m_EditorClassIdentifier: modName: Basic - className: SoulCleave - displayName: Card_Basic_SoulCleave_DisplayName - cardRarity: 40 + categoryName: + className: Defense + displayName: Card_Basic_Defense_DisplayName + cardRarity: 10 cardType: 0 - tags: [] - cardSprite: {fileID: 21300000, guid: 2d851da5310713a4781f00abaa57e48e, type: 3} - functionText: Card_Basic_SoulCleave_FunctionText - cardDescription: '$Keyword("Strike"), $Keyword("LifeSteal"): $Attribute("LifeStealPercent", - true, true), deal $Attribute("Damage") darkness & fire damage, it will explode - 2*stacks of Hellfire as extra damage.' - baseWeight: 10 + keywords: + - TargetSelf + cardSprite: {fileID: 21300000, guid: 54336fab907a76a4095ff5607e0b86c8, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Defense_FunctionText + cardDescription: Card_Basic_Strike_Description + baseWeight: 1 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: Block + Value: 15 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 0 + index: 3 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] @@ -40,6 +57,7 @@ MonoBehaviour: maxUpgradeLevel: 0 upgradeCards: [] customDescriptions: [] - prefabRefs: [] + prefabRefs: + - VFX_Basic_RedImpact derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset.meta similarity index 79% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset.meta index df4dbfa0..c06e64a8 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_SoulCleave/CardData_Basic_SoulCleave.asset.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardDefense.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aceffe41cc487054b80de681b48dc448 +guid: 5b9c058cdf3a69d438a2b5f441680ad2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset similarity index 53% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset index abb06a87..773f96d3 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset @@ -10,21 +10,40 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} - m_Name: CardData_Basic_AblazeInPurgatory + m_Name: CardData_Basic_SkeletonGuardIgnite m_EditorClassIdentifier: modName: Basic - className: AblazeInPurgatory - displayName: Card_Basic_AblazeInPurgatory_DisplayName - cardRarity: 30 + categoryName: + className: Ignite + displayName: Card_Basic_Ignite_DisplayName + cardRarity: 10 cardType: 10 - tags: [] - cardSprite: {fileID: 21300000, guid: 28e24068cd6a78b448d1bf09241b6905, type: 3} - functionText: Card_Basic_AblazeInPurgatory_FunctionText - cardDescription: $Keyword("Arcane"), apply $Attribute("HellfireStack") stacks of - Hellfire to all enemy targets. + keywords: + - TargetEnemies + - Magic + cardSprite: {fileID: 21300000, guid: 54336fab907a76a4095ff5607e0b86c8, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Ignite_FunctionText + cardDescription: baseWeight: 1 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: BuffStack_Burn + Value: 2 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 1 + index: 3 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] @@ -39,6 +58,7 @@ MonoBehaviour: maxUpgradeLevel: 0 upgradeCards: [] customDescriptions: [] - prefabRefs: [] + prefabRefs: + - VFX_Basic_RedImpact derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset.meta similarity index 79% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset.meta index abfd19f4..b889a9b0 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_AblazeInPurgatory/CardData_Basic_AblazeInPurgatory.asset.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardIgnite.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: caca4ea5f7e78d5419005d09f3cff517 +guid: 6721d0d04ecd0d94c98318b25074bcbe NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset similarity index 51% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset index 3044e386..46edd149 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset @@ -10,20 +10,40 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9a4129cdd7011ca46b83d8c17d9f3623, type: 3} - m_Name: CardData_Basic_HellfireBrand - m_EditorClassIdentifier: Assembly-CSharp::Continentis.MainGame.Card.CardData + m_Name: CardData_Basic_SkeletonGuardSlash + m_EditorClassIdentifier: modName: Basic - className: HellfireBlast - displayName: Card_Basic_HellfireBlast_DisplayName - cardRarity: 0 + categoryName: + className: Slash + displayName: Card_Basic_Slash_DisplayName + cardRarity: 10 cardType: 0 - tags: [] - cardSprite: {fileID: 0} - functionText: Card_Basic_HellfireBlast_FunctionText - cardDescription: + keywords: + - TargetEnemies + - Slash + cardSprite: {fileID: 21300000, guid: 54336fab907a76a4095ff5607e0b86c8, type: 3} + cardLayoutTags: [] + functionText: Card_Basic_Slash_FunctionText + cardDescription: Card_Basic_Strike_Description baseWeight: 1 variableAttributes: - dictionaryList: [] + dictionaryList: + - Key: Damage + Value: 6 + index: 0 + isKeyDuplicated: 0 + - Key: StaminaCost + Value: 1 + index: 1 + isKeyDuplicated: 0 + - Key: ManaCost + Value: 0 + index: 2 + isKeyDuplicated: 0 + - Key: TargetCount + Value: 1 + index: 3 + isKeyDuplicated: 0 dividerPosProp: 0.5 originalAttributes: dictionaryList: [] @@ -38,6 +58,7 @@ MonoBehaviour: maxUpgradeLevel: 0 upgradeCards: [] customDescriptions: [] - prefabRefs: [] + prefabRefs: + - VFX_Basic_RedImpact derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] diff --git a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset.meta similarity index 79% rename from Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta rename to Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset.meta index cfa626f9..ae3aa35d 100644 --- a/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/Basic_HellfireBrand/CardData_Basic_HellfireBrand.asset.meta +++ b/Assets/Mods/Basic/Cards/Data/Enemies/Bosses/MarshalOfUnderworld/SkeletonGuard/CardData_Basic_SkeletonGuardSlash.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fbefadde068f8db40822e491f9e2732e +guid: 3a37f85fd6e990c4ba9b67409ec40112 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs b/Assets/Mods/Basic/Cards/Scripts/General/Defense.cs similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs rename to Assets/Mods/Basic/Cards/Scripts/General/Defense.cs diff --git a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Defense.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Defense.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/General/Defense.cs.meta diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs b/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs new file mode 100644 index 00000000..9aad9e6d --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using Continentis.MainGame.Card; +using Continentis.MainGame.Character; +using Continentis.MainGame.Commands; +using Continentis.Mods.Basic.Buffs; +using SLSFramework.General; +using UnityEngine; + +namespace Continentis.Mods.Basic.Cards +{ + public class Ignite : CardLogicBase + { + public override List PlayEffect(List targetList) + { + base.PlayEffect(targetList); + + CommandGroup mainGroup = TargetListCommandGroup(targetList, + new Cmd_PlayAnimation(user.characterView, "Skill"), + new Cmd_ParamFunction(0.2f, target => + { + CreateCharacterBuff(GetAttribute("BuffStack_Burn")).Apply(target, user, this); + })); + + return new List { mainGroup }; + } + } +} \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs.meta new file mode 100644 index 00000000..45253d83 --- /dev/null +++ b/Assets/Mods/Basic/Cards/Scripts/General/Ignite.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f9c20c393ab72bd4fa7f3141fada3ecd \ No newline at end of file diff --git a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs b/Assets/Mods/Basic/Cards/Scripts/General/Slash.cs similarity index 95% rename from Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs rename to Assets/Mods/Basic/Cards/Scripts/General/Slash.cs index 861a8e4b..165e8e06 100644 --- a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs +++ b/Assets/Mods/Basic/Cards/Scripts/General/Slash.cs @@ -16,8 +16,6 @@ namespace Continentis.Mods.Basic.Cards public override List PlayEffect(List targetList) { - base.PlayEffect(targetList); - CommandGroup mainGroup = TargetListCommandGroup(targetList, new Cmd_PlayAnimation(user.characterView, "Attack"), new Cmd_ParamFunction(target => user.Attack(target, GetTargetedFinalDamage(target)))); diff --git a/Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs.meta b/Assets/Mods/Basic/Cards/Scripts/General/Slash.cs.meta similarity index 100% rename from Assets/Mods/Basic/Cards/Scripts/ObsoleteGeneral/Slash.cs.meta rename to Assets/Mods/Basic/Cards/Scripts/General/Slash.cs.meta diff --git a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_SkeletonGuard.asset b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_SkeletonGuard.asset index cc5938ad..d6212566 100644 --- a/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_SkeletonGuard.asset +++ b/Assets/Mods/Basic/Characters/Data/CharacterData_Basic_SkeletonGuard.asset @@ -25,33 +25,37 @@ MonoBehaviour: coreAttributes: dictionaryList: - Key: Level - Value: 0 + Value: 4 index: 0 isKeyDuplicated: 0 - Key: Strength - Value: 0 + Value: 12 index: 1 isKeyDuplicated: 0 - Key: Agility - Value: 0 + Value: 12 index: 2 isKeyDuplicated: 0 - Key: Intelligence - Value: 0 + Value: 12 index: 3 isKeyDuplicated: 0 - Key: Physique - Value: 0 + Value: 12 index: 4 isKeyDuplicated: 0 - Key: Perception - Value: 0 + Value: 12 index: 5 isKeyDuplicated: 0 - Key: Charisma - Value: 0 + Value: 12 index: 6 isKeyDuplicated: 0 + - Key: DisableConversion + Value: 1 + index: 7 + isKeyDuplicated: 0 dividerPosProp: 0.5 generalAttributes: dictionaryList: @@ -104,7 +108,7 @@ MonoBehaviour: index: 11 isKeyDuplicated: 0 - Key: MaximumStamina - Value: 2 + Value: 1 index: 12 isKeyDuplicated: 0 - Key: MaximumMana @@ -112,7 +116,7 @@ MonoBehaviour: index: 13 isKeyDuplicated: 0 - Key: MaximumHealth - Value: 20 + Value: 25 index: 14 isKeyDuplicated: 0 - Key: BlockGainOffset @@ -128,7 +132,7 @@ MonoBehaviour: index: 17 isKeyDuplicated: 0 - Key: StaminaRecoverPerAction - Value: 0 + Value: 1 index: 18 isKeyDuplicated: 0 - Key: ManaRecoverPerAction @@ -200,6 +204,9 @@ MonoBehaviour: prefabRefs: [] derivativeCardDataRefs: [] derivativeCharacterDataRefs: [] - initialDeckRef: [] + initialDeckRef: + - CardData_Basic_SkeletonGuardSlash + - CardData_Basic_SkeletonGuardIgnite + - CardData_Basic_SkeletonGuardDefense hudDataRefs: - HUDData_Basic_Default diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index a2812f09..00000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"Mono2x","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneWindows64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.2.6f2","Branch":"6000.2/respin/6000.2.6f2-cc51a95c03","Changeset":"4a4dcaec6541","Date":1758112816},"Dependencies":["com.unity.2d.animation@12.0.2","com.unity.2d.enhancers@1.0.0","com.unity.2d.sprite@1.0.0","com.unity.addressables@2.7.4","com.unity.ai.assistant@1.0.0-pre.12","com.unity.ai.generators@1.0.0-pre.20","com.unity.ai.inference@2.3.0","com.unity.ai.navigation@2.0.9","com.unity.collab-proxy@2.9.3","com.unity.ide.rider@3.0.38","com.unity.ide.visualstudio@2.0.23","com.unity.inputsystem@1.14.2","com.unity.multiplayer.center@1.0.0","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.render-pipelines.universal@17.2.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.9","com.unity.toolchain.win-x86_64-linux-x86_64@2.0.10","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.7","com.xuanxuan.nb.fx@2.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.sysroot@2.0.10","com.unity.sysroot.linux-x86_64@2.0.9","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.2.0","com.unity.shadergraph@17.2.0","com.unity.render-pipelines.universal-config@17.0.3","com.unity.burst@1.8.24","com.unity.dt.app-ui@1.3.1","com.unity.collections@2.5.7","com.unity.ai.toolkit@1.0.0-pre.20","com.unity.mathematics@1.3.2","com.unity.serialization@3.1.2","com.unity.profiling.core@1.0.2","com.unity.scriptablebuildpipeline@2.4.3","com.unity.2d.common@11.0.1","com.unity.settings-manager@2.1.0","com.unity.searcher@4.9.3","com.unity.rendering.light-transport@1.0.1","com.unity.nuget.mono-cecil@1.11.5","com.unity.test-framework.performance@3.1.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta deleted file mode 100644 index 4bf4c596..00000000 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e03da9657c4bbd4499490b3c689b73b0 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae1..00000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Character/CharacterMainFunctions.cs b/Assets/Scripts/MainGame/Character/CharacterMainFunctions.cs index f8d0c28c..3f5a6a65 100644 --- a/Assets/Scripts/MainGame/Character/CharacterMainFunctions.cs +++ b/Assets/Scripts/MainGame/Character/CharacterMainFunctions.cs @@ -115,7 +115,7 @@ namespace Continentis.MainGame.Character eventSubmodule.onFinishAttack.Invoke(target, attackResult); combatBuffSubmodule.buffList.For(buff => { - buff.eventSubmodule.onDealAttack.Invoke(attackResult); + buff?.eventSubmodule.onDealAttack.Invoke(attackResult); }); } @@ -307,7 +307,7 @@ namespace Continentis.MainGame.Character bool CheckAvailabilityAndSetTargets(CardInstance card, out List targets) { card.DetectTargetsValidity(out List valid, out _, out _); - if (valid.Count == 0 || !card.CheckBeforePlay()) + if (valid.Count == 0) { targets = null; return false; // 无有效目标或无法使用则跳过 @@ -321,10 +321,10 @@ namespace Continentis.MainGame.Character IntentionBase currentIntention = intentionSubmodule.currentIntention; List availableCards = deckSubmodule.PoolPile; List intended = new List(); - int currentStamina = GetAttribute("Stamina"); - int remainingStamina = currentStamina - currentIntention.guaranteedStamina; - int currentMana = GetAttribute("Mana"); - int remainingMana = currentMana - currentIntention.guaranteedMana; + int predictedStamina = Mathf.Min(GetAttribute("MaximumStamina"), GetAttribute("Stamina") + GetAttribute("StaminaRecoverPerAction")); + int remainingStamina = predictedStamina - currentIntention.guaranteedStamina; + int predictedMana = Mathf.Min(GetAttribute("MaximumMana"), GetAttribute("Mana") + GetAttribute("ManaRecoverPerAction")); + int remainingMana = predictedMana - currentIntention.guaranteedMana; List forced = new List(); List normal = new List(); diff --git a/Assets/Scripts/ScriptExtensions/UModAssistance/ModManager.cs b/Assets/Scripts/ScriptExtensions/UModAssistance/ModManager.cs index 1f5c93e1..34a46192 100644 --- a/Assets/Scripts/ScriptExtensions/UModAssistance/ModManager.cs +++ b/Assets/Scripts/ScriptExtensions/UModAssistance/ModManager.cs @@ -31,13 +31,29 @@ namespace SLSFramework.UModAssistance { await Task.Yield(); } + if (!host.IsSuccessful) { - throw new Exception($"Failed to load mod '{modName}' asynchronously"); + Debug.LogError($"[ModLoader] Mod load operation for '{modName}' failed (hostTask.IsSuccessful == false)."); + throw new Exception($"Failed to load mod '{modName}' asynchronously (Operation Failed)"); } + + ModHost modHost = host.Result; + + if (modHost == null || !modHost.IsModLoaded) + { + if (modHost != null) + { + var errorMessage = modHost.LoadResult.Message; + Debug.LogError($"[ModLoader] Mod load operation for '{modName}' failed: {errorMessage}"); + } + + throw new Exception($"Failed to load mod '{modName}' asynchronously (ModHost is null or not loaded)"); + } + LoadedMods.Add(modName, host.Result); Debug.Log($"Mod '{modName}' async loaded successfully."); - return host.Result; + return modHost; } } diff --git a/Assets/UMod/Resources/Editor/WizardIncludeContent.asset b/Assets/UMod/Resources/Editor/WizardIncludeContent.asset index 1734398a..8254c1ec 100644 --- a/Assets/UMod/Resources/Editor/WizardIncludeContent.asset +++ b/Assets/UMod/Resources/Editor/WizardIncludeContent.asset @@ -1269,6 +1269,7 @@ MonoBehaviour: - 3a342cc1db63a104da3bc2e09ba35be3 - 3e3f2261e78edf348b87fe951a8f9e66 - b6560183465e5944ba49e39974faafd4 + - 59a1c52238303dc41bd58e565f7fbeda - e539456001f999741ace4b04c2f21133 - a03af87fafe3d344380ed827e851e5c4 - 2e5b547f83fbee0419ce24925bcb0279 @@ -1276,6 +1277,7 @@ MonoBehaviour: - 38c98bdd75759a14b954e6ddd0a4d99d - c8ec15b05165d644ea320a2e59b2a4d4 - 434edd20e1100e8489b175dab3fac8e0 + - 95504a2d65ce1fa4d82cbdb23ef16892 - 7d754f46edfdb9542a15c7635c5dfd24 - cac537445b7bbed40968d7b39124b639 - 0b7177c464f6dfa488ad5d5b124ad16d @@ -1385,9 +1387,9 @@ MonoBehaviour: - 7958263785c327641b684242ce2f8c9a - 5b3352bb0a4563d4f8778594a486a3c9 - e6c66e8ba85e73f4e913053be3226ca9 - - a58101ba7d997824d889bd04baf1c18c - 9a36a4bb7be9da947beb608206dc240f - 77b3f3b496104dc4d887f70412d2f57f + - a58101ba7d997824d889bd04baf1c18c - 95633a09783e9ad47a4980934e8af4d0 - c87462c2ff921fb4e9e5f52ab691a665 - c8533bcb32514564d98e8c49f29b13ea diff --git a/Assets/UMod/Resources/UModSettings.asset b/Assets/UMod/Resources/UModSettings.asset index f7ee28f9..be1e542d 100644 --- a/Assets/UMod/Resources/UModSettings.asset +++ b/Assets/UMod/Resources/UModSettings.asset @@ -17,7 +17,7 @@ MonoBehaviour: commandLineFormat: +mod=$(PATH) allowSceneChanges: 1 autoLoadModScenes: 1 - allowModsCreatedByOlderUnityVersions: 1 + allowModsCreatedByOlderUnityVersions: 0 cleanupModObjects: 1 logLevel: 4 memoryBudgetBytes: 104857600 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9b52c019..c72eafe7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -859,7 +859,7 @@ PlayerSettings: il2cppCodeGeneration: {} il2cppStacktraceInformation: {} managedStrippingLevel: - Standalone: 4 + Standalone: 0 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0