Commit 3f2d86c1 authored by SherryChaos's avatar SherryChaos

Built-in DuelFinalBlow

parent 60c45e7e
fileFormatVersion: 2
guid: 53ff513a3e9320a43a0277b1ea1a446d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1c29c2fea33e06042abc03b98b118a8c
timeCreated: 1755118479
licenseType: Free
PrefabImporter:
externalObjects: {}
addedObjectFileIDs:
isPrefabVariant: 0
variantParentGUID: 00000000000000000000000000000000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: bf018063f79488448b212ec71ff1437f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -43,3 +43,5 @@ MonoBehaviour: ...@@ -43,3 +43,5 @@ MonoBehaviour:
duelLogTextWithCard2: {fileID: 1387090791483376203, guid: 817f6d2fe893e014fa8cb27ee51d0b7c, type: 3} duelLogTextWithCard2: {fileID: 1387090791483376203, guid: 817f6d2fe893e014fa8cb27ee51d0b7c, type: 3}
duelLogLpChange: {fileID: 3150024044697431290, guid: dc378e95e2ba7464b978203e6a5108b1, type: 3} duelLogLpChange: {fileID: 3150024044697431290, guid: dc378e95e2ba7464b978203e6a5108b1, type: 3}
duelLogCounter: {fileID: 4080254034130760786, guid: ab80aff3c66e22a45bc8388643a8e1c2, type: 3} duelLogCounter: {fileID: 4080254034130760786, guid: ab80aff3c66e22a45bc8388643a8e1c2, type: 3}
duelDirectAtk00: {fileID: 1574167293659148, guid: eb337d7e36edac348ab745105d1f93c9, type: 3}
duelFinalBlow: {fileID: 1348777536908202, guid: 1c29c2fea33e06042abc03b98b118a8c, type: 3}
...@@ -25,9 +25,11 @@ namespace MDPro3 ...@@ -25,9 +25,11 @@ namespace MDPro3
public GameObject duelMain2PhaseFar; public GameObject duelMain2PhaseFar;
public GameObject duelEndPhaseNear; public GameObject duelEndPhaseNear;
public GameObject duelEndPhaseFar; public GameObject duelEndPhaseFar;
[Header("Duel Turn Change")] [Header("Duel Turn Change")]
public GameObject duelTurnChangeNear; public GameObject duelTurnChangeNear;
public GameObject duelTurnChangeFar; public GameObject duelTurnChangeFar;
[Header("Duel Log")] [Header("Duel Log")]
public GameObject duelLogNewTurn; public GameObject duelLogNewTurn;
public GameObject duelLogNewPhase; public GameObject duelLogNewPhase;
...@@ -41,5 +43,10 @@ namespace MDPro3 ...@@ -41,5 +43,10 @@ namespace MDPro3
public GameObject duelLogTextWithCard2; public GameObject duelLogTextWithCard2;
public GameObject duelLogLpChange; public GameObject duelLogLpChange;
public GameObject duelLogCounter; public GameObject duelLogCounter;
[Header("Duel Text")]
public GameObject duelDirectAtk00;
public GameObject duelFinalBlow;
} }
} }
...@@ -3980,7 +3980,8 @@ namespace MDPro3.Servant ...@@ -3980,7 +3980,8 @@ namespace MDPro3.Servant
{ {
if (duelFinalBlow != null) if (duelFinalBlow != null)
Destroy(duelFinalBlow); Destroy(duelFinalBlow);
duelFinalBlow = ABLoader.LoadFromFile("MasterDuel/Timeline/DuelText/DuelFinalBlow", true); //duelFinalBlow = ABLoader.LoadFromFile("MasterDuel/Timeline/DuelText/DuelFinalBlow", true);
duelFinalBlow = Instantiate(container.duelFinalBlow);
} }
Sleep(20); Sleep(20);
} }
......
...@@ -8,9 +8,10 @@ namespace YgomSystem.Timeline ...@@ -8,9 +8,10 @@ namespace YgomSystem.Timeline
[Serializable] [Serializable]
public class LoopClip : PlayableAsset public class LoopClip : PlayableAsset
{ {
public LoopBehaviour template; [HideInInspector] public LoopBehaviour template;
[HideInInspector] public TimelineClip loopClip;
public TimelineClip loopClip;
public override Playable CreatePlayable(PlayableGraph graph, GameObject go) public override Playable CreatePlayable(PlayableGraph graph, GameObject go)
{ {
var playable = ScriptPlayable<LoopBehaviour>.Create(graph); var playable = ScriptPlayable<LoopBehaviour>.Create(graph);
......
...@@ -28,10 +28,10 @@ namespace YgomSystem.UI ...@@ -28,10 +28,10 @@ namespace YgomSystem.UI
PlayDIY(); PlayDIY();
} }
void PlayDIY() private void PlayDIY()
{ {
transform.localPosition = startPosition; transform.localPosition = startPosition;
GetComponent<Transform>().DOLocalMove(to, duration).SetEase(GetDGTweenEase(easing)).OnComplete(() => transform.DOLocalMove(to, duration).SetEase(GetDGTweenEase(easing)).OnComplete(() =>
{ {
if(style == Style.Loop) if(style == Style.Loop)
{ {
......
...@@ -41,7 +41,7 @@ namespace YgomSystem.UI ...@@ -41,7 +41,7 @@ namespace YgomSystem.UI
TweenColor(); TweenColor();
} }
void TweenColor() private void TweenColor()
{ {
m_spriteRenderer.color = from; m_spriteRenderer.color = from;
m_spriteRenderer.DOColor(to, duration).SetEase(GetDGTweenEase(easing)).OnComplete(() => m_spriteRenderer.DOColor(to, duration).SetEase(GetDGTweenEase(easing)).OnComplete(() =>
......
fileFormatVersion: 2
guid: 4a987d6e80450e5459db3a8546d8fd1e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: be3fe644859e20446934b60517107569
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -56,6 +56,7 @@ SpriteAtlas: ...@@ -56,6 +56,7 @@ SpriteAtlas:
- f142aaa313b80f94fa03b5c8d7fd1bda: 21300000 - f142aaa313b80f94fa03b5c8d7fd1bda: 21300000
- 9fba1f041a692c149841c2ec988f27cc: 21300000 - 9fba1f041a692c149841c2ec988f27cc: 21300000
- 5b68c444be1cdef4884405c3172b5036: 21300000 - 5b68c444be1cdef4884405c3172b5036: 21300000
- be3fe644859e20446934b60517107569: 21300000
- 7f3e20c4846a8404ba4c5c79f1b0bfa0: 21300000 - 7f3e20c4846a8404ba4c5c79f1b0bfa0: 21300000
- a42aa5c5b4414c043b0208d2290e708e: 21300000 - a42aa5c5b4414c043b0208d2290e708e: 21300000
- 51cabd9642ff4ff4a91b612d52f679c6: 21300000 - 51cabd9642ff4ff4a91b612d52f679c6: 21300000
...@@ -63,6 +64,7 @@ SpriteAtlas: ...@@ -63,6 +64,7 @@ SpriteAtlas:
- 8870f9d6b5a34104bbb3db7eab3196ed: 21300000 - 8870f9d6b5a34104bbb3db7eab3196ed: 21300000
- ed5b337882592c64286405ccd6e2d372: 21300000 - ed5b337882592c64286405ccd6e2d372: 21300000
- ba79f6dae7a5b6b41aa8c44b3756e182: 21300000 - ba79f6dae7a5b6b41aa8c44b3756e182: 21300000
- 4a987d6e80450e5459db3a8546d8fd1e: 21300000
- 22ef429e034a01f4386e35ba706a28b0: 21300000 - 22ef429e034a01f4386e35ba706a28b0: 21300000
- 4357fdde4141cf54d866df31a14be017: 21300000 - 4357fdde4141cf54d866df31a14be017: 21300000
- ef58582f971703b45885c27d06e4f400: 21300000 - ef58582f971703b45885c27d06e4f400: 21300000
...@@ -74,6 +76,7 @@ SpriteAtlas: ...@@ -74,6 +76,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: f142aaa313b80f94fa03b5c8d7fd1bda, type: 3} - {fileID: 21300000, guid: f142aaa313b80f94fa03b5c8d7fd1bda, type: 3}
- {fileID: 21300000, guid: 9fba1f041a692c149841c2ec988f27cc, type: 3} - {fileID: 21300000, guid: 9fba1f041a692c149841c2ec988f27cc, type: 3}
- {fileID: 21300000, guid: 5b68c444be1cdef4884405c3172b5036, type: 3} - {fileID: 21300000, guid: 5b68c444be1cdef4884405c3172b5036, type: 3}
- {fileID: 21300000, guid: be3fe644859e20446934b60517107569, type: 3}
- {fileID: 21300000, guid: 7f3e20c4846a8404ba4c5c79f1b0bfa0, type: 3} - {fileID: 21300000, guid: 7f3e20c4846a8404ba4c5c79f1b0bfa0, type: 3}
- {fileID: 21300000, guid: a42aa5c5b4414c043b0208d2290e708e, type: 3} - {fileID: 21300000, guid: a42aa5c5b4414c043b0208d2290e708e, type: 3}
- {fileID: 21300000, guid: 51cabd9642ff4ff4a91b612d52f679c6, type: 3} - {fileID: 21300000, guid: 51cabd9642ff4ff4a91b612d52f679c6, type: 3}
...@@ -81,6 +84,7 @@ SpriteAtlas: ...@@ -81,6 +84,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 8870f9d6b5a34104bbb3db7eab3196ed, type: 3} - {fileID: 21300000, guid: 8870f9d6b5a34104bbb3db7eab3196ed, type: 3}
- {fileID: 21300000, guid: ed5b337882592c64286405ccd6e2d372, type: 3} - {fileID: 21300000, guid: ed5b337882592c64286405ccd6e2d372, type: 3}
- {fileID: 21300000, guid: ba79f6dae7a5b6b41aa8c44b3756e182, type: 3} - {fileID: 21300000, guid: ba79f6dae7a5b6b41aa8c44b3756e182, type: 3}
- {fileID: 21300000, guid: 4a987d6e80450e5459db3a8546d8fd1e, type: 3}
- {fileID: 21300000, guid: 22ef429e034a01f4386e35ba706a28b0, type: 3} - {fileID: 21300000, guid: 22ef429e034a01f4386e35ba706a28b0, type: 3}
- {fileID: 21300000, guid: 4357fdde4141cf54d866df31a14be017, type: 3} - {fileID: 21300000, guid: 4357fdde4141cf54d866df31a14be017, type: 3}
- {fileID: 21300000, guid: ef58582f971703b45885c27d06e4f400, type: 3} - {fileID: 21300000, guid: ef58582f971703b45885c27d06e4f400, type: 3}
...@@ -91,6 +95,7 @@ SpriteAtlas: ...@@ -91,6 +95,7 @@ SpriteAtlas:
- img_text_DuelDirectAtk_k01 - img_text_DuelDirectAtk_k01
- img_text_DuelDirectAtk_t00 - img_text_DuelDirectAtk_t00
- img_text_DuelDirectAtk_e01 - img_text_DuelDirectAtk_e01
- DuelFinalBlowText01
- img_text_DuelDirectAtk_c00 - img_text_DuelDirectAtk_c00
- img_text_DuelDirectAtk_d00 - img_text_DuelDirectAtk_d00
- img_text_DuelDirectAtk_a01 - img_text_DuelDirectAtk_a01
...@@ -98,6 +103,7 @@ SpriteAtlas: ...@@ -98,6 +103,7 @@ SpriteAtlas:
- img_text_DuelDirectAtk_t01 - img_text_DuelDirectAtk_t01
- img_text_DuelDirectAtk_i01 - img_text_DuelDirectAtk_i01
- img_text_DuelDirectAtk_e00 - img_text_DuelDirectAtk_e00
- DuelFinalBlow01
- img_text_DuelDirectAtk_c01 - img_text_DuelDirectAtk_c01
- img_text_DuelDirectAtk_k00 - img_text_DuelDirectAtk_k00
- img_text_DuelDirectAtk_a00 - img_text_DuelDirectAtk_a00
......
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