Commit 644a2a6b authored by SherryChaos's avatar SherryChaos

bug fix

parent 12d36236
......@@ -19,9 +19,7 @@ using YgomGame.Bg;
using YgomSystem.Effect;
using YgomSystem.ElementSystem;
using YgomSystem.Timeline;
using YGOSharp.OCGWrapper;
using static MDPro3.Servant.OcgCore;
using static UnityEngine.Rendering.DebugUI;
using static YgomGame.Bg.BgEffectSettingInner;
namespace MDPro3.Duel
......@@ -36,8 +34,8 @@ namespace MDPro3.Duel
private bool mate0Random = true;
private bool mate1Random = true;
private int bgPhase0 = 1;
private int bgPhase1 = 1;
private int bgPhase0 = 0;
private int bgPhase1 = 0;
private bool backgroundFieldInitialize = false;
public bool loaded;
......@@ -544,6 +542,7 @@ namespace MDPro3.Duel
{
if (field0Manager == null || field1Manager == null)
return;
if (bgPhase0 == 1 && bgPhase1 == 1) return;
if (backgroundFieldInitialize)
{
......
......@@ -296,7 +296,13 @@ namespace MDPro3
//召唤兽 梅尔卡巴[75286622]在安卓端和iOS端的Spine动画资源丢失,
//临时修复方案为从已加载的AssetBundle中寻找SkeletonDataAsset并赋值。
var sa = prefab.GetComponentInChildren<SkeletonAnimation>();
//傻缺科乐美在 混沌幻魔[60110982]的Root节点留了个没删的SkeletonAnimation。
var sas = prefab.GetComponentsInChildren<SkeletonAnimation>();
if(sas == null || sas.Length == 0 || sas.Length > 1)
return;
var sa = sas[0];
if (sa == null)
return;
if (sa.skeletonDataAsset == null)
......
......@@ -73,6 +73,7 @@ namespace MDPro3.UI
text.gameObject.SetActive(true);
Tools.PlayAnimation(transform, "StartToPhase1");
duelStart = true;
duelEnd = false;
}
public void DuelEnd()
......
......@@ -79,7 +79,7 @@ namespace YgomSystem.Timeline
if (OcgCore.summonCard == null)
return;
var code = OcgCore.summonCard.GetData().Id;
if (CutinViewer.HasCutin(code))
if (CutinViewer.CutinExist(code))
_ = CutinViewer.Play(code, (int)OcgCore.summonCard.p.controller);
}
else if(label == "Next")
......
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