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

12.10 进度 基本完成

Browse Source
This commit is contained in:
SoulliesOfficial
2025-12-10 18:22:26 -05:00
parent 8d6267e1a2
commit f7cab3e784
224 changed files with 11116 additions and 6240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Scripts/MainGame/Card/CardInstance.cs
View File

@@ -182,15 +182,21 @@ namespace Continentis.MainGame.Card
{
GameObject intentionCardObjectPrefab = MainGameManager.Instance.basePrefabs.intentionCardObject;
HUD_Intention intention = user.characterView.hudContainer.enablingHUDs["Intention"] as HUD_Intention;
IntentionCardView intentionCardView = LeanPool.Spawn(intentionCardObjectPrefab, intention.hudTransform).GetComponent<IntentionCardView>();
IntentionCardView intentionCardView = LeanPool.Spawn(intentionCardObjectPrefab, intention.hudTransform)
.GetComponent<IntentionCardView>();
intention.AddCard(intentionCardView);
intentionCardView.card = this;
this.intentionCardView = intentionCardView;
intentionCardView.transform.localScale = Vector3.one;
intentionCardView.Setup(this);
Sprite iconSprite = MainGameManager.Instance.basePrefabs.intentionMarkIcons["Unknown"];
if (cardData.intentionIconKeys.Count > 0)
{
string iconMarkKey = cardData.intentionIconKeys[0];
iconSprite = MainGameManager.Instance.basePrefabs.intentionMarkIcons[iconMarkKey];
}
string iconMarkKey = cardData.intentionIconKeys[0];
Sprite iconSprite = MainGameManager.Instance.basePrefabs.intentionMarkIcons[iconMarkKey];
if (string.IsNullOrEmpty(cardData.intentionTextOverride))
{
if (cardData.intentionValueNames.Count > 0)

12
Assets/Scripts/MainGame/Card/CardMainFunctions.cs
View File

@@ -43,10 +43,18 @@ namespace Continentis.MainGame.Card
if(user == null) return;
attributeSubmodule.RefreshAllAttributes();
if ((handCardView == null && intentionCardView == null) || !handCardView.isSelecting)
Untargeting();
/*if ((handCardView == null && intentionCardView == null))
{
eventSubmodule.onUntargeting();
Untargeting();
}
else
{
if (handCardView != null && !handCardView.isSelecting)
{
Untargeting();
}
}*/
contentSubmodule.dirtyMark = true;
}

8
Assets/Scripts/MainGame/Card/CardView/HandCardView/HandCardView_Operations.cs
View File

@@ -116,8 +116,8 @@ namespace Continentis.MainGame.Card
card.contentSubmodule.dirtyMark = true;
}
Vector3 startPosition = cardTransform.position + new Vector3(0, cardTransform.rect.height * cardTransform.lossyScale.y / 2, 0);
Vector3 startPosition = cardTransform.position; //+ new Vector3(0, cardTransform.rect.height * cardTransform.lossyScale.y / 2, 0);
Vector3 endPosition = SpaceConverter.ScreenPointToUIPoint(arrowCanvasRect, eventData.position, uiCamera);
PointerArrow mainPointerArrow = CombatUIManager.Instance.arrowsPage.mainPointerArrow;
@@ -145,7 +145,7 @@ namespace Continentis.MainGame.Card
}
else
{
mainPointerArrow.SetColor(Color.white);
mainPointerArrow.SetColor(Color.clear);
}
}
else if (card.attributeSubmodule.targetCount == -1)
@@ -156,7 +156,7 @@ namespace Continentis.MainGame.Card
{
if (hoveringCharacter != null)
{
mainPointerArrow.SetColor(Color.white);
mainPointerArrow.SetColor(Color.clear);
}
if (validTargets.Contains(hoveringCharacter))