Skip to content

M
MDPro2
Commit 1dbc8248 authored by 赤子奈落's avatar 赤子奈落
Browse files
Options

UI Update V2

parent b2475232
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6283 additions and 977 deletions
Assets/ArtSystem/OpenCardOnClick.cs
View file @ 1dbc8248
...@@ -14,7 +14,7 @@ public class OpenCardOnClick : MonoBehaviour ...@@ -14,7 +14,7 @@ public class OpenCardOnClick : MonoBehaviour
var s = lbl.GetUrlAtPosition(UICamera.lastWorldPosition); var s = lbl.GetUrlAtPosition(UICamera.lastWorldPosition);
if (string.IsNullOrEmpty(s)) return; if (string.IsNullOrEmpty(s)) return;
var code = int.Parse(s); var code = int.Parse(s);
Program.I().cardDescription.setData(CardsManager.Get(code), GameTextureManager.myBack, "", true); //Program.I().cardDescription.setData(CardsManager.Get(code), GameTextureManager.myBack, "", true);
} }
catch (Exception e) catch (Exception e)
{ {
......
Assets/ArtSystem/deckManager/cardPicLoader.cs
View file @ 1dbc8248
...@@ -10,7 +10,6 @@ public class cardPicLoader : MonoBehaviour ...@@ -10,7 +10,6 @@ public class cardPicLoader : MonoBehaviour
public UITexture uiTexture; public UITexture uiTexture;
public Banlist loaded_banlist; public Banlist loaded_banlist;
public Card data { get; set; } public Card data { get; set; }
public int code public int code
{ {
get => _code; get => _code;
...@@ -32,8 +31,8 @@ public class cardPicLoader : MonoBehaviour ...@@ -32,8 +31,8 @@ public class cardPicLoader : MonoBehaviour
private void Update() private void Update()
{ {
if (coli != null && Program.InputGetMouseButtonDown_0 && Program.pointedCollider == coli) //if (coli != null && Program.InputGetMouseButtonDown_0 && Program.pointedCollider == coli)
Program.I().cardDescription.setData(CardsManager.Get(_code), GameTextureManager.myBack, "", true); // Program.I().cardDescription.setData(CardsManager.Get(_code), GameTextureManager.myBack, "", true);
if (Program.I().deckManager != null) if (Program.I().deckManager != null)
{ {
if (loaded_banlist != Program.I().deckManager.currentBanlist) if (loaded_banlist != Program.I().deckManager.currentBanlist)
......
Assets/ArtSystem/gameInfo/gameInfo.cs
View file @ 1dbc8248
...@@ -182,8 +182,8 @@ public class gameInfo : MonoBehaviour ...@@ -182,8 +182,8 @@ public class gameInfo : MonoBehaviour
UIHelper.trySetLableText(hashedButton.gameObject, "hint_", hint); UIHelper.trySetLableText(hashedButton.gameObject, "hint_", hint);
UIHelper.getRealEventGameObject(hashedButton.gameObject).name = hashString + "----" + hashInt; UIHelper.getRealEventGameObject(hashedButton.gameObject).name = hashString + "----" + hashInt;
UIHelper.registUIEventTriggerForClick(hashedButton.gameObject, listenerForClicked); UIHelper.registUIEventTriggerForClick(hashedButton.gameObject, listenerForClicked);
hashedButton.gameObject.GetComponent<iconSetForButton>().setTexture(type); //hashedButton.gameObject.GetComponent<iconSetForButton>().setTexture(type);
hashedButton.gameObject.GetComponent<iconSetForButton>().setText(hint); //hashedButton.gameObject.GetComponent<iconSetForButton>().setText(hint);
var Transforms = hashedButton.gameObject.GetComponentsInChildren<Transform>(); var Transforms = hashedButton.gameObject.GetComponentsInChildren<Transform>();
foreach (var child in Transforms) child.gameObject.layer = instance_btnPan.gameObject.layer; foreach (var child in Transforms) child.gameObject.layer = instance_btnPan.gameObject.layer;
hashedButton.gameObject.transform.SetParent(instance_btnPan.transform, false); hashedButton.gameObject.transform.SetParent(instance_btnPan.transform, false);
......
Assets/ArtSystem/superButton/iconSetForButton.cs
View file @ 1dbc8248
...@@ -5,20 +5,24 @@ public enum superButtonType ...@@ -5,20 +5,24 @@ public enum superButtonType
act, act,
attack, attack,
bp, bp,
change, change_atk,
change_def,
ep, ep,
mp, mp,
no, no,
see, see,
set, set,
set_monster,
set_spell_trap,
set_pendulum,
spsummon, spsummon,
summon, summon,
pendulumSummon,
yes yes
} }
public class iconSetForButton : MonoBehaviour public class iconSetForButton : MonoBehaviour
{ {
public UITexture UITextureInButton;
public UILabel UILabelInButton; public UILabel UILabelInButton;
public Texture2D act; public Texture2D act;
public Texture2D attack; public Texture2D attack;
...@@ -33,51 +37,87 @@ public class iconSetForButton : MonoBehaviour ...@@ -33,51 +37,87 @@ public class iconSetForButton : MonoBehaviour
public Texture2D summon; public Texture2D summon;
public Texture2D yes; public Texture2D yes;
public Sprite[] act_;
public Sprite[] attack_;
public Sprite[] yes_;
public Sprite[] no_;
public Sprite[] spsummon_;
public Sprite[] summon_;
public Sprite[] pendulumSummon_;
public Sprite[] set_monster;
public Sprite[] set_spell_trap;
public Sprite[] set_pendulum;
public Sprite[] change_atk;
public Sprite[] change_def;
void SetSpriteSet(Sprite[] sprites)
{
GetComponent<UIButton>().normalSprite2D = sprites[0];
GetComponent<UIButton>().hoverSprite2D = sprites[1];
GetComponent<UIButton>().pressedSprite2D = sprites[2];
GetComponent<UIButton>().disabledSprite2D = sprites[3];
}
public void setTexture(superButtonType type) public void setTexture(superButtonType type)
{ {
switch (type) switch (type)
{ {
case superButtonType.act: case superButtonType.act:
UITextureInButton.mainTexture = act; SetSpriteSet(act_);
break; break;
case superButtonType.attack: case superButtonType.attack:
UITextureInButton.mainTexture = attack; SetSpriteSet (attack_);
break; break;
case superButtonType.bp: //case superButtonType.bp:
UITextureInButton.mainTexture = bp; // UITextureInButton.mainTexture = bp;
// break;
case superButtonType.change_atk:
SetSpriteSet(change_atk);
break; break;
case superButtonType.change: case superButtonType.change_def:
UITextureInButton.mainTexture = change; SetSpriteSet(change_def);
break; break;
case superButtonType.ep: //case superButtonType.ep:
UITextureInButton.mainTexture = ep; // UITextureInButton.mainTexture = ep;
// break;
//case superButtonType.mp:
// UITextureInButton.mainTexture = mp;
// break;
case superButtonType.no:
SetSpriteSet(no_);
break; break;
case superButtonType.mp: //case superButtonType.see:
UITextureInButton.mainTexture = mp; // UITextureInButton.mainTexture = see;
// break;
case superButtonType.set:
SetSpriteSet(set_spell_trap);
break; break;
case superButtonType.no: case superButtonType.set_monster:
UITextureInButton.mainTexture = no; SetSpriteSet(set_monster);
break; break;
case superButtonType.see: case superButtonType.set_spell_trap:
UITextureInButton.mainTexture = see; SetSpriteSet(set_spell_trap);
break; break;
case superButtonType.set: case superButtonType.set_pendulum:
UITextureInButton.mainTexture = set; SetSpriteSet(set_pendulum);
break; break;
case superButtonType.spsummon: case superButtonType.spsummon:
UITextureInButton.mainTexture = spsummon; SetSpriteSet(spsummon_);
break; break;
case superButtonType.summon: case superButtonType.summon:
UITextureInButton.mainTexture = summon; SetSpriteSet(summon_);
break;
case superButtonType.pendulumSummon:
SetSpriteSet(pendulumSummon_);
break; break;
case superButtonType.yes: case superButtonType.yes:
UITextureInButton.mainTexture = yes; SetSpriteSet(yes_);
break; break;
} }
Color c; //Color c;
ColorUtility.TryParseHtmlString(Config.Getui("gameButtonSign.color"), out c); //ColorUtility.TryParseHtmlString(Config.Getui("gameButtonSign.color"), out c);
UITextureInButton.color = c; //UITextureInButton.color = c;
} }
public void setText(string hint) public void setText(string hint)
......
Assets/ArtSystem/superButton/new_superButtonTransparent.prefab
View file @ 1dbc8248
...@@ -10,7 +10,7 @@ GameObject: ...@@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 426850} - component: {fileID: 426850}
- component: {fileID: 11432050} - component: {fileID: 11432050}
m_Layer: 10 m_Layer: 5
m_Name: icon_ m_Name: icon_
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
...@@ -326,7 +326,7 @@ GameObject: ...@@ -326,7 +326,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 464504} - component: {fileID: 464504}
- component: {fileID: 11411218} - component: {fileID: 11411218}
m_Layer: 10 m_Layer: 5
m_Name: hint_ m_Name: hint_
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
......
Assets/MD/Animation/duelffromexclude.anim 0 → 100644
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Animation/duelffromexclude.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: 31a05ddcfe720084894373ca16b27b0f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/duelffromexclude01.anim 0 → 100644
View file @ 1dbc8248
%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: duelffromexclude01
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -90, y: 0, z: 180}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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: 1
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_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.25
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.38333333
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.25, y: 0.25, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.25, y: 0.25, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.25
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.28333333
value: {x: 1.2327238, y: 1.2327238, z: 1.2327238}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.33333334
value: {x: 1.002091, y: 1.002091, z: 1.002091}
inSlope: {x: -0.08364198, y: -0.08364198, z: -0.08364198}
outSlope: {x: -0.08364204, y: -0.08364204, z: -0.08364204}
tangentMode: 1
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.38333333
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_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:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.38333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/duelffromexclude01.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: bb2f71f7ad3032e43824e696416a93b4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/duelffromgrave.anim 0 → 100644
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Animation/duelffromgrave.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: 01392d6ee73eb8b4ab3c412a0d16ac8b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/duelffromgrave01.anim 0 → 100644
View file @ 1dbc8248
%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: duelffromgrave01
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -90, y: 0, z: 180}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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: 1
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_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.25
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.38333333
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.5, y: 0.5, z: 0.5}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5, y: 0.5, z: 0.5}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.25
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.28333333
value: {x: 1.2327238, y: 1.2327238, z: 1.2327238}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.33333334
value: {x: 1.002091, y: 1.002091, z: 1.002091}
inSlope: {x: -0.08364198, y: -0.08364198, z: -0.08364198}
outSlope: {x: -0.08364204, y: -0.08364204, z: -0.08364204}
tangentMode: 1
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.38333333
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_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:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.38333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/duelffromgrave01.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: e4c9edbc01f47db489dad78935cf57a2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/dueltoexclude.anim 0 → 100644
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Animation/dueltoexclude.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: db8a1877bef772b448f933119e1c2876
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/dueltoexclude01.anim 0 → 100644
View file @ 1dbc8248
%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: dueltoexclude01
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: -90, y: 0, z: 180}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: 0, y: -0.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.25
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.41666666
value: {x: 0.25, y: 0.25, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: 0.25, y: 0.25, z: 0.25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_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:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/dueltoexclude01.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: 5523775964d78044ba4d7e13c668428e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/dueltograve.anim 0 → 100644
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Animation/dueltograve.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: 8e7487897bc75a64fbe3a64150d42889
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Animation/dueltograve01.anim 0 → 100644
View file @ 1dbc8248
%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: dueltograve01
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.41666666
value: {x: -44.99999, y: 0, z: 180}
inSlope: {x: -810.0001, y: 0, z: 0}
outSlope: {x: -810.00006, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: -90, y: 0, z: 180}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 10, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: 0, y: -0.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.25
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.41666666
value: {x: 0.5, y: 0.5, z: 0.5}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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.5
value: {x: 0.5, y: 0.5, z: 0.5}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 1
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_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:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
Assets/MD/Animation/dueltograve01.anim.meta 0 → 100644
View file @ 1dbc8248
fileFormatVersion: 2
guid: 6dfb822b6309e7f4094989c7db25c28e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/MD/Scripts/AddCardHighlight.cs deleted 100644 → 0
View file @ b2475232
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AddCardHighlight : MonoBehaviour
{
Transform chl;
void Start()
{
chl = Instantiate(LoadAssets.cardHighlight.gameObject, this.transform).transform;
//chl.SetActive(true);
chl.localPosition = new Vector3(0, -0.01f, 0);
}
void Update()
{
if (this.transform.position.y < chl.transform.position.y)
{
chl.localPosition *= -1f;
chl.localEulerAngles = new Vector3(chl.localEulerAngles.x +180, chl.localEulerAngles.y, chl.localEulerAngles.z);
}
}
}
Assets/MD/Scripts/AttributeIcons.cs
View file @ 1dbc8248
...@@ -54,6 +54,9 @@ public class AttributeIcons : MonoBehaviour ...@@ -54,6 +54,9 @@ public class AttributeIcons : MonoBehaviour
case "陷阱": case "陷阱":
sprite.sprite2D = trap_; sprite.sprite2D = trap_;
break; break;
default:
sprite.sprite2D = null_;
break;
} }
} }
} }
Assets/MD/Scripts/CardAnimation.cs
View file @ 1dbc8248
...@@ -247,4 +247,14 @@ public class CardAnimation : MonoBehaviour ...@@ -247,4 +247,14 @@ public class CardAnimation : MonoBehaviour
currentRotation = transform.eulerAngles; currentRotation = transform.eulerAngles;
} }
} }
public void PlayDelayedAnimation(string name, float time)
{
StartCoroutine(DelayedAnimation(name, time));
}
IEnumerator DelayedAnimation(string name, float time)
{
yield return new WaitForSeconds(time);
transform.Find("card").GetComponent<Animation>().Play(name);
}
} }
Assets/MD/Scripts/CardHighlightPosition.cs 0 → 100644
View file @ 1dbc8248
using Percy;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CardHighlightPosition : MonoBehaviour
{
public gameCard card;
void Update()
{
if(card != null && card.highlightOn)
{
if ((card.p.position & (uint)CardPosition.FaceDown) > 0 && (card.p.location & (uint)CardLocation.Onfield) > 0)
transform.localPosition = new Vector3(0f, 0.1f, 0f);
else
transform.localPosition = new Vector3(0f, 0f, 0f);
}
}
}
Assets/MD/Scripts/AddCardHighlight.cs.meta → Assets/MD/Scripts/CardHighlightPosition.cs.meta
View file @ 1dbc8248
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5f710761c257dd9429a8505ee44adab6 guid: 37d2700546989e7468b1c7d6d98b2220
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
......
Assets/MD/Scripts/LoadAssets.cs
View file @ 1dbc8248
...@@ -22,8 +22,6 @@ public class LoadAssets : MonoBehaviour ...@@ -22,8 +22,6 @@ public class LoadAssets : MonoBehaviour
public static Transform grave1_; public static Transform grave1_;
public static Transform grave2_; public static Transform grave2_;
public static Transform cardHighlight;
public static BoxCollider fieldCollider1; public static BoxCollider fieldCollider1;
public static BoxCollider fieldCollider2; public static BoxCollider fieldCollider2;
public static BoxCollider mateCollider1; public static BoxCollider mateCollider1;
...@@ -37,6 +35,7 @@ public class LoadAssets : MonoBehaviour ...@@ -37,6 +35,7 @@ public class LoadAssets : MonoBehaviour
public static GameObject guide_near; public static GameObject guide_near;
public static GameObject guide_far; public static GameObject guide_far;
void Start() void Start()
{ {
ac = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<AnimationControl>(); ac = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<AnimationControl>();
...@@ -312,31 +311,6 @@ public class LoadAssets : MonoBehaviour ...@@ -312,31 +311,6 @@ public class LoadAssets : MonoBehaviour
} }
} }
public static void LoadSFX()
{
cardHighlight = ABLoader.LoadAB("effects/summonfusionshowunitcard01").transform;
cardHighlight.gameObject.SetActive(false);
var ts = cardHighlight.GetComponentsInChildren<Transform>(true);
foreach (Transform t in ts)
{
if (t.gameObject.name == "CardBack01") cardHighlight = t;
}
var particles = cardHighlight.GetComponentsInChildren<ParticleSystem>();
foreach (ParticleSystem particle in particles)
{
particle.Stop();
var main = particle.main;
main.duration = 100f;
main.startLifetime = 100f;
main.loop = true;
var col = particle.colorOverLifetime;
Gradient grad = new Gradient();
grad.SetKeys(new GradientColorKey[] { new GradientColorKey(Color.white, 0.0f), new GradientColorKey(Color.white, 1.0f) }, new GradientAlphaKey[] { new GradientAlphaKey(0.0f, 0.0f), new GradientAlphaKey(1.0f, 0.01f) });
col.color = new ParticleSystem.MinMaxGradient(grad);
}
}
public static GameObject LoadCDMate(string name) public static GameObject LoadCDMate(string name)
{ {
var la = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<LoadAssets>(); var la = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<LoadAssets>();
......
Assets/MD/Scripts/LoadSFX.cs
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Scripts/PhaseButtonHandler.cs
View file @ 1dbc8248
...@@ -64,7 +64,10 @@ public class PhaseButtonHandler : MonoBehaviour ...@@ -64,7 +64,10 @@ public class PhaseButtonHandler : MonoBehaviour
playerMaterial.SetFloat("_Active", 1); playerMaterial.SetFloat("_Active", 1);
//Click //Click
if (Program.pointedCollider == collider_ && Input.GetMouseButtonUp(0)) if (Program.pointedCollider == collider_ && Input.GetMouseButtonUp(0))
{
PhaseUIBehaviour.show(); PhaseUIBehaviour.show();
SEHandler.PlayInternalAudio("se_sys/SE_MENU_DECIDE");
}
if (Program.pointedCollider == collider_ && Input.GetMouseButton(0)) if (Program.pointedCollider == collider_ && Input.GetMouseButton(0))
playerMaterial.SetFloat("_PressButton", 1); playerMaterial.SetFloat("_PressButton", 1);
else else
......
Assets/MD/Scripts/PhaseUIBehaviour.cs
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/Scripts/upMode.cs → Assets/MD/Scripts/Shortcuts.cs
View file @ 1dbc8248
...@@ -3,7 +3,7 @@ using System.Collections; ...@@ -3,7 +3,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class upMode : MonoBehaviour public class Shortcuts : MonoBehaviour
{ {
public static bool upmode; public static bool upmode;
public static bool lockCamera; public static bool lockCamera;
...@@ -34,7 +34,18 @@ public class upMode : MonoBehaviour ...@@ -34,7 +34,18 @@ public class upMode : MonoBehaviour
{ {
if (Program.I().setting.isShowed) if (Program.I().setting.isShowed)
Program.I().setting.hide(); Program.I().setting.hide();
if (PhaseUIBehaviour.isShowed) else if (PhaseUIBehaviour.isShowed)
PhaseUIBehaviour.hide();
else
{
Program.I().setting.show();
}
}
if (Input.GetMouseButtonUp(1))
{
if (Program.I().setting.isShowed)
Program.I().setting.hide();
else if (PhaseUIBehaviour.isShowed)
PhaseUIBehaviour.hide(); PhaseUIBehaviour.hide();
} }
......
Assets/MD/Scripts/TimerHandler.cs
View file @ 1dbc8248
...@@ -25,6 +25,8 @@ public class TimerHandler : MonoBehaviour ...@@ -25,6 +25,8 @@ public class TimerHandler : MonoBehaviour
public static void SetTime(int player , int time) public static void SetTime(int player , int time)
{ {
if (tmp == null)
return;
if(player == 0) if(player == 0)
{ {
tmp.text = time.ToString(); tmp.text = time.ToString();
......
Assets/MD/Test/TestLoad.cs
View file @ 1dbc8248
This diff is collapsed.
Assets/MD/main.unity
View file @ 1dbc8248
This diff is collapsed.
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ 1dbc8248
This diff is collapsed.
Assets/SibylSystem/Program.cs
View file @ 1dbc8248
This diff is collapsed.
ProjectSettings/ProjectSettings.asset
View file @ 1dbc8248
This diff is collapsed.
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