Skip to content

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

new card move trail and bug fix

parent 6fc782ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7961 additions and 10675 deletions
Assets/Addressables/Text/UpdateContent.txt
View file @ 16b861e8
......@@ -4,16 +4,17 @@ MDPro v1.2.0更新：
1.升级Spine至v4.2，修复上一版更新的官方MonsterCutin部分动画异常的错误。
2.安卓端首选图形API变更为OpenGL。
3.修复卡片渲染的若干瑕疵，添加卡密渲染。
4.Settings.json中新增选项：
4.合并同时去往墓地或除外区域的卡的移动。
5.Settings.json中新增选项：
①"CardRenderPassword"，true或者false，控制卡图中是否渲染卡密。
②"SavedCardSize"，调整保存的卡图的长和宽。
③"SavedCardFormat"，".jpg"或者".png"，调整保存卡图的格式。
④"BatchMove"，true或者false，开启或者关闭第4项更新。
PS：新增的选项会在至少运行一次新版本游戏后才会出现。
5.现在，成为召唤素材的卡片会在同一时间飞出。
6.合并同时去往墓地或除外区域的卡的移动。
7.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。
8.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。
9.卡片详情中保存卡图新增一键[保存所有卡图]和[一键保存所有衍生物卡图]的选项。
6.编辑卡组界面的卡片详情能翻动查看上一张或下一张卡，快捷键：左右方向键。
7.卡片详情页面现在能放大卡图了，快捷键：方向键上（放大）方向键下（还原）。
8.卡片详情中保存卡图新增一键[保存所有卡图]和[一键保存所有衍生物卡图]的选项。
9.为超量素材和被破坏的卡片添加移动尾迹。
10.修复决斗中无法在卡片详情中保存卡图的错误。
11.修复安卓端[天霆号 阿宙斯]的卡片特效的显示错误。
12.修复Windbot不能读取扩展卡的错误。
......
Assets/Fonts/Brock.asset
View file @ 16b861e8
This diff is collapsed.
Assets/Fonts/Ro_GSan_Serif_Std.asset
View file @ 16b861e8
This diff is collapsed.
Assets/Main.unity
View file @ 16b861e8
......@@ -10361,7 +10361,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 0}
m_AnchoredPosition: {x: -399.99982, y: 0}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814
......@@ -12123,7 +12123,7 @@ 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: -490.00037, y: 0}
m_AnchoredPosition: {x: -490.0003, y: 0}
m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284
......@@ -26561,7 +26561,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 300}
m_AnchoredPosition: {x: -399.99982, y: 300}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423
......@@ -50105,7 +50105,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.000030517578}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &702608002
......@@ -52272,7 +52272,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -419.99988, y: -60}
m_AnchoredPosition: {x: -419.99982, y: -60}
m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434
......@@ -70298,7 +70298,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 399.99988, y: -132}
m_AnchoredPosition: {x: 399.99982, y: -132}
m_SizeDelta: {x: 330, y: 840}
m_Pivot: {x: 1, y: 1}
--- !u!114 &998933908
......@@ -77464,7 +77464,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.000030517578}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &1117266860
......@@ -94289,7 +94289,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 150}
m_AnchoredPosition: {x: -399.99982, y: 150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642
......@@ -98445,7 +98445,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 761159127}
m_Direction: 2
m_Value: 0
m_Size: 0.6629212
m_Size: 0.66292137
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -103723,7 +103723,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2083794100}
m_Direction: 2
m_Value: 0
m_Size: 0.5588235
m_Size: 0.55882347
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -116507,7 +116507,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -1099.9991, y: 0}
m_AnchoredPosition: {x: -1099.999, y: 0}
m_SizeDelta: {x: -1100, y: 128}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1661354805
......@@ -125045,7 +125045,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: -150}
m_AnchoredPosition: {x: -399.99982, y: -150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521
......@@ -136400,7 +136400,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -1000.0006, y: 0}
m_AnchoredPosition: {x: -1000.00055, y: 0}
m_SizeDelta: {x: -1000, y: 128}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1953445533
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ 16b861e8
This diff is collapsed.
Assets/Scripts/MDPro3/Helper/Settings.cs
View file @ 16b861e8
......@@ -20,6 +20,7 @@ namespace MDPro3
public bool CardRenderPassword;
public int[] SavedCardSize;
public string SavedCardFormat;
public bool BatchMove;
public SettingData()
{
......@@ -85,6 +86,7 @@ namespace MDPro3
CardRenderPassword = true;
SavedCardSize = new int[] { 704, 1024 };
SavedCardFormat = Program.jpgExpansion;
BatchMove = true;
}
}
......@@ -190,6 +192,11 @@ namespace MDPro3
data.SavedCardFormat = defau.SavedCardFormat;
needOverwrite = true;
}
if (!json.Contains("BatchMove"))
{
data.BatchMove = defau.BatchMove;
needOverwrite = true;
}
if (needOverwrite)
SaveSettings(data);
......
Assets/Scripts/MDPro3/Servants/MonsterCutin.cs
View file @ 16b861e8
......@@ -166,7 +166,7 @@ namespace MDPro3
if (Program.I().ocgcore.condition == OcgCore.Condition.Replay
&& Config.Get("ReplayCutin", "1") == "0")
return false;
code = AliasCode(code);
bool returnValue = false;
foreach (var card in cards)
{
......
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @ 16b861e8
......@@ -1744,6 +1744,7 @@ namespace MDPro3
if(packages[1].Function == (int)GameMessage.Move)
{
var r = packages[1].Data.reader;
r.BaseStream.Seek(0, 0);
r.ReadInt32();
r.ReadGPS();
r.ReadGPS();
......@@ -1765,10 +1766,13 @@ namespace MDPro3
if (packages[1].Function == (int)GameMessage.Move)
{
var r = packages[1].Data.reader;
r.BaseStream.Seek(0, 0);
r.ReadInt32();
var from = r.ReadGPS();
var to = r.ReadGPS();
r.ReadUInt32();
//if ((from.location & (uint)CardLocation.Overlay) > 0)
// return false;
if (player == to.controller && (to.location & (uint)CardLocation.Grave) > 0)
return true;
}
......@@ -1783,16 +1787,33 @@ namespace MDPro3
if (packages[1].Function == (int)GameMessage.Move)
{
var r = packages[1].Data.reader;
r.BaseStream.Seek(0, 0);
r.ReadInt32();
var from = r.ReadGPS();
var to = r.ReadGPS();
r.ReadUInt32();
//if ((from.location & (uint)CardLocation.Overlay) > 0)
// return false;
if (player == to.controller && (to.location & (uint)CardLocation.Removed) > 0)
return true;
}
return false;
}
public bool NextMessageIsOverlayOut()
{
if (packages.Count < 2)
return false;
if (packages[1].Function == (int)GameMessage.Move)
{
var r = packages[1].Data.reader;
r.BaseStream.Seek(0, 0);
r.ReadInt32();
var from = r.ReadGPS();
if ((from.location & (uint)CardLocation.Overlay) > 0)
return true;
}
return false;
}
private void Sibyl()
{
try
......@@ -3742,7 +3763,10 @@ namespace MDPro3
}
card.SetCode(code);
to.reason = reason;
Sleep((int)(card.Move(to) * 100));
if(Settings.Data.BatchMove)
Sleep((int)(card.Move(to) * 100));
else
Sleep((int)(card.Move_Backup(to) * 100));
break;
case GameMessage.PosChange:
ES_hint = StringHelper.GetUnsafe(1600);//卡片改变了表示形式
......
Data/Settings.json
View file @ 16b861e8
......@@ -51,5 +51,6 @@
704,
1024
],
"SavedCardFormat": ".jpg"
"SavedCardFormat": ".jpg",
"BatchMove": true
}
\ No newline at end of file
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