Soullies/Continentis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续

Browse Source
This commit is contained in:
SoulliesOfficial
2025-10-24 09:11:22 -04:00
parent 61a397dd4c
commit 76157e3cb1
329 changed files with 8609 additions and 4549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/MainGame/Combat/CombatCharacterController.cs
View File

@@ -66,7 +66,7 @@ namespace Continentis.MainGame.Combat
SetViewPositions();
SetViewHUDs();
ModManager.CreateInstance<CombatBuffBase>("Basic_Weak", 2).Apply(enemies[0]);
ModManager.CreateInstance<CharacterCombatBuffBase>("Basic.Buffs.Weak", 2).Apply(enemies[0]);
}
public void AddCombatNPCs(params (CharacterData, Fraction)[] dataList)

11
Assets/Scripts/MainGame/Combat/CombatMainManager.cs
View File

@@ -140,10 +140,15 @@ namespace Continentis.MainGame.Combat
CombatMainPage combatMainPage = CombatUIManager.Instance.combatMainPage;
playerHero.deckSubmodule.SetUpHandCardViews();
playerHero.combatBuffSubmodule.ActionStart();
combatMainPage.handPile.isUpdatingLayout = false;
playerHero.deckSubmodule.DrawCards(5, 0.1f);
CommandQueueManager.Instance.AddCommand(new Cmd_Function(0f, () => combatMainPage.handPile.isUpdatingLayout = true));
CommandQueueManager.Instance.AddCommand(playerHero.deckSubmodule.DrawCards(5));
CommandQueueManager.Instance.AddCommand(new Cmd_Function(0f, () =>
{
//Debug.Log((drawCard.groupContext.context["DrawnCards"] as List<CardInstance>).Count);
combatMainPage.handPile.isUpdatingLayout = true;
}));
combatMainPage.combatResourcesDisplayer.SetCharacter(playerHero);
@@ -195,6 +200,8 @@ namespace Continentis.MainGame.Combat
{
if (currentCharacter is PlayerHero playerHero)
{
playerHero.combatBuffSubmodule.ActionEnd();
Debug.Log(currentCharacter.data.className + " 结束行动，整理手牌。");
List<CardInstance> handPile = new List<CardInstance>(playerHero.deckSubmodule.HandPile);