各种修复
This commit is contained in:
@@ -246,13 +246,15 @@ namespace Continentis.MainGame.Card
|
||||
return;
|
||||
}
|
||||
|
||||
if (!validTargets.Contains(hoveringCharacter))
|
||||
{
|
||||
// 当前鼠标悬停的目标不在有效目标列表中
|
||||
return;
|
||||
}
|
||||
|
||||
if (!cardLogic.HasKeyword("TargetSelf"))
|
||||
{
|
||||
if (!validTargets.Contains(hoveringCharacter))
|
||||
{
|
||||
// 当前鼠标悬停的目标不在有效目标列表中
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 根据目标类型,打出卡牌
|
||||
|
||||
@@ -143,7 +143,6 @@ namespace Continentis.MainGame.Combat
|
||||
currentCharacter = characterController.actionOrderList[0];
|
||||
|
||||
currentCharacter.eventSubmodule.onActionStart.Invoke();
|
||||
//currentCharacter.StartActionSetUI();
|
||||
|
||||
if (currentCharacter is PlayerHero playerHero)
|
||||
{
|
||||
@@ -191,6 +190,7 @@ namespace Continentis.MainGame.Combat
|
||||
CommandQueueManager.Instance.AddCommand(new Cmd_Function(0f, EndAction));
|
||||
}
|
||||
|
||||
currentCharacter.characterView.hudContainer.UpdateAllHUD();
|
||||
currentCharacter.actionCountThisRound++;
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,8 @@ namespace Continentis.MainGame.UI
|
||||
{
|
||||
float xOffset = basePosition.x < 0 ? rectTransform.sizeDelta.x / 2 : -rectTransform.sizeDelta.x / 2;
|
||||
float yOffset = basePosition.y < Screen.height * 0.25f ? rectTransform.sizeDelta.y / 2 : -rectTransform.sizeDelta.y / 2;
|
||||
rectTransform.anchorMax = new Vector2(0.5f, 0.5f);
|
||||
rectTransform.anchorMin = new Vector2(0.5f, 0.5f);
|
||||
rectTransform.anchoredPosition = new Vector2(basePosition.x + xOffset, basePosition.y + yOffset);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace Continentis.MainGame.UI
|
||||
{
|
||||
string paramKey = synchronizedParameters[index];
|
||||
Func<string> func = buff.contentSubmodule.parameterGetters[paramKey];
|
||||
Debug.Log($"Updating buff icon text for parameter {paramKey} with func is {func == null}");
|
||||
Debug.Log($"Updating buff icon text for parameter {paramKey} with func is {func != null}");
|
||||
SetText(index, func);
|
||||
}
|
||||
|
||||
@@ -115,7 +115,8 @@ namespace Continentis.MainGame.UI
|
||||
dispelThreshold = dispelThreshold.Localize();
|
||||
|
||||
string finalDescription = buff.contentSubmodule.interpretedFunctionText + "\n" + dispelThreshold;
|
||||
infoBox.Initialize(buff.contentSubmodule.displayName, finalDescription, canvasTransform.InverseTransformPoint(rectTransform.position));
|
||||
Vector2 basePosition = canvasTransform.InverseTransformPoint(rectTransform.position);
|
||||
infoBox.Initialize(buff.contentSubmodule.displayName, finalDescription, basePosition);
|
||||
|
||||
Debug.Log("Pointer Enter Buff Icon");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user