Skip to content

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

update version

parent a0c99739
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 19017 deletions
Assets/Addressables/Text/UpdateContent.txt
View file @ ec7058e1
MDPro3 v1.4.0更新：
1.新卡片特效：墓穴的指名者[24224831]；
2.新背景：4th Anniversary；
3.新决斗链接语音角色：纳修[0416]、纳修[0447]；
4.修复残局中伙伴不显示的错误；
MDPro3 v1.3.9更新：
1.新动态卡图：超魔导龙骑士-真红眼龙骑士[37818794]、
黑魔术少女[38033128]、黑魔术师[46986427]、
......
Assets/Fonts/FZZYJW.asset
View file @ ec7058e1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Fonts/RenderFontChineseSimplified.asset
View file @ ec7058e1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Fonts/SourceHanSansSC-Bold.asset
View file @ ec7058e1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Fonts/SourceHanSansSC-Medium.asset
View file @ ec7058e1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Resources/Settings/UniversalRenderPipelineGlobalSettings.asset
View file @ ec7058e1
......@@ -36,21 +36,21 @@ MonoBehaviour:
- rid: 5650211206403981510
- rid: 5650211206403981511
- rid: 5650211206403981512
- rid: 6273826596632920161
- rid: 6273826954913251429
- rid: 5650211206403981514
- rid: 5650211206403981515
- rid: 6273826596632920162
- rid: 6273826596632920163
- rid: 6273826954913251430
- rid: 6273826954913251431
- rid: 5650211206403981518
- rid: 6273826596632920164
- rid: 6273826954913251432
- rid: 5650211206403981520
- rid: 6273826596632920165
- rid: 6273826596632920166
- rid: 6273826596632920167
- rid: 6273826596632920168
- rid: 6273826596632920169
- rid: 6273826596632920170
- rid: 6273826596632920171
- rid: 6273826954913251433
- rid: 6273826954913251434
- rid: 6273826954913251435
- rid: 6273826954913251436
- rid: 6273826954913251437
- rid: 6273826954913251438
- rid: 6273826954913251439
- rid: 5650211206403981528
- rid: 5650211206403981529
- rid: 5650211206403981530
......@@ -160,7 +160,7 @@ MonoBehaviour:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 6273826596632920161
- rid: 6273826954913251429
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
......@@ -175,14 +175,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 6273826596632920162
- rid: 6273826954913251430
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 6273826596632920163
- rid: 6273826954913251431
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
......@@ -190,7 +190,7 @@ MonoBehaviour:
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 6273826596632920164
- rid: 6273826954913251432
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
......@@ -202,7 +202,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 6273826596632920165
- rid: 6273826954913251433
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
......@@ -215,13 +215,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 6273826596632920166
- rid: 6273826954913251434
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 6273826596632920167
- rid: 6273826954913251435
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -234,12 +234,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 6273826596632920168
- rid: 6273826954913251436
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 6273826596632920169
- rid: 6273826954913251437
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......@@ -249,14 +249,14 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 6273826596632920170
- rid: 6273826954913251438
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 6273826596632920171
- rid: 6273826954913251439
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
......
Assets/Scripts/MDPro3/Duel/YGOSharp/Card.cs
View file @ ec7058e1
......@@ -204,11 +204,11 @@ namespace MDPro3.Duel.YGOSharp
public bool IsHighLevel()
{
if(HasType(CardType.Link) && GetLinkCount() > 2)
if (HasType(CardType.Link) && GetLinkCount() > 2)
return true;
if(HasType(CardType.Xyz) && Level > 3)
if (HasType(CardType.Xyz) && Level > 3)
return true;
if(Level > 6)
if (Level > 6)
return true;
return false;
}
......@@ -237,19 +237,76 @@ namespace MDPro3.Duel.YGOSharp
return Defense == -2 ? "?" : Defense.ToString();
}
// Put this near other fields/helpers inside Card class:
private static readonly string PendulumSeparatorLine = new string('─', 14);
public string GetDescription(bool withSetName = false)
{
if (HasType(CardType.Pendulum))
{
if (!HasType(CardType.Pendulum))
return (withSetName ? GetSetNameWithColor() : string.Empty) + Desc;
var setName = withSetName ? GetSetNameWithColor() : string.Empty;
var texts = GetDescriptionSplit();
string monster = InterString.Get("【怪兽效果】");
var pendulumText = texts[0]?.Trim('\r', '\n');
var monsterText = texts[1]?.Trim('\r', '\n');
var language = Language.GetConfig();
// Apply "official-like" panel layout for ALL languages except Korean:
// Monster text (no header) -> separator -> [Pendulum Effect] -> pendulum text
if (language != Language.Korean)
{
var pendulumHeader = NormalizeBracketLabel(InterString.Get("【灵摆效果】"));
var result = setName + (monsterText ?? string.Empty);
if (!string.IsNullOrEmpty(pendulumText))
{
if (!string.IsNullOrEmpty(monsterText))
result += "\n" + PendulumSeparatorLine + "\n";
else if (!string.IsNullOrEmpty(result))
result += "\n";
result += pendulumHeader + "\n" + pendulumText;
}
return result;
}
// Korean: keep the old behavior (already working for you)
string monsterHeader = InterString.Get("【怪兽效果】");
if (!HasType(CardType.Effect))
monster = InterString.Get("【怪兽描述】");
monsterHeader = InterString.Get("【怪兽描述】");
return (withSetName ? GetSetNameWithColor() : string.Empty) + InterString.Get("【灵摆效果】") + "\n" + texts[0] + "\n" + monster + "\n" + texts[1];
var pendulumHeaderK = NormalizeBracketLabel(InterString.Get("【灵摆效果】"));
monsterHeader = NormalizeBracketLabel(monsterHeader);
return setName
+ pendulumHeaderK + "\n" + (pendulumText ?? string.Empty)
+ "\n" + monsterHeader + "\n" + (monsterText ?? string.Empty);
}
else
return (withSetName ? GetSetNameWithColor() : string.Empty) + Desc;
private static string NormalizeBracketLabel(string label)
{
if (string.IsNullOrEmpty(label))
return string.Empty;
// Remove extra spaces inside brackets: "[ xxx ]" -> "[xxx]" / "【 xxx 】" -> "【xxx】"
label = label.Replace("[ ", "[")
.Replace(" ]", "]")
.Replace("【 ", "【")
.Replace(" 】", "】");
// Ensure bracket glyphs match current UI language.
// TrimEnd so we don't accidentally embed the " ] " trailing space inside the label itself.
var left = Language.GetLeftBracket();
var right = Language.GetRightBracket().TrimEnd();
label = label.Replace("【", left).Replace("】", right)
.Replace("[", left).Replace("]", right);
return label.Trim();
}
public string GetMonsterDescription(bool render = false)
......@@ -431,7 +488,7 @@ namespace MDPro3.Duel.YGOSharp
public static string GetSpellTrapType(int cardType, int type = 0)
{
if((cardType & (int)CardType.Spell) > 0)
if ((cardType & (int)CardType.Spell) > 0)
{
if ((cardType & (int)CardType.Field) > 0)
return InterString.Get("场地魔法", type);
......@@ -483,7 +540,7 @@ namespace MDPro3.Duel.YGOSharp
if (Language.NeedSmallBracket(isPre ? Language.GetPrereleaseConfig() : Language.GetCardConfig()))
{
bracketLeft = "[";
bracketRight = "]";
bracketRight = "] ";
}
if (HasType(CardType.Monster))
......@@ -493,7 +550,7 @@ namespace MDPro3.Duel.YGOSharp
else
{
var type = 1;
if(isPre)
if (isPre)
type = 2;
re = bracketLeft;
if (HasType(CardType.Spell))
......
Assets/Scripts/MDPro3/Program.cs
View file @ ec7058e1
......@@ -8,9 +8,6 @@ using UnityEngine.AddressableAssets;
using MDPro3.Net;
using MDPro3.Servant;
using Cysharp.Threading.Tasks;
using MDPro3.Utility;
#if UNITY_EDITOR
using UnityEditor;
......
ProjectSettings/ProjectSettings.asset
View file @ ec7058e1
......@@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.3.9
bundleVersion: 1.4.0
preloadedAssets:
- {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
- {fileID: -944628639613478452, guid: a916821eb5eea2842a69be6041bcdb82, type: 3}
......
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