Skip to content

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

case bug fix and translation update

parent edcd3c7c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5373 additions and 1363 deletions
Assets/Fonts/SourceHanSansSC-Medium.asset
View file @ a6596322
......@@ -143,6 +143,96 @@ MonoBehaviour:
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -0.09
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 14
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -0.18
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 16
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 19
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0.09
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0.18
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 19
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -0.36
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 22
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
- m_FirstAdjustmentRecord:
m_GlyphIndex: 18
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: -0.09
m_YAdvance: 0
m_SecondAdjustmentRecord:
m_GlyphIndex: 25
m_GlyphValueRecord:
m_XPlacement: 0
m_YPlacement: 0
m_XAdvance: 0
m_YAdvance: 0
m_FeatureLookupFlags: 0
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
......
Assets/Prefabs/ServantUI/OcgCoreUI.prefab
View file @ a6596322
......@@ -1425,7 +1425,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
......@@ -4463,7 +4463,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 3411319760472490572}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Size: 0.6103896
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -5388,7 +5388,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
......@@ -5613,7 +5613,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
......@@ -9288,7 +9288,7 @@ CanvasGroup:
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!1 &8422267094097420899
GameObject:
......
Assets/ScriptableObjects/Items.asset
View file @ a6596322
This diff is collapsed.
Assets/Scripts/MDPro3/Duel/YgoServer.cs
View file @ a6596322
......@@ -6,9 +6,9 @@ namespace MDPro3.Net
{
internal static unsafe class Dll
{
[DllImport("ygoserver", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
public static extern int start_server([MarshalAs(UnmanagedType.LPStr)] string args);
[DllImport("ygoserver", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
[DllImport("ygoserver", CallingConvention = CallingConvention.Cdecl)]
public static extern int start_server([MarshalAs(UnmanagedType.LPUTF8Str)] string args);
[DllImport("ygoserver", CallingConvention = CallingConvention.Cdecl)]
public static extern void stop_server();
}
......
Assets/Scripts/MDPro3/Servant/CutinViewer.cs
View file @ a6596322
......@@ -286,9 +286,9 @@ namespace MDPro3.Servant
//Name Bar
GameObject nameBar;
if (controller == 0)
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_near", true);
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_near", true);
else
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/01Text/SummonMonster_Name_far", true);
nameBar = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/01Text/SummonMonster_Name_far", true);
nameBar.transform.SetParent(Program.instance.container_2D, false);
var manager = nameBar.GetComponent<ElementObjectManager>();
......@@ -370,7 +370,7 @@ namespace MDPro3.Servant
Destroy(nameBar, CUTIN_PLAY_TIME);
//front Effect
var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/summonmonster/02FrontEff/SummonMonster_Thunder_power", true);
var frontEffect = ABLoader.LoadFromFile("MasterDuel/Timeline/Summon/SummonMonster/02FrontEff/SummonMonster_Thunder_power", true);
frontEffect.transform.SetParent(Program.instance.container_2D, false);
Destroy(frontEffect, CUTIN_PLAY_TIME);
}
......
Assets/Scripts/Tools/AssetBundleRobber.cs
View file @ a6596322
......@@ -16,6 +16,7 @@ public class AssetBundleRobber : MonoBehaviour
{
public Text text;
private static Text sText;
public TMP_InputField input;
private string pathAB;
private string pathStore;
......@@ -63,14 +64,14 @@ public class AssetBundleRobber : MonoBehaviour
Application.targetFrameRate = 0;
//masterDuelAssetBundlePath = masterDuelWindowsAssetBundlePath;
//workingPlace = windowsWorkingPlace;
pathAB = PATH_AB_WINDOWS;
pathStore = PATH_STORE_WINDOWS;
//pathAB = PATH_AB_ANDROID;
//pathStore = PATH_STORE_ANDROID;
pathAB = PATH_AB_IOS;
pathStore = PATH_STORE_IOS;
//pathAB = PATH_AB_IOS;
//pathStore = PATH_STORE_IOS;
fullCopy = true;
//fullCopy = false;
......@@ -81,7 +82,6 @@ public class AssetBundleRobber : MonoBehaviour
//Copy("531fb6fa");
}
public TMP_InputField input;
public void CopyAB()
{
......
Data/Rarity.json
View file @ a6596322
......@@ -19,7 +19,8 @@
65957473,
10045474,
26973555,
29587993
29587993,
5405695
],
"BookCards": [
5405695,
......
Data/cards.json
View file @ a6596322
This diff is collapsed.
Data/cards_Lite.json
View file @ a6596322
This diff is collapsed.
Data/locales/zh-CN/translation.conf
View file @ a6596322
......@@ -697,3 +697,4 @@ YDK 内容不合法，主卡组必须满 40 张->YDK 内容不合法，主卡组
可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。
悠悠王->悠悠王
Tools/Translations/translations.csv
View file @ a6596322
This source diff could not be displayed because it is too large. You can view the blob instead.
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