Commit f631bb0c authored by 13정준영's avatar 13정준영

Fix Build Issue

parent 5538ce31
......@@ -7,4 +7,4 @@ ScriptedImporter:
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: ee6f618bc43a08e44b3b2906bfdcf282, type: 3}
script: {fileID: 11500000, guid: 0c4f1437c5bc6ba40b27bb82b1967307, type: 3}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Name: _LEVELS_
m_EditorClassIdentifier: Assembly-CSharp::LevelListscriptableObject
levels:
- {fileID: 11400000, guid: ccbc7c89d2b01a9469123e252cc2ecd6, type: 2}
......@@ -262,7 +262,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -341,7 +341,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -502,6 +502,46 @@ PrefabInstance:
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 144230, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 160596, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 177230, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 171246, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 167242, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 165334, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 100470, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 129006, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1000014277073068, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1000013428287994, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8789761232382084903, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
propertyPath: volumeLayer.m_Bits
......@@ -683,7 +723,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cb855524a23a32a43a730dbccc41c251, type: 3}
m_Name:
m_EditorClassIdentifier:
levelList: {fileID: 11400000, guid: 8aef72256133e3c479e5255c254cf80e, type: 2}
levelList:
- {fileID: 11400000, guid: ccbc7c89d2b01a9469123e252cc2ecd6, type: 2}
ForwardNoteObject: {fileID: 8354046899824507576, guid: a13dadc44404fcd4f8cfb986339b1507,
type: 3}
EdgeNoteObjects:
......@@ -699,7 +740,7 @@ MonoBehaviour:
gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
explosion: {fileID: 0}
fire:
actionPath:
actionPath: /actions/default/in/GrabPinch
needsReinit: 0
leftHand: 1
rightHand: 2
......@@ -988,7 +1029,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -1388,31 +1429,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6056639706327950656, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 1c2c060529a24f64a85c9b7dd58bed12, type: 2}
- target: {fileID: 875452231674394315, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 204067c6083ddfb4e836acfbc9fcfaf7, type: 2}
- target: {fileID: 443224601743444875, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 443224601743444875, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- target: {fileID: 639241641154850737, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: bf854eea5f14dea43a485d74a7dcd544, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2c9c1e84d44b6f04e9fb51294090c1b2, type: 3}
--- !u!33 &3426844780790398110
......
using System.Collections;
#if (UNITY_EDITOR)
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor.Experimental.AssetImporters;
......@@ -15,3 +16,4 @@ public class BmsImporter : ScriptedImporter
ctx.SetMainObject(textAsset);
}
}
#endif
\ No newline at end of file
fileFormatVersion: 2
guid: 8aef72256133e3c479e5255c254cf80e
NativeFormatImporter:
guid: 0c4f1437c5bc6ba40b27bb82b1967307
MonoImporter:
externalObjects: {}
mainObjectFileID: 11400000
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,7 +7,7 @@ using System;
[RequireComponent(typeof(AudioSource))]
public class PlayEngine : SingletonBehaviour<PlayEngine>
{
public LevelListscriptableObject levelList;
public LevelScriptableObject[] levelList;
public ForwardNoteObject ForwardNoteObject;
public EdgeNoteObject[] EdgeNoteObjects = new EdgeNoteObject[4];
private double startTime;
......@@ -48,7 +48,7 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
public void LoadAndPlay(int idx)
{
var levelData = levelList.levels[idx];
var levelData = levelList[idx];
var bmsText = levelData.bms.text;
var audioFile = levelData.audioFile;
var offsetBarTime = levelData.offsetBarTime;
......
......@@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/mergescene.unity
guid: 557cfd2a8af176848908c5130bb83f27
path: Assets/Scenes/stage_graphic.unity
guid: 4f49dbdc44985354fbcd4ca6c377eae3
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 7d275036f0cb1e544ab7351089d34050,
type: 2}
......@@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 4800000, guid: 457a7835d317dbd40a3c3467b0006e70, type: 3}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
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