Commit 84c9f953 authored by KINETIC_'s avatar KINETIC_

Merge branch 'master' of git.upnl.org:KINETIC_/KINETC_MA

Conflicts:
	Assets/Scenes/Main_Game_Makingmap.unity
parents 627215e2 fe13e429
......@@ -52,7 +52,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: fed831537add9c0499acc491ce2254e5, type: 3}
m_Sprite: {fileID: 21300000, guid: 6ec83356e165e214593ff89c71c7c492, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
......@@ -64,7 +64,7 @@ Prefab:
- target: {fileID: 0}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: fed831537add9c0499acc491ce2254e5,
objectReference: {fileID: 21300000, guid: 6ec83356e165e214593ff89c71c7c492,
type: 3}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
......
......@@ -52,7 +52,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6c3204828a1b5da4f867a8c5d3cabb93, type: 3}
m_Sprite: {fileID: 21300000, guid: 966e0f29aeac91f48a5c5be7b2bc707d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
......@@ -64,7 +64,7 @@ Prefab:
- target: {fileID: 0}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 6c3204828a1b5da4f867a8c5d3cabb93,
objectReference: {fileID: 21300000, guid: 966e0f29aeac91f48a5c5be7b2bc707d,
type: 3}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
......
......@@ -52,7 +52,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: e162b36ed693a0444b795c3fdc390fcc, type: 3}
m_Sprite: {fileID: 21300000, guid: 9eaa10bd88b57784db44350e0ac552e9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
......@@ -64,7 +64,7 @@ Prefab:
- target: {fileID: 0}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: e162b36ed693a0444b795c3fdc390fcc,
objectReference: {fileID: 21300000, guid: 9eaa10bd88b57784db44350e0ac552e9,
type: 3}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
......
......@@ -52,7 +52,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 12f8161dfe50c5a489e4b825d14eed3e, type: 3}
m_Sprite: {fileID: 21300000, guid: 587c18bd44c5a164fbf103f429a1149b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
......@@ -64,7 +64,7 @@ Prefab:
- target: {fileID: 0}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 12f8161dfe50c5a489e4b825d14eed3e,
objectReference: {fileID: 21300000, guid: 587c18bd44c5a164fbf103f429a1149b,
type: 3}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
......
......@@ -45,9 +45,9 @@ MonoBehaviour:
locked: 0
stageMax: 5
bpm: 180
difficulty: 2
difficulty: 3
preStreamingStart: 0
preStreamingEnd: 0
preStreamingEnd: 32
--- !u!114 &11449344
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -99,7 +99,11 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: difficulty
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: preStreamingEnd
value: 32
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
......
......@@ -42,11 +42,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
blockNumList:
- blockType: 0
num: 3
- blockType: 2
num: 1
num: 6
- blockType: 1
num: 1
num: 6
startZonePosition: {x: 0, y: 0}
finishPosition: {x: 999, y: 999}
mapWidth: 1344
mapHeight: 2250
--- !u!114 &11470286
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -82,7 +84,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.size
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[0].num
......@@ -106,15 +108,15 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[0].num
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].blockType
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].num
value: 1
value: 6
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].blockType
......@@ -130,7 +132,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].num
value: 3
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[3].num
......@@ -144,6 +146,22 @@ Prefab:
propertyPath: m_isPrefab
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.x
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.y
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapHeight
value: 2250
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapWidth
value: 1344
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 196674}
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &196674
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 482454}
- 114: {fileID: 11448838}
- 114: {fileID: 11481144}
m_Layer: 0
m_Name: map2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &482454
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 712.865356, y: 196.776047, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!114 &11448838
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11a6f1e4d734f4a5096b248dd781b07e, type: 3}
m_Name:
m_EditorClassIdentifier:
blockNumList:
- blockType: 0
num: 3
- blockType: 2
num: 3
- blockType: 1
num: 15
startZonePosition: {x: 0, y: 0}
finishPosition: {x: 999, y: 999}
mapWidth: 1344
mapHeight: 2250
--- !u!114 &11481144
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7f02a53790b14168aa3379391df49b6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_gameObjectUIDMap:
m_unityObject: {fileID: 196674}
m_uniqueIdentifier: QoeNy47U0ki2PCtbSM96IA
m_componentUIDMapList:
- m_unityObject: {fileID: 11481144}
m_uniqueIdentifier: QoeNy47U0ki2PCtbSM96IA
- m_unityObject: {fileID: 482454}
m_uniqueIdentifier: IUluX23H4UmV1VCgHgfarA
- m_unityObject: {fileID: 11448838}
m_uniqueIdentifier: A3cVViSp6k+fWpVrEBgwbA
m_isPrefab: 1
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 0}
propertyPath: _blockList.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[0].num
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[1].bt
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[1].num
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[2].num
value: 5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[2].bt
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[0].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].blockType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].blockType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[3].blockType
value: 6
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[4].blockType
value: 5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].num
value: 15
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[3].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[4].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_isPrefab
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.x
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.y
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapHeight
value: 2250
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapWidth
value: 1344
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 196674}
m_IsPrefabParent: 1
fileFormatVersion: 2
guid: b6e7b78b147dbb94a9e54c73531f70af
timeCreated: 1440510174
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &196674
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 482454}
- 114: {fileID: 11448838}
- 114: {fileID: 11402438}
m_Layer: 0
m_Name: map3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &482454
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 712.865356, y: 196.776047, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!114 &11402438
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7f02a53790b14168aa3379391df49b6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_gameObjectUIDMap:
m_unityObject: {fileID: 196674}
m_uniqueIdentifier: 8R5i2CwMeE2fdEGcIKPrWg
m_componentUIDMapList:
- m_unityObject: {fileID: 11402438}
m_uniqueIdentifier: 8R5i2CwMeE2fdEGcIKPrWg
- m_unityObject: {fileID: 482454}
m_uniqueIdentifier: DbKAea85qUiqNLVuaMxKRg
- m_unityObject: {fileID: 11448838}
m_uniqueIdentifier: j9PGY79twE6fTrKmNRhIAQ
m_isPrefab: 1
--- !u!114 &11448838
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11a6f1e4d734f4a5096b248dd781b07e, type: 3}
m_Name:
m_EditorClassIdentifier:
blockNumList:
- blockType: 0
num: 9
- blockType: 2
num: 2
- blockType: 1
num: 5
startZonePosition: {x: 0, y: 0}
finishPosition: {x: 999, y: 999}
mapWidth: 1344
mapHeight: 2250
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 0}
propertyPath: _blockList.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[0].num
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[1].bt
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[1].num
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[2].num
value: 5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: _blockList.Array.data[2].bt
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[0].num
value: 9
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].blockType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[1].num
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].blockType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[3].blockType
value: 6
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[4].blockType
value: 5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[2].num
value: 5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[3].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: blockNumList.Array.data[4].num
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_isPrefab
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.x
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: finishPosition.y
value: 999
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapHeight
value: 2250
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: mapWidth
value: 1344
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 196674}
m_IsPrefabParent: 1
fileFormatVersion: 2
guid: 2cf437b5a0bd26a488ad545e67696fd9
timeCreated: 1440510175
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 20b440a560e15ba44a6f4113f32080ad
timeCreated: 1440507837
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 1a72276a2c3f99046b805f09fe5672cf
timeCreated: 1440509158
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ad6d1478fb4eca44e841ce0609730d63
timeCreated: 1440501718
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6eb299349c97c4a47810d5ec430507c7
timeCreated: 1440501666
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -956,6 +956,7 @@ GameObject:
- 114: {fileID: 983863358}
- 114: {fileID: 983863356}
- 95: {fileID: 983863360}
- 82: {fileID: 983863361}
m_Layer: 5
m_Name: Panel_UI
m_TagString: Untagged
......@@ -979,6 +980,7 @@ MonoBehaviour:
nextSong: {fileID: 1632507381}
difficulty: {fileID: 523754339}
bgImage: {fileID: 983863358}
bgmAudio: {fileID: 983863361}
--- !u!224 &983863357
RectTransform:
m_ObjectHideFlags: 0
......@@ -1043,6 +1045,75 @@ Animator:
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
--- !u!82 &983863361
AudioSource:
m_ObjectHideFlags: 0