Skip to content

M
MDPro3
Commit 2aeb9ca7 authored by SherryChaos's avatar SherryChaos
Browse files
Options

Built-in DuelTextDraw

parent f71e0957
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6819 additions and 3 deletions
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextDraw.meta 0 → 100644
View file @ 2aeb9ca7
fileFormatVersion: 2
guid: 4f1f01596032ab6438b0dbd5ae38428a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextDraw/DuelTextDraw.prefab.meta 0 → 100644
View file @ 2aeb9ca7
fileFormatVersion: 2
guid: 944f3d5063837fa46abdc23a922aa3cc
timeCreated: 1755118479
licenseType: Free
PrefabImporter:
externalObjects: {}
addedObjectFileIDs:
isPrefabVariant: 0
variantParentGUID: 00000000000000000000000000000000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/DuelPrefabs/DuelText/DuelTextDraw/DuelTextDrawTimeline.playable.meta 0 → 100644
View file @ 2aeb9ca7
fileFormatVersion: 2
guid: 08cc1a2b04c49294d8903e75968aba0d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/ScriptableObjects/DuelPrefabs.asset
View file @ 2aeb9ca7
......@@ -46,3 +46,4 @@ MonoBehaviour:
duelDirectAtk00: {fileID: 1574167293659148, guid: eb337d7e36edac348ab745105d1f93c9, type: 3}
duelFinalBlow: {fileID: 1348777536908202, guid: 1c29c2fea33e06042abc03b98b118a8c, type: 3}
duelTextStart: {fileID: 1853063056925814, guid: 06c4301da3292f14dad49a9664d8560b, type: 3}
duelTextDraw: {fileID: 1192508514770904, guid: 944f3d5063837fa46abdc23a922aa3cc, type: 3}
Assets/Scripts/MDPro3/ScriptableObjects/DuelPrefabContainer.cs
View file @ 2aeb9ca7
......@@ -48,5 +48,6 @@ namespace MDPro3
public GameObject duelDirectAtk00;
public GameObject duelFinalBlow;
public GameObject duelTextStart;
public GameObject duelTextDraw;
}
}
Assets/Scripts/MDPro3/Servant/OcgCore.cs
View file @ 2aeb9ca7
......@@ -2438,7 +2438,8 @@ namespace MDPro3.Servant
if (player == 2)
{
result = DuelResult.Draw;
duelText = ABLoader.LoadFromFile("MasterDuel/Timeline/DuelText/DuelTextDraw", true);
//duelText = ABLoader.LoadFromFile("MasterDuel/Timeline/DuelText/DuelTextDraw", true);
duelText = Instantiate(container.duelTextDraw);
}
else if (player == 0 || winType == 4)
{
......
Assets/Scripts/MasterDuel/YgomSystem/Effect/SpriteScaler.cs
View file @ 2aeb9ca7
......@@ -152,6 +152,9 @@ namespace YgomSystem.Effect
return null;
}
private bool colorGetted;
private Color originalColor;
private void OnEnable()
{
StartCoroutine(SetupAsync());
......@@ -160,7 +163,11 @@ namespace YgomSystem.Effect
private IEnumerator SetupAsync()
{
if (targetSprite == null) targetSprite = GetComponent<SpriteRenderer>();
var originalColor = targetSprite.color;
if (!colorGetted)
{
originalColor = targetSprite.color;
colorGetted = true;
}
targetSprite.color = Color.clear;
// Wait for the next frame to ensure script changes are ready.
......@@ -289,7 +296,7 @@ namespace YgomSystem.Effect
isApplied = true;
appliedScreenSize = new Vector2(screenWidth, screenHeight);
Debug.Log($"SpriteScaler applied: {gameObject.name}, Camera: {viewCamera}, Mode: {fitMode}, Scale: {transform.localScale}, Screen Size: {appliedScreenSize}");
//Debug.Log($"SpriteScaler applied: {gameObject.name}, Camera: {viewCamera}, Mode: {fitMode}, Scale: {transform.localScale}, Screen Size: {appliedScreenSize}");
}
public void Reapply()
......
Assets/Texture/DuelText/img_text_DuelTextDraw_w00.png.meta 0 → 100644
View file @ 2aeb9ca7
fileFormatVersion: 2
guid: bc7074881517d2e49b03d45388fbfda4
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:
Assets/Texture/DuelText/img_text_DuelTextDraw_w01.png.meta 0 → 100644
View file @ 2aeb9ca7
fileFormatVersion: 2
guid: 325753fa167ebac44a17cea9366d2ac0
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:
Assets/Texture/SpriteAtlas_DuelText.spriteatlas
View file @ 2aeb9ca7
......@@ -67,8 +67,10 @@ SpriteAtlas:
- c9d4b3c61865b6840bb2255e8df28b1f: 21300000
- 8870f9d6b5a34104bbb3db7eab3196ed: 21300000
- ed5b337882592c64286405ccd6e2d372: 21300000
- bc7074881517d2e49b03d45388fbfda4: 21300000
- 7fab3eb8fd79f4d4e8f2f3d147822b50: 21300000
- ba79f6dae7a5b6b41aa8c44b3756e182: 21300000
- 325753fa167ebac44a17cea9366d2ac0: 21300000
- ae21032c887c8f1408bbdb131f5032da: 21300000
- 2c2ee90db6fd6ab45b15c48b1d335435: 21300000
- 4a987d6e80450e5459db3a8546d8fd1e: 21300000
......@@ -97,8 +99,10 @@ SpriteAtlas:
- {fileID: 21300000, guid: c9d4b3c61865b6840bb2255e8df28b1f, type: 3}
- {fileID: 21300000, guid: 8870f9d6b5a34104bbb3db7eab3196ed, type: 3}
- {fileID: 21300000, guid: ed5b337882592c64286405ccd6e2d372, type: 3}
- {fileID: 21300000, guid: bc7074881517d2e49b03d45388fbfda4, type: 3}
- {fileID: 21300000, guid: 7fab3eb8fd79f4d4e8f2f3d147822b50, type: 3}
- {fileID: 21300000, guid: ba79f6dae7a5b6b41aa8c44b3756e182, type: 3}
- {fileID: 21300000, guid: 325753fa167ebac44a17cea9366d2ac0, type: 3}
- {fileID: 21300000, guid: ae21032c887c8f1408bbdb131f5032da, type: 3}
- {fileID: 21300000, guid: 2c2ee90db6fd6ab45b15c48b1d335435, type: 3}
- {fileID: 21300000, guid: 4a987d6e80450e5459db3a8546d8fd1e, type: 3}
......@@ -126,8 +130,10 @@ SpriteAtlas:
- img_text_DuelDirectAtk_r00
- img_text_DuelDirectAtk_t01
- img_text_DuelDirectAtk_i01
- img_text_DuelTextDraw_w00
- img_text_DuelTextStart_u02
- img_text_DuelDirectAtk_e00
- img_text_DuelTextDraw_w01
- img_text_DuelTextStart_e02
- img_text_DuelTextStart_d02
- DuelFinalBlow01
......
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