Commit ef185576 authored by SherryChaos's avatar SherryChaos

bug fix

parent 97105cdd
...@@ -5,7 +5,7 @@ MDPro3 v1.3.1更新: ...@@ -5,7 +5,7 @@ MDPro3 v1.3.1更新:
2.修复Linux端决斗中需要显示“解放怪兽”特效时,游戏卡死的问题。 2.修复Linux端决斗中需要显示“解放怪兽”特效时,游戏卡死的问题。
3.*修复Mac端非Apple Silicon芯片的设备无法本地决斗的错误。 3.*修复Mac端非Apple Silicon芯片的设备无法本地决斗的错误。
4.*修复非Windows端无法导入、导出文件的错误。 4.*修复非Windows端无法导入、导出文件的错误。
5.修复安卓端和Linux端中,外观设置中CrossDuel的宠物选项不显示的错误。 5.修复安卓端和Linux端中,外观设置中CrossDuel的宠物选项不显示图标的错误。
6.修复游戏启动后不同步在线卡组的错误。 6.修复游戏启动后不同步在线卡组的错误。
7.修复观战时,若服务器已经断连,保存或放弃当前局录像后会直接退出,无法继续观战下一局的错误。 7.修复观战时,若服务器已经断连,保存或放弃当前局录像后会直接退出,无法继续观战下一局的错误。
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -6579,7 +6579,7 @@ Transform: ...@@ -6579,7 +6579,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9, y: 1, z: 0.9} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 4677657357444967} - {fileID: 4677657357444967}
......
...@@ -21222,7 +21222,7 @@ MonoBehaviour: ...@@ -21222,7 +21222,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 27.8 m_fontSize: 28.35
m_fontSizeBase: 30 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
...@@ -38215,10 +38215,10 @@ RectTransform: ...@@ -38215,10 +38215,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 3783410452220043591} m_Father: {fileID: 3783410452220043591}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 34, y: -23} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3530886934732816922 --- !u!222 &3530886934732816922
CanvasRenderer: CanvasRenderer:
...@@ -71171,10 +71171,10 @@ RectTransform: ...@@ -71171,10 +71171,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 3783410452220043591} m_Father: {fileID: 3783410452220043591}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 74, y: -23} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8953983579549377767 --- !u!222 &8953983579549377767
CanvasRenderer: CanvasRenderer:
This diff is collapsed.
...@@ -175,6 +175,7 @@ namespace MDPro3 ...@@ -175,6 +175,7 @@ namespace MDPro3
int currentKey = 0; int currentKey = 0;
List<string> currentValue = null; List<string> currentValue = null;
bool notNeed = false;
foreach (var line in lines) foreach (var line in lines)
{ {
...@@ -184,10 +185,18 @@ namespace MDPro3 ...@@ -184,10 +185,18 @@ namespace MDPro3
targetDic.Add(currentKey, string.Join(Environment.NewLine, currentValue)); targetDic.Add(currentKey, string.Join(Environment.NewLine, currentValue));
currentKey = key; currentKey = key;
currentValue = new List<string>(); currentValue = new List<string>();
notNeed = false;
}
else if (line.StartsWith("[IDS_ITEM."))// [IDS_ITEM.CATEGORY_0001] [IDS_ITEM.SPCATEGORY_0003]
{
notNeed = true;
} }
else else
{
if(!notNeed)
currentValue?.Add(line); currentValue?.Add(line);
} }
}
if (currentValue != null) if (currentValue != null)
{ {
......
...@@ -548,7 +548,7 @@ namespace MDPro3.UI ...@@ -548,7 +548,7 @@ namespace MDPro3.UI
hintObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_EXdeck_001", true); hintObj = ABLoader.LoadFromFile("MasterDuel/Effects/Hitghlight/fxp_HL_EXdeck_001", true);
hintObj.transform.SetParent(transform, false); hintObj.transform.SetParent(transform, false);
int cardCount = Program.instance.ocgcore.GetLocationCardCount((CardLocation)location, controller); int cardCount = Program.instance.ocgcore.GetLocationCardCount((CardLocation)location, controller);
hintObj.transform.localScale = new Vector3(1.1f, cardCount * 0.1f, 1.1f); hintObj.transform.localScale = new Vector3(1f, cardCount * 0.1f, 1f);
} }
} }
......
...@@ -414,8 +414,7 @@ namespace MDPro3.UI ...@@ -414,8 +414,7 @@ namespace MDPro3.UI
{ {
SpellTrapType.SetActive(true); SpellTrapType.SetActive(true);
IconSpellTrapType.sprite = TextureManager.container.GetCardSpellTrapTypeIcon(data); IconSpellTrapType.sprite = TextureManager.container.GetCardSpellTrapTypeIcon(data);
TextSpellTrapType.text TextSpellTrapType.text = data.GetSpellTrapType();
= StringHelper.SecondType(data.Type) + StringHelper.MainType(data.Type);
IconAtk.gameObject.SetActive(false); IconAtk.gameObject.SetActive(false);
IconDef.gameObject.SetActive(false); IconDef.gameObject.SetActive(false);
......
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