Skip to content

修复字体描边错误和稻草人使用错误 #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bilimoing wants to merge 1 commit into
base: 1.4.5
Choose a base branch
from
Open

修复字体描边错误和稻草人使用错误 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Content/Items/Dummy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,8 @@ public override void SetDefaults()

public override bool? UseItem(Player player)
{
return base.UseItem(player);
}
public override bool AltFunctionUse(Player player)
{
return true;
}
public override bool CanUseItem(Player player)
{
/*if (Main.netMode == NetmodeID.MultiplayerClient)
{
AddNotification(GetText("Items.Dummy.CannotUse"), Color.PaleVioletRed * 1.4f);
return false;
}*/
if (Main.myPlayer != player.whoAmI) return false;

if (player.altFunctionUse == 2)
{
foreach (var npc in Main.npc)
Expand Down Expand Up @@ -65,6 +53,19 @@ public override bool CanUseItem(Player player)

return true;
}
public override bool AltFunctionUse(Player player)
{
return true;
}
public override bool CanUseItem(Player player)
{
/*if (Main.netMode == NetmodeID.MultiplayerClient)
{
AddNotification(GetText("Items.Dummy.CannotUse"), Color.PaleVioletRed * 1.4f);
return false;
}*/
return Main.myPlayer == player.whoAmI;
}
public override void HoldStyle(Player player, Rectangle heldItemFrame)
{
if (Main.myPlayer != player.whoAmI) return;
Expand Down
2 changes: 1 addition & 1 deletion UIFramework/SUIElements/SUIText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public override void DrawSelf(SpriteBatch spriteBatch)

var scale = new Vector2(TextScale);
ChatManager.DrawColorCodedStringShadow(spriteBatch, Font, FinalTextSnippets
, textPos, TextColor, 0f, Vector2.Zero, scale, -1, TextBorder);
, textPos, TextBorderColor, 0f, Vector2.Zero, scale, -1, TextBorder);

ChatManager.DrawColorCodedString(spriteBatch, Font, FinalTextSnippets,
textPos, TextColor, 0f, Vector2.Zero, scale, out var _, -1f);
Expand Down