Skip to content

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

ygo update and bug fix

parent 975a1c71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 494 additions and 12877 deletions
Assets/AddressableAssetsData/link.xml 0 → 100644
View file @ f8448e85
This diff is collapsed.
Assets/AddressableAssetsData/link.xml.meta 0 → 100644
View file @ f8448e85
fileFormatVersion: 2
guid: 6229295705e10e94480978bbe7541bc1
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Addressables/Text/UpdateContent.txt
View file @ f8448e85
...@@ -13,7 +13,7 @@ MDPro v1.2.0更新： ...@@ -13,7 +13,7 @@ MDPro v1.2.0更新：
PS：新增的选项会在至少运行一次新版本游戏后才会出现。 PS：新增的选项会在至少运行一次新版本游戏后才会出现。
6.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。 6.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。
7.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。 7.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。
8.卡片详情中保存卡图新增一键[保存所有卡图]和[一键保存所有衍生物卡图]的选项。 8.卡片详情中保存卡图新增一键保存[当前卡组卡图][所有衍生物卡图][所有卡图]的选项。
9.为超量素材和被破坏的卡片添加移动尾迹。 9.为超量素材和被破坏的卡片添加移动尾迹。
10.修复决斗中无法在卡片详情中保存卡图的错误。 10.修复决斗中无法在卡片详情中保存卡图的错误。
11.修复安卓端[天霆号 阿宙斯]的卡片特效的显示错误。 11.修复安卓端[天霆号 阿宙斯]的卡片特效的显示错误。
......
Assets/Fonts/Brock.asset
View file @ f8448e85
This diff is collapsed.
Assets/Fonts/Ro_GSan_Serif_Std.asset
View file @ f8448e85
This diff is collapsed.
Assets/Scripts/MDPro3/Boot.cs
View file @ f8448e85
...@@ -89,11 +89,12 @@ namespace MDPro3 ...@@ -89,11 +89,12 @@ namespace MDPro3
IEnumerator CheckFile() IEnumerator CheckFile()
{ {
//V1.2.0.0 Delete Folder MonsterCutin //V1.2.0.0 Delete Folder MonsterCutin
if(Application.version == "1.2.0.0") if(Application.version == "1.2.0")
{ {
if(Config.Get("Android-V1.2.0.0_install", "0") == "0") if(Config.Get("Android-V1.2.0_install", "0") == "0")
{ {
Directory.Delete("Android/MonsterCutin"); Directory.Delete("Android/MonsterCutin");
} }
} }
......
Assets/Scripts/MDPro3/Duel/CardDetail.cs
View file @ f8448e85
...@@ -267,10 +267,10 @@ namespace MDPro3 ...@@ -267,10 +267,10 @@ namespace MDPro3
List<string> selections = new List<string> List<string> selections = new List<string>
{ {
InterString.Get("保存选项"), InterString.Get("保存选项"),
InterString.Get("保存当前卡图"), InterString.Get("当前卡片卡图"),
InterString.Get("保存卡组卡图"), InterString.Get("当前卡组卡图"),
InterString.Get("保存所有衍生物卡图"), InterString.Get("所有衍生物卡图"),
InterString.Get("保存所有卡图"), InterString.Get("所有卡图"),
}; };
UIManager.ShowPopupSelection(selections, CardPictureSaveOption); UIManager.ShowPopupSelection(selections, CardPictureSaveOption);
} }
...@@ -278,13 +278,13 @@ namespace MDPro3 ...@@ -278,13 +278,13 @@ namespace MDPro3
{ {
string selected = UnityEngine.EventSystems.EventSystem.current. string selected = UnityEngine.EventSystems.EventSystem.current.
currentSelectedGameObject.transform.GetChild(0).GetComponent<Text>().text; currentSelectedGameObject.transform.GetChild(0).GetComponent<Text>().text;
if (selected == InterString.Get("保存当前卡图")) if (selected == InterString.Get("当前卡片卡图"))
SaveShowingCard(); SaveShowingCard();
else if (selected == InterString.Get("保存卡组卡图")) else if (selected == InterString.Get("当前卡组卡图"))
SaveDeckCards(); SaveDeckCards();
else if (selected == InterString.Get("保存所有衍生物卡图")) else if (selected == InterString.Get("所有衍生物卡图"))
SaveAllTokens(); SaveAllTokens();
else if (selected == InterString.Get("保存所有卡图")) else if (selected == InterString.Get("所有卡图"))
SaveAllCards(); SaveAllCards();
} }
......
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ f8448e85
...@@ -997,6 +997,56 @@ namespace MDPro3 ...@@ -997,6 +997,56 @@ namespace MDPro3
int needSync = 0; int needSync = 0;
float extraWait = 0f; float extraWait = 0f;
bool handAppeal = false;
bool fieldAppeal = false;
var ease = Ease.Unset;
if (overrideMoveTime > 0f)
{
moveTime = overrideMoveTime;
}
else
{
switch (Program.I().ocgcore.currentMessage)
{
case GameMessage.Draw:
if (p.controller == 0)
{
moveTime = 0.6f;
handAppeal = true;
}
else
moveTime = 0.3f;
break;
case GameMessage.Move:
if ((p.location & (uint)CardLocation.Onfield) > 0
&& cacheP != null
&& (cacheP.location & (uint)CardLocation.Onfield) == 0
&& (p.location & (uint)CardLocation.Overlay) == 0)
{
moveTime = 0.4f;
fieldAppeal = true;
}
else if ((p.location & (uint)CardLocation.Hand) > 0
&& p.controller == 0)
{
moveTime = 0.6f;
handAppeal = true;
}
else
moveTime = 0.3f;
break;
case GameMessage.FlipSummoning:
case GameMessage.PosChange:
moveTime = 0.1f;
break;
case GameMessage.ShuffleSetCard:
case GameMessage.Swap:
moveTime = 0.2f;
break;
}
}
//From 贏華 or 壺俋 //From 贏華 or 壺俋
if ((cacheP.location & ((uint)CardLocation.Grave + (uint)CardLocation.Removed)) > 0) if ((cacheP.location & ((uint)CardLocation.Grave + (uint)CardLocation.Removed)) > 0)
timePassed += SequenceFromGrave(sequence, cacheP); timePassed += SequenceFromGrave(sequence, cacheP);
...@@ -1010,6 +1060,8 @@ namespace MDPro3 ...@@ -1010,6 +1060,8 @@ namespace MDPro3
&& (cacheP.location & ((uint)CardLocation.Onfield + (uint)CardLocation.Hand)) > 0 && (cacheP.location & ((uint)CardLocation.Onfield + (uint)CardLocation.Hand)) > 0
) )
{ {
moveTime = 0.5f;
extraWait = 0.05f;
se = "SE_CARDBREAK_01"; se = "SE_CARDBREAK_01";
if ((data.Type & (uint)CardType.Token) == 0) if ((data.Type & (uint)CardType.Token) == 0)
{ {
...@@ -1202,55 +1254,6 @@ namespace MDPro3 ...@@ -1202,55 +1254,6 @@ namespace MDPro3
goto SummonPass; goto SummonPass;
} }
bool handAppeal = false;
bool fieldAppeal = false;
var ease = Ease.Unset;
if (overrideMoveTime > 0f)
{
moveTime = overrideMoveTime;
}
else
{
switch (Program.I().ocgcore.currentMessage)
{
case GameMessage.Draw:
if (p.controller == 0)
{
moveTime = 0.6f;
handAppeal = true;
}
else
moveTime = 0.2f;
break;
case GameMessage.Move:
if ((p.location & (uint)CardLocation.Onfield) > 0
&& cacheP != null
&& (cacheP.location & (uint)CardLocation.Onfield) == 0
&& (p.location & (uint)CardLocation.Overlay) == 0)
{
moveTime = 0.4f;
fieldAppeal = true;
}
else if ((p.location & (uint)CardLocation.Hand) > 0
&& p.controller == 0)
{
moveTime = 0.6f;
handAppeal = true;
}
else
moveTime = 0.3f;
break;
case GameMessage.FlipSummoning:
case GameMessage.PosChange:
moveTime = 0.1f;
break;
case GameMessage.ShuffleSetCard:
case GameMessage.Swap:
moveTime = 0.2f;
break;
}
}
var cardPlane = manager.GetElement<Transform>("CardPlane"); var cardPlane = manager.GetElement<Transform>("CardPlane");
var pivot = manager.GetElement<Transform>("Pivot"); var pivot = manager.GetElement<Transform>("Pivot");
var offset = manager.GetElement<Transform>("Offset"); var offset = manager.GetElement<Transform>("Offset");
......
Assets/Scripts/MDPro3/Managers/TextureManager.cs
View file @ f8448e85
...@@ -330,7 +330,7 @@ namespace MDPro3 ...@@ -330,7 +330,7 @@ namespace MDPro3
return container.unknownCard.texture; return container.unknownCard.texture;
} }
returnValue = new Texture2D(RenderTexture.active.width, RenderTexture.active.height, TextureFormat.RGB24, false); returnValue = new Texture2D(RenderTexture.active.width, RenderTexture.active.height, TextureFormat.RGB24, true);
returnValue.ReadPixels(new Rect(0, 0, RenderTexture.active.width, RenderTexture.active.height), 0, 0); returnValue.ReadPixels(new Rect(0, 0, RenderTexture.active.width, RenderTexture.active.height), 0, 0);
returnValue.Apply(); returnValue.Apply();
returnValue.name = "Card_" + code; returnValue.name = "Card_" + code;
......
Assets/Texture/CardRenderTexture.renderTexture
View file @ f8448e85
...@@ -14,7 +14,7 @@ RenderTexture: ...@@ -14,7 +14,7 @@ RenderTexture:
serializedVersion: 6 serializedVersion: 6
m_Width: 704 m_Width: 704
m_Height: 1024 m_Height: 1024
m_AntiAliasing: 1 m_AntiAliasing: 4
m_MipCount: -1 m_MipCount: -1
m_DepthStencilFormat: 90 m_DepthStencilFormat: 90
m_ColorFormat: 8 m_ColorFormat: 8
......
Data/locales/ja-JP/strings.conf
View file @ f8448e85
...@@ -1223,7 +1223,7 @@ ...@@ -1223,7 +1223,7 @@
!setname 0x1a9 燦幻 !setname 0x1a9 燦幻
!setname 0x1aa 天盃龍 !setname 0x1aa 天盃龍
!setname 0x1ab 蕾祸 !setname 0x1ab 蕾祸
!setname 0x1ac ＳＡＬＡＭＡＮＤＲＡ !setname 0x1ac サラマンドラ
!setname 0x1ad 灰滅 !setname 0x1ad 灰滅
!setname 0x1ae 千年/ミレニアム !setname 0x1ae 千年/ミレニアム
!setname 0x1af エグゾード !setname 0x1af エグゾード
......
Data/script.zip
View file @ f8448e85
No preview for this file type
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