Skip to content

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

bug fix 

see UpdateContent.txt for detail.
parent f2eca0b1
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 41 deletions
.DS_Store 0 → 100644
View file @ 0816fc25
File added
Assets/Addressables/Text/UpdateContent.txt
View file @ 0816fc25
MDPro3 v1.2.7.1更新：
1.修复安卓端决斗中无法更换副卡组卡片的错误。
2.修复在线卡组无法预览的错误。
MDPro3 v1.2.7更新：
1.现在可以更改卡组的三大代表卡了。
2.修复本地联机功能不能连接外网的错误。
......@@ -11,7 +15,7 @@ MDPro3 v1.2.6更新：
4.修复非中文时，主菜单文字显示不全的错误。
5.新增投稿Cutin动画：珠泪哀歌族·鲁莎卡人鱼、库拉莉亚之虫惑魔、秘仪之力EX-光之支配者。
MDPro3 v1.2.5.1更新：
MDPro3 v1.2.5.2更新：
1.修复系统语言为非中文时，主菜单字体不显示的错误。
2.修复分辨率比例16:9以下时，编辑卡组界面在编辑副卡组时显示不全的错误。
......
Assets/Prefabs/MasterDuel/DeckEditUI.prefab
View file @ 0816fc25
......@@ -4851,7 +4851,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.00048828125}
m_AnchoredPosition: {x: 0, y: -0.000061035156}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &114370118717810803
......@@ -23267,7 +23267,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 452, y: -48}
m_SizeDelta: {x: 692, y: 60}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &114842799682658301
MonoBehaviour:
......@@ -63799,7 +63799,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 224650691368589965}
m_Direction: 2
m_Value: 0
m_Size: 0.9999977
m_Size: 0.9999957
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -95868,7 +95868,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 28de5a57650f8724eaff0ef9c66127e9, type: 3}
m_Sprite: {fileID: 21300000, guid: c25b177c0f1d95845af71b1a0b50edcf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Assets/Prefabs/ServantUI/DeckBrowserUI.prefab
View file @ 0816fc25
......@@ -3786,7 +3786,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 116, y: 0}
m_SizeDelta: {x: 960, y: 44}
m_SizeDelta: {x: 960, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &114380707930180569
MonoBehaviour:
......@@ -3818,8 +3818,8 @@ MonoBehaviour:
m_DefaultValue: {x: 116, y: 0}
m_MobileValue: {x: 152, y: 0}
m_SizeDelta:
m_DefaultValue: {x: 960, y: 44}
m_MobileValue: {x: 960, y: 44}
m_DefaultValue: {x: 960, y: 50}
m_MobileValue: {x: 960, y: 60}
debug: 0
--- !u!222 &222223138037354736
CanvasRenderer:
......@@ -3876,7 +3876,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Assets/Prefabs/ServantUI/DeckBrowserUIMobile.prefab
View file @ 0816fc25
......@@ -34001,7 +34001,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 3510518714693361067}
m_Direction: 2
m_Value: 1
m_Size: 0.81371814
m_Size: 0.8152175
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -39394,8 +39394,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 116, y: 0}
m_SizeDelta: {x: 960, y: 44}
m_AnchoredPosition: {x: 152, y: 0}
m_SizeDelta: {x: 960, y: 60}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2001270087942882399
MonoBehaviour:
......@@ -39427,8 +39427,8 @@ MonoBehaviour:
m_DefaultValue: {x: 116, y: 0}
m_MobileValue: {x: 152, y: 0}
m_SizeDelta:
m_DefaultValue: {x: 960, y: 44}
m_MobileValue: {x: 960, y: 44}
m_DefaultValue: {x: 960, y: 50}
m_MobileValue: {x: 960, y: 60}
debug: 0
--- !u!222 &7433859073030925942
CanvasRenderer:
......@@ -39485,7 +39485,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Assets/Prefabs/ServantUI/DeckEditorUI.prefab
View file @ 0816fc25
......@@ -16239,7 +16239,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 7446650972608614846}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Size: 0.18032767
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -43980,8 +43980,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_AnchoredPosition: {x: -4, y: 8}
m_SizeDelta: {x: 72, y: 72}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2959707533263195818
MonoBehaviour:
......@@ -44024,7 +44024,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 28de5a57650f8724eaff0ef9c66127e9, type: 3}
m_Sprite: {fileID: 21300000, guid: c25b177c0f1d95845af71b1a0b50edcf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -81286,7 +81286,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 6524435541314575836}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Size: 0.64285713
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -86075,7 +86075,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -0.000061035156}
m_SizeDelta: {x: 0, y: 500}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8957022839683353519
......@@ -96284,7 +96284,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 4664753718165055069}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Size: 0.6923077
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Assets/Prefabs/ServantUI/DeckEditorUIMobile.prefab
View file @ 0816fc25
......@@ -358,7 +358,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 9107187794868887960}
m_Direction: 2
m_Value: 1
m_Size: 0.90667164
m_Size: 0.908171
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -14603,7 +14603,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 7446650972608614846}
m_Direction: 2
m_Value: 1
m_Size: 0.6575
m_Size: 0.6595001
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -35376,10 +35376,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 563439163761149202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 48}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 41, y: -36}
m_SizeDelta: {x: 48, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6555986894017888949
CanvasRenderer:
......@@ -36887,8 +36887,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -2, y: 0}
m_SizeDelta: {x: 70, y: 70}
m_AnchoredPosition: {x: -5, y: 11}
m_SizeDelta: {x: 92, y: 92}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2959707533263195818
MonoBehaviour:
......@@ -36931,7 +36931,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 28de5a57650f8724eaff0ef9c66127e9, type: 3}
m_Sprite: {fileID: 21300000, guid: c25b177c0f1d95845af71b1a0b50edcf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -72166,7 +72166,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 12
m_Right: 0
m_Top: 0
m_Bottom: 0
......@@ -82955,10 +82955,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 563439163761149202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 48}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89, y: -36}
m_SizeDelta: {x: 48, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8440842039889988899
CanvasRenderer:
Assets/Scripts/MDPro3/UI/SelectionButton/SelectionButton_CardInDeck.cs
View file @ 0816fc25
......@@ -515,7 +515,8 @@ namespace MDPro3.UI
private bool NeedResponseDrag()
{
return deckView.condition == Condition.Editable;
return deckView.condition == Condition.Editable
|| deckView.condition == Condition.ChangeSide;
}
public void OnBeginDrag(PointerEventData eventData)
......
Assets/Scripts/MDPro3/UI/ServantUI/DeckEditorUI.cs
View file @ 0816fc25
......@@ -354,11 +354,11 @@ namespace MDPro3.UI.ServantUI
else if (condition == Condition.ChangeSide)
editConditon = DeckView.Condition.ChangeSide;
DeckView.PrintDeck(DeckEditor.Deck, DeckName, editConditon);
DeckView.ButtonDeck.SetClickEvent(OnDeckButtonClicked);
if (DeckEditor.Deck == null)
loadOnlineDeckCoroutine = StartCoroutine(LoadOnlineDeckAsync());
else
DeckView.PrintDeck(DeckEditor.Deck, DeckName, editConditon);
SetDeckButtonText();
}
......@@ -377,6 +377,7 @@ namespace MDPro3.UI.ServantUI
DeckName = onlineDeckData.deckName;
DeckEditor.Deck = new Deck(onlineDeckData.deckYdk, onlineDeckData.deckContributor);
InitializeDeckView();
loadOnlineDeckCoroutine = null;
}
......
Data/locales/zh-CN/translation.conf
View file @ 0816fc25
......@@ -680,3 +680,20 @@ YDK 内容不合法，主卡组必须满 40 张->YDK 内容不合法，主卡组
超魔机神 大霸道王->超魔机神 大霸道王
祭神 莫多丽娜->祭神 莫多丽娜
当方英雄->当方英雄
扩大->扩大
赤子奈落->赤子奈落
重试->重试
开启或关闭屏幕右上角的帧数显示->开启或关闭屏幕右上角的帧数显示
卡组设置为准->卡组设置为准
可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。
可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。
可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。
可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。->可以设置三大代表卡在卡组菜单中显示。
※更改三大代表卡不会影响决斗。
ProjectSettings/ProjectSettings.asset
View file @ 0816fc25
......@@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.2.7
bundleVersion: 1.2.7.1
preloadedAssets:
- {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
- {fileID: -944628639613478452, guid: a916821eb5eea2842a69be6041bcdb82, type: 3}
......@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs: 0b000000
m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 02000000
m_APIs: 0b00000002000000
m_Automatic: 0
m_BuildTargetVRSettings:
- m_BuildTarget: Standalone
......
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