Skip to content

M
MDPro2
Commit 684288c1 authored by 赤子奈落's avatar 赤子奈落
Browse files
Options

temp fix bug when cards moving weirdly to or from exclude in facedown position

parent 9433adf5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2336 additions and 66 deletions
Assets/MD/Animation/card_land_back.anim 0 → 100644
View file @ 684288c1
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: card_land_back
serializedVersion: 6
m_Legacy: 1
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.16666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/card_land_back.anim.meta 0 → 100644
View file @ 684288c1
fileFormatVersion: 2
guid: 0eb2c279c7ab8d14dbc54464b1b5b087
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/card_rise_back.anim 0 → 100644
View file @ 684288c1
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: card_rise_back
serializedVersion: 6
m_Legacy: 1
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 0, y: -10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.16666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -10
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/card_rise_back.anim.meta 0 → 100644
View file @ 684288c1
fileFormatVersion: 2
guid: 0376bff98f2a7054f86e787abb17f2cc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/duelffromexclude_back.anim 0 → 100644
View file @ 684288c1
This diff is collapsed.
Assets/MD/Animation/duelffromexclude_back.anim.meta 0 → 100644
View file @ 684288c1
fileFormatVersion: 2
guid: 14947535a0f9ce74da9fe166633d584e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/dueltoexclude_back.anim 0 → 100644
View file @ 684288c1
This diff is collapsed.
Assets/MD/Animation/dueltoexclude_back.anim.meta 0 → 100644
View file @ 684288c1
fileFormatVersion: 2
guid: 92dd9068ea874d0408c473ca074fe2ad
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Scripts/CardSelectionHandler.cs
View file @ 684288c1
......@@ -214,7 +214,7 @@ public class CardSelectionHandler : MonoBehaviour
}
}
void HideWithoutAction()
public void HideWithoutAction()
{
core.Sleep(12);
isShowed = false;
......
Assets/MD/main.unity
View file @ 684288c1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/SibylSystem/Ocgcore/OCGobjects/gameButton.cs
View file @ 684288c1
......@@ -59,7 +59,7 @@ public class gameButton : OCGobject
Program.I().ocgcore.gameField.btn_decide.hide();
Program.I().ocgcore.gameField.btn_confirm.hide();
Program.I().ocgcore.gameField.btn_cancel.hide();
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
}
else if(response == -3)//btn_cancel
{
......@@ -88,7 +88,7 @@ public class gameButton : OCGobject
Program.I().ocgcore.gameField.btn_decide.hide();
Program.I().ocgcore.gameField.btn_confirm.hide();
Program.I().ocgcore.gameField.btn_cancel.hide();
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
}
else if(response == -4)//btn_decide
{
......
Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs
View file @ 684288c1
......@@ -1237,7 +1237,10 @@ public class gameCard : OCGobject
}
else if (fromExclude)
{
cardAnimation.PlayDelayedAnimation("duelffromexclude", time_delay_fromGraveOrExclude);
if(p_moveBefore != null && (p_moveBefore.position & (uint)CardPosition.FaceDown) > 0)
cardAnimation.PlayDelayedAnimation("duelffromexclude_back", time_delay_fromGraveOrExclude);
else
cardAnimation.PlayDelayedAnimation("duelffromexclude", time_delay_fromGraveOrExclude);
foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
btn.PlayParticle(p.controller, (uint)CardLocation.Removed, false, time_delay_fromGraveOrExclude);
}
......@@ -1249,16 +1252,25 @@ public class gameCard : OCGobject
}
else if (toExclude)
{
cardAnimation.PlayDelayedAnimation("dueltoexclude", time_delay_toGraveOrExclude);
if((p.position & (uint)CardPosition.FaceUp) >0)
cardAnimation.PlayDelayedAnimation("dueltoexclude", time_delay_toGraveOrExclude);
else
cardAnimation.PlayDelayedAnimation("dueltoexclude_back", time_delay_toGraveOrExclude);
foreach (var btn in Program.I().ocgcore.gameField.gameHiddenButtons)
btn.PlayParticle(p.controller, (uint)CardLocation.Removed, true, time_delay_toGraveOrExclude + 0.25f);
}
if (rise)
cardAnimation.PlayDelayedAnimation("card_rise", time_delay_rise);
{
if(toExclude && (p.position & (uint)CardPosition.FaceDown) > 0)
cardAnimation.PlayDelayedAnimation("card_rise_back", time_delay_rise);
else
cardAnimation.PlayDelayedAnimation("card_rise", time_delay_rise);
}
if (landing)
{
if((p.position & (uint)CardPosition.FaceDown) > 0)
cardAnimation.PlayDelayedAnimation("card_land", time_delay_move);
cardAnimation.PlayDelayedAnimation("card_land_back", time_delay_move);
else
cardAnimation.PlayDelayedAnimation("card_land", time_delay_landing);
}
......
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ 684288c1
......@@ -5968,7 +5968,7 @@ public class Ocgcore : ServantWithCardDescription
{
gameInfo.removeHashedButton("sendSelected");
Program.I().ocgcore.gameField.btn_confirm.hide();
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
sendSelectedCards();
}
else
......@@ -8742,7 +8742,7 @@ public class Ocgcore : ServantWithCardDescription
if (gameInfo.queryHashedButton("sendSelected"))
{
sendSelectedCards();
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
return;
}
......@@ -8753,7 +8753,7 @@ public class Ocgcore : ServantWithCardDescription
var binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(-1);
sendReturn(binaryMaster.get());
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
return;
}
......@@ -8771,7 +8771,7 @@ public class Ocgcore : ServantWithCardDescription
var binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(-1);
sendReturn(binaryMaster.get());
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
return;
}
......
Assets/SibylSystem/ServantWithCardDescription.cs
View file @ 684288c1
......@@ -13,7 +13,7 @@ public class ServantWithCardDescription : Servant
Program.reMoveCam(Screen.width / 2);
Program.I().cardDescription.hide();
Program.I().new_ui_cardList.hide();
Program.I().cardSelection.hide();
Program.I().cardSelection.HideWithoutAction();
base.hide();
}
......
Assets/old/Ocgcore/card/mod_ocgcore_card.prefab
View file @ 684288c1
......@@ -128,6 +128,10 @@ Animation:
- {fileID: 7400000, guid: 01392d6ee73eb8b4ab3c412a0d16ac8b, type: 2}
- {fileID: 7400000, guid: db8a1877bef772b448f933119e1c2876, type: 2}
- {fileID: 7400000, guid: 31a05ddcfe720084894373ca16b27b0f, type: 2}
- {fileID: 7400000, guid: 14947535a0f9ce74da9fe166633d584e, type: 2}
- {fileID: 7400000, guid: 92dd9068ea874d0408c473ca074fe2ad, type: 2}
- {fileID: 7400000, guid: 0376bff98f2a7054f86e787abb17f2cc, type: 2}
- {fileID: 7400000, guid: 0eb2c279c7ab8d14dbc54464b1b5b087, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 0
m_AnimatePhysics: 0
......
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