Commit 5c6b284f authored by 16이상민's avatar 16이상민

Add fireworks & their logic

parent 6bd361a5
......@@ -9,7 +9,8 @@ namespace JudgeModule
{
private Transform deactives;
private Action EndGame;
private GameObject judgeText;
private GameObject judgeText,
firework;
private JudgeTextManager judgetextmanager;
private MotionGageManager guage;
......@@ -17,6 +18,7 @@ namespace JudgeModule
{
deactives = obj["deactives"].transform;
judgeText = obj["judgetext"];
firework = obj["firework"];
EndGame = endgame;
judgetextmanager = judgeText.GetComponent<JudgeTextManager>();
......@@ -26,7 +28,7 @@ namespace JudgeModule
public void WrongNoteProc(Note note)
{
SetJudge(Judge.MISS, judgeText);
SetJudge(Judge.MISS, judgeText, firework);
note.Component.Deactivate(deactives.transform);
if (!(note is MotionNote))
......@@ -37,7 +39,7 @@ namespace JudgeModule
{
var judge = Judge.TestJudge(note, timing);
SetJudge(judge, judgeText);
SetJudge(judge, judgeText, firework);
judgetextmanager.Register(note);
Debug.Log("Entered: " + timing + ", Judge: " + judge.Name);
......@@ -62,7 +64,7 @@ namespace JudgeModule
if (Judge.IsNoteProgress(note, timing, interval))
{
Debug.Log("Continuing: " + timing);
SetJudge(Judge.Perfect, judgeText);
SetJudge(Judge.Perfect, judgeText, firework);
judgetextmanager.Register(note);
++note.JudgeCount;
}
......@@ -71,7 +73,7 @@ namespace JudgeModule
public void CorrectlyStoppedNoteProc(Note note, float timing)
{
guage.ResetGuage();
SetJudge(Judge.TestJudge(note, timing, true), judgeText);
SetJudge(Judge.TestJudge(note, timing, true), judgeText, firework);
judgetextmanager.Register(note);
note.Component.Deactivate(deactives.transform);
judgetextmanager.UnRegister();
......@@ -80,18 +82,25 @@ namespace JudgeModule
public void IncorrectlyStoppedNoteProc(Note note)
{
guage.ResetGuage();
SetJudge(Judge.MISS, judgeText);
SetJudge(Judge.MISS, judgeText, firework);
judgetextmanager.Register(note);
note.Component.Deactivate(deactives.transform, false);
judgetextmanager.UnRegister();
}
public static void SetJudge(Judge judge, GameObject judgeText)
public static void SetJudge(Judge judge, GameObject judgeText, GameObject firework)
{
AllSceneManager.Combo = judge.IsBreak ? 0 : AllSceneManager.Combo + 1;
AllSceneManager.Score += judge.Score;
AllSceneManager.JudgeCount[judge]++;
if (AllSceneManager.Combo > 0 &&
AllSceneManager.Combo % 4 == 0)
{
firework.GetComponent<FireworkManager>().timeout += 2;
firework.SetActive(true);
}
judgeText.SetActive(false);
judgeText.SetActive(true);
judgeText.GetComponent<Text>().text = judge.Name;
......
......@@ -12,7 +12,8 @@ namespace JudgeModule
deactives,
appear,
disappear,
judgetext;
judgetext,
firework;
private JudgeTextManager judgetextmanager;
......@@ -102,6 +103,7 @@ namespace JudgeModule
appear = gameObjects["appear"];
disappear = gameObjects["disappear"];
judgetext = gameObjects["judgetext"];
firework = gameObjects["firework"];
judgetextmanager = judgetext.GetComponent<JudgeTextManager>();
......@@ -154,7 +156,7 @@ namespace JudgeModule
!judgetextmanager.IsRegistered(c.Instance) &&
initialPos.x - c.StartPosition() > Judge.BAD.TimingRange(c.Instance))
{
NoteJudger.SetJudge(Judge.MISS, judgetext);
NoteJudger.SetJudge(Judge.MISS, judgetext, firework);
judgetextmanager.Register(c.Instance);
c.Deactivate(deactives.transform, !c.Instance.IsLong);
}
......
fileFormatVersion: 2
guid: 1c1b2a8bd24884349a855ae4e3204e87
folderAsset: yes
timeCreated: 1519783752
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e8b405e1979722145975882d71057c69
folderAsset: yes
timeCreated: 1512407297
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 07bf7a6e1f8a31b4c9ab73b1a8c70a9c
timeCreated: 1512407322
licenseType: Store
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9745a0a175439a540afb5504b65a91cc
folderAsset: yes
timeCreated: 1512383939
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ba0889a586191da4fb53b824398f449f
folderAsset: yes
timeCreated: 1512383939
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Dense_Sparks_mtl
m_Shader: {fileID: 202, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 46a5b43a3aadc7e48849d843ac9f3dc3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmisColor: {r: 1, g: 1, b: 1, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 0.625, g: 0.625, b: 0.625, a: 0.5}
fileFormatVersion: 2
guid: 25fbdbeb41dfb07498fd894f94b27ac1
timeCreated: 1512398629
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Light_parks_mtl
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 3346d592bd4a633458b04babe8517151, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}
fileFormatVersion: 2
guid: 61d4b46b4b91acc45bd71d544ecdded3
timeCreated: 1512383946
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Pyrotechnic_Stick_mtl
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: f7e9ccab1ade03e43b50e7e505675226, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: 3487c2577f2fb2b48bc06fb00d42d85b
timeCreated: 1512406261
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Smoke_mtl
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: ba2c8654520148546be8c55d5f2feb46, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmisColor: {r: 1, g: 1, b: 1, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}
fileFormatVersion: 2
guid: 7bcf7c39a1373cf4e945c3c9277e2c35
timeCreated: 1512384581
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: c5d5b7747bb38f249832156f3efc32df
timeCreated: 1512388399
licenseType: Store
ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Pyrotechnic_Firework
9500000: //RootNode
materials:
importMaterials: 1
materialName: 1
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 0
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: db8547b3628360c48974108233b5f271
folderAsset: yes
timeCreated: 1512408449
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: cb6fa03b1f13c7041aa80d770f00e163
timeCreated: 1512408455
licenseType: Store
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: becebee8e5b58764e96a3c48c1741a31
timeCreated: 1512408547
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: bcb146b4e89629f40a3c61620687ec1f
folderAsset: yes
timeCreated: 1517307535
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
using System.Collections;
public class Pyrotechnic_Firework : MonoBehaviour {
public GameObject FireworkFX;
void Start (){
FireworkFX.SetActive(false);
}
void Update (){
if (Input.GetButtonDown("Fire1")) //check to see if the left mouse was pressed - trigger firework
{
StartCoroutine("TriggerFirework");
}
}
IEnumerator TriggerFirework(){
FireworkFX.SetActive(true);
yield return new WaitForSeconds(2);
FireworkFX.SetActive(false);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: d8c231856a28b154cb5b44143d14c529
timeCreated: 1517307559
licenseType: Store
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 149b4f672cfafcd438379b05c9fa397e
folderAsset: yes
timeCreated: 1512383939
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f7e9ccab1ade03e43b50e7e505675226
timeCreated: 1512388050
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 04fdacd22f73cae45a13ea9739b3e96e
timeCreated: 1512406364
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 46a5b43a3aadc7e48849d843ac9f3dc3
timeCreated: 1512404712
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 4096
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ba2c8654520148546be8c55d5f2feb46
timeCreated: 1512384572
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
- buildTarget: Standalone
maxTextureSize: 4096
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9d8f58382bccff14796b260dad39d9a3
timeCreated: 1512384571
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3346d592bd4a633458b04babe8517151
timeCreated: 1512383991
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -2392,6 +2392,50 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0}
--- !u!1 &1197718014
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1197718015}
- component: {fileID: 1197718016}
m_Layer: 0
m_Name: Firework
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1197718015
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1197718014}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1359478575}
- {fileID: 1432184526}
m_Father: {fileID: 0}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1197718016
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1197718014}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56fc2aefec1bbd341ba5ba3219b7c3e4, type: 3}
m_Name:
m_EditorClassIdentifier:
FireworkFX_1: {fileID: 1359478573}
FireworkFX_2: {fileID: 1432184524}
--- !u!1 &1199323771
GameObject:
m_ObjectHideFlags: 0
......@@ -2757,6 +2801,63 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &1359478570
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1197718015}
m_Modifications:
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.x
value: -2.001
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.y
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.z
value: -3
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1741373224901852, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_Name
value: Pyrotechnic_Firework_1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114026146667932184, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1359478573 stripped
GameObject:
m_PrefabParentObject: {fileID: 1957745376997864, guid: cb6fa03b1f13c7041aa80d770f00e163,
type: 2}
m_PrefabInternal: {fileID: 1359478570}
--- !u!4 &1359478575 stripped
Transform:
m_PrefabParentObject: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163,
type: 2}
m_PrefabInternal: {fileID: 1359478570}
--- !u!4 &1364026383 stripped
Transform:
m_PrefabParentObject: {fileID: 400004, guid: 4428a4d47b3582c4b90ee7163c0223da, type: 3}
......@@ -2826,6 +2927,63 @@ Light:
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &1432184521
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1197718015}
m_Modifications:
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.x
value: 2.001
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.y
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalPosition.z
value: -3
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1741373224901852, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
propertyPath: m_Name
value: Pyrotechnic_Firework_2
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114026146667932184, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: cb6fa03b1f13c7041aa80d770f00e163, type: 2}
m_IsPrefabParent: 0
--- !u!1 &1432184524 stripped
GameObject:
m_PrefabParentObject: {fileID: 1957745376997864, guid: cb6fa03b1f13c7041aa80d770f00e163,
type: 2}
m_PrefabInternal: {fileID: 1432184521}
--- !u!4 &1432184526 stripped
Transform:
m_PrefabParentObject: {fileID: 4422763704143724, guid: cb6fa03b1f13c7041aa80d770f00e163,
type: 2}
m_PrefabInternal: {fileID: 1432184521}
--- !u!1 &1441728455
GameObject:
m_ObjectHideFlags: 0
......
using UnityEngine;
public class FireworkManager : MonoBehaviour
{
public GameObject FireworkFX_1,
FireworkFX_2;
public float timeout;
private float elapsed;
private void OnEnable()
{
FireworkFX_1.SetActive(true);
FireworkFX_2.SetActive(true);
}
private void OnDisable()
{
timeout = 0;
elapsed = 0;
FireworkFX_1.SetActive(false);
FireworkFX_2.SetActive(false);
}
private void Update()
{
elapsed += Time.deltaTime;
if (elapsed >= timeout)
gameObject.SetActive(false);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 56fc2aefec1bbd341ba5ba3219b7c3e4
timeCreated: 1519785162
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -16,7 +16,7 @@ public class GameManager : MonoBehaviour {
instance = new GameObject().AddComponent<GameManager>();
instance.CurrentTrack
= new TrackInfo("Assets/Tracks/Tutorial/temp2.bpe");
= new TrackInfo("Assets/Tracks/Tutorial/temp.bpe");
}
return instance;
......
......@@ -69,6 +69,8 @@ public class InGameManager : MonoBehaviour
disappear = GameObject.Find("DisappearNote");
judgetext = GameObject.Find("Judge");
input = GetComponent<InputManager>();
var firework = GameObject.Find("Firework");
firework.SetActive(false);
motionSampleDisplayPrefab = Resources.Load("Motion Sample Display")
as GameObject;
......@@ -84,7 +86,8 @@ public class InGameManager : MonoBehaviour
{ "disappear", disappear },
{ "judgetext", judgetext },
{ "sample", motionSampleDisplayPrefab },
{ "guage", GameObject.Find("Motion Guage") }
{ "guage", GameObject.Find("Motion Guage") },
{ "firework", firework }
});
}
......
......@@ -28,7 +28,7 @@ public class NoteJudgerTests
{
yield return null;
NoteJudger.SetJudge(x, settings.judge);
NoteJudger.SetJudge(x, settings.judge, null);
if (text.text == x.Name &&
text.color == x.Color)
......
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