edit: attempted polish but failed

This commit is contained in:
Iced-lemon 2023-01-31 00:21:55 +08:00
parent d59a00fdd3
commit 0001809418
58 changed files with 11705 additions and 140 deletions

8
Assets/Animations.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 05e6cf05bc369b447b3f9f4da3018800
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,83 @@
%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: ExplosionFX
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: b5f088b437dd88748b87c29d4de0918f, type: 3}
- time: 0.033333335
value: {fileID: 21300000, guid: 4631f85d2d58a4b4daddf87692b320fa, type: 3}
- time: 0.06666667
value: {fileID: 21300000, guid: 048ba0450783fd54882f38737fbc1600, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: 973f7012c20149f41aadea1d1bf12d8a, type: 3}
- time: 0.13333334
value: {fileID: 21300000, guid: 12e5ac655c7d34c479ade1e23a89a96f, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: b5f088b437dd88748b87c29d4de0918f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: b5f088b437dd88748b87c29d4de0918f, type: 3}
- {fileID: 21300000, guid: 4631f85d2d58a4b4daddf87692b320fa, type: 3}
- {fileID: 21300000, guid: 048ba0450783fd54882f38737fbc1600, type: 3}
- {fileID: 21300000, guid: 973f7012c20149f41aadea1d1bf12d8a, type: 3}
- {fileID: 21300000, guid: 12e5ac655c7d34c479ade1e23a89a96f, type: 3}
- {fileID: 21300000, guid: b5f088b437dd88748b87c29d4de0918f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.18333334
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: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 533f1c1d7edfc044bb4f8bc1a888d182
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ExplosionFX
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 5922321728591070339}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &5003523472695221177
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ExplosionFX
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 533f1c1d7edfc044bb4f8bc1a888d182, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &5922321728591070339
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5003523472695221177}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5003523472695221177}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9d4e79fa461d3e54b9f89fc4ea9ed205
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c6e823bcfa028534ca2a8f856b6a320a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c6503801eb1c8674ab488f7da32b21be
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 B

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: b5f088b437dd88748b87c29d4de0918f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 50
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 4631f85d2d58a4b4daddf87692b320fa
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 50
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 048ba0450783fd54882f38737fbc1600
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 50
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 973f7012c20149f41aadea1d1bf12d8a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 50
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 12e5ac655c7d34c479ade1e23a89a96f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 50
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 44754f64c11c7414fa10cb471d70ded1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 632996cde01602e45b51f92034ea5b63
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 8de7e28308682f14da1981ecae598f63
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 00a8916b9a6c72047896c162e328deef
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 44623f410eb5ab941bc392aef98ee75e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 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: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Audio/SFX.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9583f386cfcb0aa489cef79c2fe974d0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -132,6 +132,7 @@ GameObject:
- component: {fileID: 20737164}
- component: {fileID: 20737163}
- component: {fileID: 20737162}
- component: {fileID: 20737165}
m_Layer: 0
m_Name: Testboard
m_TagString: Untagged
@ -185,7 +186,7 @@ MonoBehaviour:
authorityID: -1
paused: 0
controlledByPlayer: 1
controlledByAI: 1
controlledByAI: 0
CollapseCycleTime: 1.5
cursorX: 3
cursorY: 9
@ -213,3 +214,122 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &20737165
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20737161}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 638bc47cbd1ff1d4ca0da9eb2373d01d, type: 3}
m_Name:
m_EditorClassIdentifier:
shakeDuration: 0.05
--- !u!1 &1067640207
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1067640210}
- component: {fileID: 1067640209}
- component: {fileID: 1067640208}
- component: {fileID: 1067640211}
m_Layer: 0
m_Name: Testboard (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1067640208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067640207}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30516090f4fb2954fba121c0dfdfe3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
TilePrefab: {fileID: 6929433238081324627, guid: 2d35555d89dd5e94fb9527d52c616c11,
type: 3}
nextUI: {x: -1.3, y: 7, z: 0}
currentUI: {x: 6.3, y: 7, z: 0}
currentDrawers:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
nextDrawer:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
placementDrawer:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
Cursor: {fileID: 21300000, guid: 2b4cf7a8a6d213a40a7b76c8f50678b4, type: 3}
TileSize: 1
--- !u!114 &1067640209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067640207}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d402e786b88425242825f7fe22d84afb, type: 3}
m_Name:
m_EditorClassIdentifier:
EntityID: 0
authorityID: -1
paused: 0
controlledByPlayer: 0
controlledByAI: 1
CollapseCycleTime: 1.5
cursorX: 3
cursorY: 9
comboDelay: 0
collapseCount: 0
aiDowntime: 0
aiThinkTime: 0.5
aiAdvanceTime: 0.2
aiCursorMoveDelay: 0.1
aiPhase: 0
aiX: 0
aiY: 0
Options: 05020304
--- !u!4 &1067640210
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067640207}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.5, y: -5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1067640211
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067640207}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 638bc47cbd1ff1d4ca0da9eb2373d01d, type: 3}
m_Name:
m_EditorClassIdentifier:
shakeDuration: 0.05

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: FlashMaterial
m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
m_ShaderKeywords:
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

View File

@ -108,7 +108,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 551892316379973356}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.31, y: 1.72, z: 0}
m_LocalPosition: {x: -6.5, y: 1.72, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6654183484842423814}
@ -754,7 +754,6 @@ MonoBehaviour:
warningTMP: {fileID: 9171785583453038448}
warningOBJ: {fileID: 551892316379973356}
comboOBJ: {fileID: 2732903664061639523}
playerIndex: 1
scoreJumpDistance: 0.3
scoreJumpTime: 0.1
comboUITimer: 3
@ -961,8 +960,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 250
m_Sprite: {fileID: 21300000, guid: 59a6c7dc08e026549bab43a5649d3285, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1000,7 +999,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 816954473251480971}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.62, y: 3.0177, z: 0}
m_LocalPosition: {x: 3.75, y: 3.0177, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 816954472011690721}
@ -1043,15 +1042,15 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 200
m_Sprite: {fileID: 21300000, guid: 59a6c7dc08e026549bab43a5649d3285, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 1
m_Size: {x: 1.7473062, y: 5.920465}
m_Size: {x: 1.942363, y: 5.920465}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -1256,8 +1255,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 251
m_Sprite: {fileID: 21300000, guid: 5eccfc07f37331c49a92781cc77f38be, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1470,8 +1469,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 300
m_Sprite: {fileID: 21300000, guid: 59a6c7dc08e026549bab43a5649d3285, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -2203,7 +2202,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2709215759701489957}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.003, y: 0.1, z: 0}
m_LocalPosition: {x: -0.0098, y: 0.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5305530672969991458}
@ -2253,7 +2252,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 2
m_Size: {x: 0.9579966, y: 5.1666007}
m_Size: {x: 0.98364997, y: 5.1666007}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -2333,7 +2332,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2732903664061639523}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.31, y: 4.38, z: 0}
m_LocalPosition: {x: -6.5, y: 4.38, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4487483825553368167}
@ -2417,7 +2416,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2759323923354015448}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.645, y: 3.0177, z: 0}
m_LocalPosition: {x: -3.7424, y: 3.0177, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7775040865966488558}
@ -2460,15 +2459,15 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 200
m_Sprite: {fileID: 21300000, guid: 59a6c7dc08e026549bab43a5649d3285, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 1
m_Size: {x: 1.7473062, y: 5.920465}
m_Size: {x: 1.942363, y: 5.920465}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -2542,8 +2541,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 100
m_Sprite: {fileID: 21300000, guid: e7415bad4b80a664491abc8bce0ea62f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -2630,8 +2629,8 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 101
--- !u!222 &3215966788037142789
CanvasRenderer:
@ -3340,8 +3339,8 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 101
--- !u!222 &3279419296164374932
CanvasRenderer:
@ -3592,8 +3591,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 143672873
m_SortingLayer: 3
m_SortingLayerID: -161552023
m_SortingLayer: 5
m_SortingOrder: 100
m_Sprite: {fileID: 21300000, guid: e7415bad4b80a664491abc8bce0ea62f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}

View File

@ -0,0 +1,103 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4188064271420837705
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4188064271420837710}
- component: {fileID: 4188064271420837711}
- component: {fileID: 4188064271420837704}
m_Layer: 0
m_Name: ExplosionFX
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4188064271420837710
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4188064271420837705}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.4118, y: -0.21047361, z: 79.83131}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4188064271420837711
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4188064271420837705}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -491995147
m_SortingLayer: 6
m_SortingOrder: 100
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.08, y: 1.08}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &4188064271420837704
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4188064271420837705}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 9d4e79fa461d3e54b9f89fc4ea9ed205, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6518817fefae4214ca368ea9964bb16b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 24e37ec74bd1eb5408d43ef52d3a54eb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9f0613fdbc0c6dc4f86f9e7a4e890f4e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -90,7 +90,7 @@ PrefabInstance:
- target: {fileID: 816954472797894847, guid: 4f9940b6935492746ba2b914f5b0a4c3,
type: 3}
propertyPath: m_Name
value: Player2Board
value: Player2Board Variant
objectReference: {fileID: 0}
- target: {fileID: 816954473251480971, guid: 4f9940b6935492746ba2b914f5b0a4c3,
type: 3}
@ -120,7 +120,7 @@ PrefabInstance:
- target: {fileID: 3725176039482471388, guid: 4f9940b6935492746ba2b914f5b0a4c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 6.31
value: 6.5
objectReference: {fileID: 0}
- target: {fileID: 5868340880340728628, guid: 4f9940b6935492746ba2b914f5b0a4c3,
type: 3}
@ -130,7 +130,7 @@ PrefabInstance:
- target: {fileID: 6050077251644034212, guid: 4f9940b6935492746ba2b914f5b0a4c3,
type: 3}
propertyPath: m_LocalPosition.x
value: 6.31
value: 6.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f9940b6935492746ba2b914f5b0a4c3, type: 3}

View File

@ -0,0 +1,61 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8468493035522681220
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8468493035522681222}
- component: {fileID: 8468493035522681221}
m_Layer: 0
m_Name: VFXManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8468493035522681222
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8468493035522681220}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.3550014, y: 0.22682141, z: 79.83676}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8468493035522681221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8468493035522681220}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a8703975ea06f84e94a7026a3dd532e, type: 3}
m_Name:
m_EditorClassIdentifier:
allVFXData:
- vfxName: Explosion
vfxObject: {fileID: 4188064271420837705, guid: 6518817fefae4214ca368ea9964bb16b,
type: 3}
shouldKill: 1
lifeTime: 0.2
- vfxName: ParticlePuff
vfxObject: {fileID: 4872920665416204000, guid: 9f0613fdbc0c6dc4f86f9e7a4e890f4e,
type: 3}
shouldKill: 0
lifeTime: 0
- vfxName: ParticlePound
vfxObject: {fileID: 3054530707944020541, guid: 24e37ec74bd1eb5408d43ef52d3a54eb,
type: 3}
shouldKill: 0
lifeTime: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c76a794e794c18e4897ddd3734d58081
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -438,6 +438,65 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1509590072
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1509590074}
- component: {fileID: 1509590073}
m_Layer: 0
m_Name: VFXManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1509590073
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509590072}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a8703975ea06f84e94a7026a3dd532e, type: 3}
m_Name:
m_EditorClassIdentifier:
allVFXData:
- vfxName: Explosion
vfxObject: {fileID: 4188064271420837705, guid: 6518817fefae4214ca368ea9964bb16b,
type: 3}
shouldKill: 1
lifeTime: 0.2
- vfxName: ParticlePuff
vfxObject: {fileID: 4872920665416204000, guid: 9f0613fdbc0c6dc4f86f9e7a4e890f4e,
type: 3}
shouldKill: 0
lifeTime: 0
- vfxName: ParticlePound
vfxObject: {fileID: 3054530707944020541, guid: 24e37ec74bd1eb5408d43ef52d3a54eb,
type: 3}
shouldKill: 0
lifeTime: 0
--- !u!4 &1509590074
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509590072}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.3550014, y: 0.22682141, z: 79.83676}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1643099460
GameObject:
m_ObjectHideFlags: 0
@ -468,81 +527,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
keyCodeControlls:
- keyCode: 273
- keyCode: 13
InputFunctions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1930343878}
m_MethodName: SetScore
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1000
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- keyCode: 274
InputFunctions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7394357951300366995}
m_MethodName: SetScore
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 300
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- keyCode: 275
InputFunctions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7394357951300366995}
m_MethodName: SetScore
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 99
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- keyCode: 32
InputFunctions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1930343878}
m_MethodName: SetWarning
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 5
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- keyCode: 9
InputFunctions:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1930343878}
m_MethodName: SetCombo
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 99
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
--- !u!4 &1643099462
Transform:
m_ObjectHideFlags: 0
@ -557,18 +545,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1930343878 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1189229114797370561, guid: 7ec9521376920ea43b041df0b398984f,
type: 3}
m_PrefabInstance: {fileID: 4751426680149977899}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f89c54e527a19704197d23e16e9d61a7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1941057813
GameObject:
m_ObjectHideFlags: 0
@ -662,6 +638,7 @@ GameObject:
- component: {fileID: 2045221403}
- component: {fileID: 2045221402}
- component: {fileID: 2045221405}
- component: {fileID: 2045221406}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -794,6 +771,25 @@ MonoBehaviour:
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!114 &2045221406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2045221401}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eb19143cd46ff7641a1522d7318b29dd, type: 3}
m_Name:
m_EditorClassIdentifier:
cam: {fileID: 2045221403}
player: {fileID: 0}
shootshakeDuration: 0.2
shootShakeMagnitude: 2
shakePower: 0.1
smallShakeMultiplier: 0.1
screenshakeOffset: {x: 0.01, y: 0.01}
--- !u!1001 &4733092873744316084
PrefabInstance:
m_ObjectHideFlags: 0
@ -1145,18 +1141,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 55ee90197a494d54eb9b01aad0a7527e, type: 3}
--- !u!114 &7394357951300366995 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4030301178228994096, guid: 55ee90197a494d54eb9b01aad0a7527e,
type: 3}
m_PrefabInstance: {fileID: 7394357951300366994}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f89c54e527a19704197d23e16e9d61a7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &7450013623193215860
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 295ac802c88cd48448df9ecb56c7fb04
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb26112da6fce9c4ca2610cb953c66e6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,45 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Lemon.GenericLib.VFX;
public class BoardVisuals : MonoBehaviour
{
[Header("Runtime")]
[Space]
[Header("Refereces")]
[SerializeField] private float shakeDuration = 0.1f;
private GameBoard gameBoard;
private CameraController cameraController;
private bool initialized = false;
private void CheckInit()
{
if (!initialized)
{
//initialization code here
gameBoard = GetComponent<GameBoard>();
cameraController = CameraController.instanceCC;
gameBoard.onDrop += shakeOnDrop;
initialized = true;
}
}
private void Start()
{
CheckInit();
}
private void OnDestroy()
{
CheckInit();
gameBoard.onDrop -= shakeOnDrop;
}
private void shakeOnDrop() {
CheckInit();
if (gameBoard.controlledByPlayer) cameraController?.ApplyScreenShake(shakeDuration, true);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 638bc47cbd1ff1d4ca0da9eb2373d01d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,84 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Lemon.GenericLib.VFX;
public class TileVisuals : MonoBehaviour
{
[Header("Runtime")]
[Space]
[Header("Refereces")]
private TileDrawer tileDrawer;
[SerializeField] private HitFlash frontFlash;
[SerializeField] private HitFlash backFlash;
[SerializeField] private float flashDuration;
[SerializeField] private float shakeDuration = 0.2f;
private float entireDuration = 1.5f;
private VFX_Manager vfxManager;
private CameraController cameraController;
private bool isPlayer;
private bool initialized = false;
private void CheckInit()
{
if (!initialized)
{
//initialization code here
tileDrawer = GetComponent<TileDrawer>();
entireDuration = tileDrawer.board.CollapseCycleTime;
isPlayer = tileDrawer.board.controlledByPlayer;
tileDrawer.onStateChange += updateVisuals;
vfxManager = VFX_Manager.insatnceVFXM;
cameraController = CameraController.instanceCC;
initialized = true;
}
}
private void Start()
{
CheckInit();
}
private void updateVisuals(TileDrawer.TileState tileState){
CheckInit();
switch (tileState)
{
case TileDrawer.TileState.idle:
break;
case TileDrawer.TileState.pending:
StopCoroutine(FlashingCoroutine());
StartCoroutine(FlashingCoroutine());
break;
case TileDrawer.TileState.poof:
vfxManager?.spawnVFX("Explosion", transform.position);
vfxManager?.spawnVFX("ParticlePuff", transform.position);
if (isPlayer) {
Debug.Log("bro!!!'");
cameraController?.ApplyScreenShake(shakeDuration,10, true); //why does this not work!!!
}
break;
case TileDrawer.TileState.dropped:
vfxManager?.spawnVFX("ParticlePound", transform.position + (Vector3.down * 0.5f));
break;
case TileDrawer.TileState.none:
break;
default:
break;
}
}
IEnumerator FlashingCoroutine() {
frontFlash.Flash(flashDuration);
//backFlash.Flash(flashDuration);
yield return new WaitForSeconds(entireDuration - (flashDuration * 3));
frontFlash.Flash(flashDuration);
// backFlash.Flash(flashDuration);
yield return new WaitForSeconds(flashDuration * 2);
frontFlash.Flash(flashDuration);
//backFlash.Flash(flashDuration);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ba56949b19f58e34da285c0974ae5092
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7bdec22f29afa8245899160b77f09c8f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -207,6 +207,7 @@ namespace Lemon.GenericLib.VFX {
public void ApplyScreenShake(float duration, float newShakePower, bool isSmall = false)
{
//cb.enabled = false;
Debug.Log("shake man!!!'");
StopCoroutine("Screenshake");
StartCoroutine(Screenshake(duration, newShakePower, isSmall));

View File

@ -0,0 +1,57 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Lemon.GenericLib.VFX {
public class HitFlash : MonoBehaviour
{
public float flashDuration = 0.1f;
public SpriteRenderer sr;
public Material flashMaterial;
private Material defaultMaterial;
public bool getSR = false;
private void Start()
{
if (getSR) sr = GetComponent<SpriteRenderer>();
defaultMaterial = sr.material;
}
public void SetFlash(bool isFlashing = true)
{
if (isFlashing) sr.material = flashMaterial;
else sr.material = defaultMaterial;
}
public void Flash()
{
StartCoroutine(FlashRoutine());
}
public void Flash(float duration)
{
StartCoroutine(FlashRoutine(duration));
}
IEnumerator FlashRoutine()
{
sr.material = flashMaterial;
yield return new WaitForSeconds(flashDuration);
sr.material = defaultMaterial;
}
IEnumerator FlashRoutine(float duration)
{
sr.material = flashMaterial;
yield return new WaitForSeconds(duration);
sr.material = defaultMaterial;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 48efeb9de946548478eb2727ae3f55eb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e8e3cbd1de7025044a7a92113d6e88f0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -20,7 +20,6 @@ public class BoardUIScript : MonoBehaviour
[SerializeField] private TextMeshPro warningTMP;
[SerializeField] private GameObject warningOBJ;
[SerializeField] private GameObject comboOBJ;
[SerializeField] private int playerIndex;
[SerializeField] private float scoreJumpDistance = 0.25f;
[SerializeField] private float scoreJumpTime = 0.5f;
[SerializeField] private float comboUITimer = 3f;
@ -33,7 +32,7 @@ public class BoardUIScript : MonoBehaviour
if (!initialized)
{
//initialization code here
titleTMP.text = "Player " + playerIndex;
titleTMP.text = "Player";
scoreTMP.text = "0";
comboTMP.text = "x0";
warningTMP.text = "x0";
@ -101,6 +100,11 @@ public class BoardUIScript : MonoBehaviour
warningTMP.transform.LeanMoveLocalY(warningTextOriginY + scoreJumpDistance, scoreJumpTime).setLoopPingPong(1).setEase(LeanTweenType.easeOutQuad).setOnComplete(() => warningTMP.transform.LeanMoveLocalY(warningTextOriginY, 0));
}
public void SetPlayerName(string value)
{
titleTMP.text = value;
}
}

View File

@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
using System.Linq;
using Hashtable = ExitGames.Client.Photon.Hashtable; // Compatibility
@ -61,6 +62,9 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
public AIPhase aiPhase = AIPhase.None;
public enum AIPhase { None, Thinking, LocationC, LocationB, LocationA, Drop }
//public delegates for lemon
public Action onDrop;
void UpdateControls() {
// Scan the board for tile activations
board = board.Activate(out int activations);
@ -229,6 +233,8 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize {
Next = new Move().Set(Random,Random,Random);
board = board.Collapse(out _);
onDrop?.Invoke();
return true;
}

View File

@ -213,6 +213,12 @@ public class GameBoardDrawer : MonoBehaviour {
tile.amountInStack = amt.Count;
tile.stackedBelow = amt.Count(point => y > point.y);
}
//amt = tile.board.board.Clusterize(x, y);
//if (amt != null)
//{
// tile.isIncludedInMatch = amt.Contains((x, y));
//}
}
var tileT = tile.transform;

View File

@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
@ -22,6 +23,8 @@ public class TileDrawer : MonoBehaviour {
// This is called BEFORE the tile detail is updated
public void OnBreakFX() {
// Texel - Little test diagonal debug line :)
UpdateState(TileState.poof);
Debug.DrawLine(
transform.TransformPoint(new Vector3(1, 1)),
transform.TransformPoint(new Vector3(-1, -1)),
@ -51,12 +54,20 @@ public class TileDrawer : MonoBehaviour {
[Header("Updated Externally")]
public int stackedBelow = 0; // Used to select overlays
public int amountInStack = 0; // Updated externally
public bool isIncludedInMatch = false;
SpriteRenderer Underlay, Overlay;
[Range(0, 1)]
public float opacity = 1f, smearOpacity = 1f;
public enum TileState { idle, pending, poof, dropped, none, }
[Space]
[Header("Lemon's Variables")]
//lemon's tileState and exposed delegates
[SerializeField] private TileState currentTileState = TileState.none;
public Action<TileState> onStateChange;
#region Deferred setup under/overlays
void SetUnderlay(Sprite sp) {
if (Underlay) {
@ -192,19 +203,31 @@ public class TileDrawer : MonoBehaviour {
Sprite sprite = null;
if (deets != null) {
sprite = deets.Generic;
// Base of stack
if (amountInStack > 2) {
if (amountInStack > 2)
{
sprite = deets.ThirdOrLower;
if (stackedBelow == 1)
sprite = deets.SecondFromTop;
if (stackedBelow == 2)
sprite = deets.TopOfStack;
UpdateState(TileState.pending);
}
else if (detail.HasFlag(TileDetail.Poofed))
{
sprite = deets.Puff;
UpdateState(TileState.poof);
isIncludedInMatch = false;
}
else {
sprite = deets.Generic;
//if (isIncludedInMatch) UpdateState(TileState.pending); else UpdateState(TileState.idle);
UpdateState(TileState.idle);
}
// non-snowman-y states
if (detail.HasFlag(TileDetail.Poofed))
sprite = deets.Puff;
if (Application.isPlaying)
if (detail.HasFlag(TileDetail.Pending)) {
@ -235,6 +258,12 @@ public class TileDrawer : MonoBehaviour {
sr.sprite = sprite;
SetSmear(sprite, sprite == null ? 0 : smearOpacity);
if (!sprite) {
UpdateState(TileState.none);
isIncludedInMatch = false;
}
// Handle Overlays
bool hasOverlay = false;
@ -260,4 +289,11 @@ public class TileDrawer : MonoBehaviour {
if (!hasUnderlay)
SetUnderlay(null);
}
private void UpdateState(TileState newState) {
if (newState != currentTileState) {
onStateChange?.Invoke(newState);
currentTileState = newState;
}
}
}

View File

@ -11,6 +11,8 @@ GameObject:
- component: {fileID: 6929433238081324630}
- component: {fileID: 6929433238081324625}
- component: {fileID: 6929433238081324624}
- component: {fileID: 8959932463831801682}
- component: {fileID: 6988747586453390074}
m_Layer: 0
m_Name: TileDrawer
m_TagString: Untagged
@ -56,6 +58,7 @@ MonoBehaviour:
amountInStack: 0
opacity: 1
smearOpacity: 0
currentTileState: 0
SmearDistance: 1
--- !u!212 &6929433238081324624
SpriteRenderer:
@ -96,9 +99,9 @@ SpriteRenderer:
m_SortingLayerID: 662872267
m_SortingLayer: 4
m_SortingOrder: 0
m_Sprite: {fileID: -6936698821596298334, guid: ba7046a7d637abc4ba486e3e9e4fcfd3,
m_Sprite: {fileID: -8095011478633053862, guid: ba7046a7d637abc4ba486e3e9e4fcfd3,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.251}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@ -108,3 +111,34 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &8959932463831801682
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929433238081324627}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48efeb9de946548478eb2727ae3f55eb, type: 3}
m_Name:
m_EditorClassIdentifier:
flashDuration: 0.1
sr: {fileID: 6929433238081324624}
flashMaterial: {fileID: 2100000, guid: 7c591a335b592dd40ba17fb7b26e0bc2, type: 2}
getSR: 0
--- !u!114 &6988747586453390074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929433238081324627}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ba56949b19f58e34da285c0974ae5092, type: 3}
m_Name:
m_EditorClassIdentifier:
frontFlash: {fileID: 8959932463831801682}
backFlash: {fileID: 0}
flashDuration: 0.1

View File

@ -50,9 +50,12 @@ TagManager:
- name: SL_Panel
uniqueID: 143672873
locked: 0
- name: SL_Player
- name: SL_Blocks
uniqueID: 662872267
locked: 0
- name: SL_PanelBorder
uniqueID: 4133415273
locked: 0
- name: SL_FrontFX
uniqueID: 3802972149
locked: 0