Skip to content

M
MDPro3
Commit df8da689 authored by SherryChaos's avatar SherryChaos
Browse files
Options

small bracket for tcg languages

parent 025c707b
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 59 deletions
Assets/Scripts/MDPro3/CardRenderer.cs
View file @ df8da689
...@@ -832,12 +832,12 @@ namespace MDPro3 ...@@ -832,12 +832,12 @@ namespace MDPro3
// .Replace("\r\n⑨", "⑨"); // .Replace("\r\n⑨", "⑨");
//} //}
if (!Language.CardUseLatin(language)) if (!Language.UseLatin(language))
description = description.Replace(Program.STRING_SLASH, BIG_SLASH); description = description.Replace(Program.STRING_SLASH, BIG_SLASH);
else else
description = description.Replace(Program.STRING_SLASH, SMALL_SLASH); description = description.Replace(Program.STRING_SLASH, SMALL_SLASH);
if (!Language.CardUseLatin(language)) if (!Language.UseLatin(language))
description = description.Replace(" ", "\u00A0"); description = description.Replace(" ", "\u00A0");
description = description.Replace($"{Program.STRING_LINE_BREAK}{Program.STRING_LINE_BREAK}", Program.STRING_LINE_BREAK); description = description.Replace($"{Program.STRING_LINE_BREAK}{Program.STRING_LINE_BREAK}", Program.STRING_LINE_BREAK);
return description; return description;
......
Assets/Scripts/MDPro3/Duel/Message/DuelMessage.cs
View file @ df8da689
...@@ -11,7 +11,6 @@ using System.Linq; ...@@ -11,7 +11,6 @@ using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using UnityEngine; using UnityEngine;
using UnityEngine.Playables;
using YgomSystem.ElementSystem; using YgomSystem.ElementSystem;
using static MDPro3.Servant.OcgCore; using static MDPro3.Servant.OcgCore;
...@@ -1971,8 +1970,6 @@ namespace MDPro3.Duel ...@@ -1971,8 +1970,6 @@ namespace MDPro3.Duel
var player = myTurn ? 0 : 1; var player = myTurn ? 0 : 1;
PhaseButtonHandler.SetTextBelow(string.Empty); PhaseButtonHandler.SetTextBelow(string.Empty);
if (duelPhase == DuelPhase.Draw) if (duelPhase == DuelPhase.Draw)
PhaseButtonHandler.SetTextMain("Draw"); PhaseButtonHandler.SetTextMain("Draw");
else if(duelPhase == DuelPhase.Standby) else if(duelPhase == DuelPhase.Standby)
...@@ -2044,7 +2041,7 @@ namespace MDPro3.Duel ...@@ -2044,7 +2041,7 @@ namespace MDPro3.Duel
protected override async UniTask GameMessage_ConfirmCards(BinaryReader reader) protected override async UniTask GameMessage_ConfirmCards(BinaryReader reader)
{ {
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
if (condition != Condition.Replay || CurrentReplayUseYRP2) if (condition != Condition.Replay || CurrentReplayUseYRP2)
reader.ReadByte(); reader.ReadByte();
...@@ -2217,8 +2214,7 @@ namespace MDPro3.Duel ...@@ -2217,8 +2214,7 @@ namespace MDPro3.Duel
protected override async UniTask GameMessage_RandomSelected(BinaryReader reader) protected override async UniTask GameMessage_RandomSelected(BinaryReader reader)
{ {
//var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
reader.ReadByte();
var count = reader.ReadByte(); var count = reader.ReadByte();
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
...@@ -2472,8 +2468,7 @@ namespace MDPro3.Duel ...@@ -2472,8 +2468,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
//var player = LocalPlayer(reader.ReadChar()); /*var player = LocalPlayer(*/reader.ReadChar()/*)*/;
reader.ReadChar();
var count = reader.ReadByte(); var count = reader.ReadByte();
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
...@@ -2608,8 +2603,7 @@ namespace MDPro3.Duel ...@@ -2608,8 +2603,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
//var player = LocalPlayer(reader.ReadChar()); /*var player = LocalPlayer(*/reader.ReadChar()/*)*/;
reader.ReadChar();
var count = reader.ReadByte(); var count = reader.ReadByte();
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
...@@ -2668,8 +2662,7 @@ namespace MDPro3.Duel ...@@ -2668,8 +2662,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
//var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
reader.ReadByte();
var desc = StringHelper.Get(reader.ReadInt32()); var desc = StringHelper.Get(reader.ReadInt32());
var title = InterString.Get("选择"); var title = InterString.Get("选择");
...@@ -2706,8 +2699,7 @@ namespace MDPro3.Duel ...@@ -2706,8 +2699,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
//var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
reader.ReadByte();
/*var code = */reader.ReadInt32(); /*var code = */reader.ReadInt32();
var gps = reader.ReadShortGPS(); var gps = reader.ReadShortGPS();
...@@ -2755,7 +2747,7 @@ namespace MDPro3.Duel ...@@ -2755,7 +2747,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadChar()); /*var player = LocalPlayer(*/reader.ReadChar()/*)*/;
var count = reader.ReadByte(); var count = reader.ReadByte();
int spcount = reader.ReadByte(); int spcount = reader.ReadByte();
var hint0 = reader.ReadInt32(); var hint0 = reader.ReadInt32();
...@@ -2887,7 +2879,7 @@ namespace MDPro3.Duel ...@@ -2887,7 +2879,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var cancelable = reader.ReadByte() != 0; var cancelable = reader.ReadByte() != 0;
ES_min = reader.ReadByte(); ES_min = reader.ReadByte();
ES_max = reader.ReadByte(); ES_max = reader.ReadByte();
...@@ -2939,8 +2931,7 @@ namespace MDPro3.Duel ...@@ -2939,8 +2931,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var finishable = reader.ReadByte() != 0; var finishable = reader.ReadByte() != 0;
var cancelable = reader.ReadByte() != 0 || finishable; var cancelable = reader.ReadByte() != 0 || finishable;
ES_min = reader.ReadByte(); ES_min = reader.ReadByte();
...@@ -2984,7 +2975,7 @@ namespace MDPro3.Duel ...@@ -2984,7 +2975,7 @@ namespace MDPro3.Duel
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
ES_overFlow = reader.ReadByte() != 0; ES_overFlow = reader.ReadByte() != 0;
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
ES_level = reader.ReadInt32(); ES_level = reader.ReadInt32();
ES_min = reader.ReadByte(); ES_min = reader.ReadByte();
ES_max = reader.ReadByte(); ES_max = reader.ReadByte();
...@@ -3112,7 +3103,7 @@ namespace MDPro3.Duel ...@@ -3112,7 +3103,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var cancelable = reader.ReadByte() != 0; var cancelable = reader.ReadByte() != 0;
ES_min = reader.ReadByte(); ES_min = reader.ReadByte();
ES_max = reader.ReadByte(); ES_max = reader.ReadByte();
...@@ -3151,7 +3142,7 @@ namespace MDPro3.Duel ...@@ -3151,7 +3142,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var count = reader.ReadByte(); var count = reader.ReadByte();
if (count > 1) if (count > 1)
{ {
...@@ -3182,7 +3173,7 @@ namespace MDPro3.Duel ...@@ -3182,7 +3173,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = reader.ReadByte(); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var min = reader.ReadByte(); var min = reader.ReadByte();
if (min == 0) if (min == 0)
min = 1; min = 1;
...@@ -3235,7 +3226,7 @@ namespace MDPro3.Duel ...@@ -3235,7 +3226,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var code = reader.ReadInt32(); var code = reader.ReadInt32();
int positions = reader.ReadByte(); int positions = reader.ReadByte();
var op1 = 0x1; var op1 = 0x1;
...@@ -3279,7 +3270,7 @@ namespace MDPro3.Duel ...@@ -3279,7 +3270,7 @@ namespace MDPro3.Duel
var length_of_message = reader.BaseStream.Length; var length_of_message = reader.BaseStream.Length;
var version1033b = (length_of_message - 5) % 8 == 0; var version1033b = (length_of_message - 5) % 8 == 0;
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
reader.ReadInt16(); reader.ReadInt16();
if (version1033b) if (version1033b)
ES_min = reader.ReadByte(); ES_min = reader.ReadByte();
...@@ -3317,7 +3308,7 @@ namespace MDPro3.Duel ...@@ -3317,7 +3308,7 @@ namespace MDPro3.Duel
return; return;
duelBGManager.SetPlayableGuide(true); duelBGManager.SetPlayableGuide(true);
var player = LocalPlayer(reader.ReadByte()); /*var player = LocalPlayer(*/reader.ReadByte()/*)*/;
var ES_sortSum = 0; var ES_sortSum = 0;
var count = reader.ReadByte(); var count = reader.ReadByte();
List<GameCard> sortingCards = new List<GameCard>(); List<GameCard> sortingCards = new List<GameCard>();
......
Assets/Scripts/MDPro3/Duel/YGOSharp/Card.cs
View file @ df8da689
...@@ -368,19 +368,19 @@ namespace MDPro3.Duel.YGOSharp ...@@ -368,19 +368,19 @@ namespace MDPro3.Duel.YGOSharp
var returnValue = GetSetName(); var returnValue = GetSetName();
if (returnValue.Length > 0) if (returnValue.Length > 0)
{ {
returnValue = $"【{returnValue}】"; returnValue = $"{Language.GetLeftBracket()}{returnValue}{Language.GetRightBracket()}";
} }
return returnValue; return returnValue;
} }
public string GetIdWithBracket() public string GetIdWithBracket()
{ {
var re = $"【{Id}"; var re = $"{Language.GetLeftBracket()}{Id}";
if (Alias != 0) if (Alias != 0 && Alias != Id)
{ {
re += $"/{Alias}"; re += $"/{Alias}";
} }
re += "】"; re += Language.GetRightBracket();
return re; return re;
} }
...@@ -463,8 +463,8 @@ namespace MDPro3.Duel.YGOSharp ...@@ -463,8 +463,8 @@ namespace MDPro3.Duel.YGOSharp
var re = string.Empty; var re = string.Empty;
if (Id == 0) if (Id == 0)
return re; return re;
var bracketLeft = "【"; var bracketLeft = Language.GetLeftBracket();
var bracketRight = "】"; var bracketRight = Language.GetRightBracket();
if (HasType(CardType.Monster)) if (HasType(CardType.Monster))
re = $"{bracketLeft}{InterString.Get("[?]族", GetRaceString())}{Program.STRING_SLASH}{GetSecondType()}{bracketRight}"; re = $"{bracketLeft}{InterString.Get("[?]族", GetRaceString())}{Program.STRING_SLASH}{GetSecondType()}{bracketRight}";
else else
...@@ -480,7 +480,7 @@ namespace MDPro3.Duel.YGOSharp ...@@ -480,7 +480,7 @@ namespace MDPro3.Duel.YGOSharp
var bracketLeft = "【"; var bracketLeft = "【";
var bracketRight = "】"; var bracketRight = "】";
if (Language.CardNeedSmallBracket(isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig())) if (Language.NeedSmallBracket(isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig()))
{ {
bracketLeft = "["; bracketLeft = "[";
bracketRight = "]"; bracketRight = "]";
...@@ -507,7 +507,7 @@ namespace MDPro3.Duel.YGOSharp ...@@ -507,7 +507,7 @@ namespace MDPro3.Duel.YGOSharp
} }
re = re.Replace(Program.STRING_SLASH, re = re.Replace(Program.STRING_SLASH,
(isPre ? Language.CardUseLatin(Language.GetPrereleaseConfig()) : Language.CardUseLatin()) (isPre ? Language.UseLatin(Language.GetPrereleaseConfig()) : Language.CardUseLatin())
? CardRenderer.SMALL_SLASH : CardRenderer.BIG_SLASH); ? CardRenderer.SMALL_SLASH : CardRenderer.BIG_SLASH);
return re; return re;
...@@ -521,7 +521,7 @@ namespace MDPro3.Duel.YGOSharp ...@@ -521,7 +521,7 @@ namespace MDPro3.Duel.YGOSharp
var bracketLeft = "【"; var bracketLeft = "【";
var bracketRight = "】"; var bracketRight = "】";
if (Language.CardNeedSmallBracket(isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig())) if (Language.NeedSmallBracket(isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig()))
{ {
bracketLeft = "["; bracketLeft = "[";
bracketRight = "]"; bracketRight = "]";
......
Assets/Scripts/MDPro3/Helper/StringHelper.cs
View file @ df8da689
...@@ -400,7 +400,7 @@ namespace MDPro3 ...@@ -400,7 +400,7 @@ namespace MDPro3
var bracketLeft = "【"; var bracketLeft = "【";
var bracketRight = "】"; var bracketRight = "】";
if (render && Language.CardNeedSmallBracket(data.isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig())) if (render && Language.NeedSmallBracket(data.isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig()))
{ {
bracketLeft = "["; bracketLeft = "[";
bracketRight = "]"; bracketRight = "]";
......
Assets/Scripts/MDPro3/Utility/Language.cs
View file @ df8da689
...@@ -65,51 +65,62 @@ namespace MDPro3.Utility ...@@ -65,51 +65,62 @@ namespace MDPro3.Utility
return string.Empty; return string.Empty;
} }
public static bool UseLatin() public static bool UseLatin(string language)
{ {
var config = GetConfig(); if (language == English
if (config == English || language == Spanish
|| config == Spanish || language == Portuguese
|| config == Portuguese || language == French
|| config == French || language == German
|| config == German || language == Italian)
|| config == Italian)
return true; return true;
return false; return false;
} }
public static bool UseLatin()
{
return UseLatin(GetConfig());
}
public static bool CardUseLatin() public static bool CardUseLatin()
{ {
return CardUseLatin(GetCardConfig()); return UseLatin(GetCardConfig());
} }
public static bool CardUseLatin(string language) public static bool NeedSmallBracket(string language)
{ {
if (language == English if (UseLatin(language) || language == Korean)
|| language == Spanish
|| language == Portuguese
|| language == French
|| language == German
|| language == Italian)
return true; return true;
return false; return false;
} }
public static bool NeedSmallBracket()
{
return NeedSmallBracket(GetConfig());
}
public static bool CardNeedSmallBracket() public static bool CardNeedSmallBracket()
{ {
return CardNeedSmallBracket(GetCardConfig()); return NeedSmallBracket(GetCardConfig());
} }
public static bool CardNeedSmallBracket(string language) public static string GetLeftBracket()
{ {
if (CardUseLatin() || language == Korean) if (NeedSmallBracket())
return true; return "[";
return false; return "【";
}
public static string GetRightBracket()
{
if (NeedSmallBracket())
return "]";
return "】";
} }
public static bool NeedSpSummonString(string language) public static bool NeedSpSummonString(string language)
{ {
return !CardUseLatin(language); return !UseLatin(language);
} }
public static string GetMasterDuelLanguage(string language) public static string GetMasterDuelLanguage(string language)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment