saving progress
This commit is contained in:
parent
54efc7d934
commit
f7c7c19649
@ -621,11 +621,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -10.557102
|
||||
value: -10.31
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -4.9684887
|
||||
value: -5.47
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
@ -1873,11 +1873,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -5.5271263
|
||||
value: -5.86
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.97644615
|
||||
value: -0.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
@ -4056,72 +4056,6 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &1552613236
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1779239469}
|
||||
m_Modifications:
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -8.640919
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 3.814005
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.78515846
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 493245979038171997, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Bat (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
--- !u!4 &1552613237 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3}
|
||||
m_PrefabInstance: {fileID: 1552613236}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1561579995
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -20706,56 +20640,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 23
|
||||
m_TileSpriteIndex: 23
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -73, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 23
|
||||
m_TileSpriteIndex: 23
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -72, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 19
|
||||
m_TileSpriteIndex: 19
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -71, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 19
|
||||
m_TileSpriteIndex: 19
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -70, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 23
|
||||
m_TileSpriteIndex: 23
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -43, y: -7, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -21096,46 +20980,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -6, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 23
|
||||
m_TileSpriteIndex: 23
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -73, y: -6, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 19
|
||||
m_TileSpriteIndex: 19
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -72, y: -6, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 13
|
||||
m_TileSpriteIndex: 13
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -71, y: -6, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 13
|
||||
m_TileSpriteIndex: 13
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -43, y: -6, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -21476,36 +21320,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -5, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 19
|
||||
m_TileSpriteIndex: 19
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -73, y: -5, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 13
|
||||
m_TileSpriteIndex: 13
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -72, y: -5, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 14
|
||||
m_TileSpriteIndex: 14
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -43, y: -5, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -21846,36 +21660,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -4, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 13
|
||||
m_TileSpriteIndex: 13
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -73, y: -4, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 11
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -72, y: -4, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 14
|
||||
m_TileSpriteIndex: 14
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -25, y: -4, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -22036,26 +21820,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -74, y: -3, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 11
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -73, y: -3, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 11
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -25, y: -3, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -22216,16 +21980,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 11
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -43, y: -2, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -22406,16 +22160,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: -1, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 11
|
||||
m_TileSpriteIndex: 11
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -43, y: -1, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -22596,16 +22340,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: 0, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 14
|
||||
m_TileSpriteIndex: 14
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -43, y: 0, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -22786,16 +22520,6 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: -74, y: 1, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 14
|
||||
m_TileSpriteIndex: 14
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 2147483649
|
||||
- first: {x: -43, y: 1, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
@ -28760,13 +28484,13 @@ Tilemap:
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 26
|
||||
m_Data: {fileID: 11400000, guid: 45175e3d4466c674fb6c13ca38ce840f, type: 2}
|
||||
- m_RefCount: 318
|
||||
- m_RefCount: 313
|
||||
m_Data: {fileID: 11400000, guid: f0167dfba7d78444ba833f64ca4007d2, type: 2}
|
||||
- m_RefCount: 31
|
||||
m_Data: {fileID: 11400000, guid: 2fd777b86deeec247bf3576fbd149d00, type: 2}
|
||||
- m_RefCount: 143
|
||||
- m_RefCount: 139
|
||||
m_Data: {fileID: 11400000, guid: 798041ec2cd3c584bab050019dc27b84, type: 2}
|
||||
- m_RefCount: 154
|
||||
- m_RefCount: 150
|
||||
m_Data: {fileID: 11400000, guid: 52a05c9a292a7cb4999c15d18c3f0f30, type: 2}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
@ -28776,7 +28500,7 @@ Tilemap:
|
||||
m_Data: {fileID: 11400000, guid: 501bac8dfe52a0346bfa1eb91a6a2ab4, type: 2}
|
||||
- m_RefCount: 129
|
||||
m_Data: {fileID: 11400000, guid: 0ee3b34e4fb5ee54fb57e02d06d65095, type: 2}
|
||||
- m_RefCount: 99
|
||||
- m_RefCount: 95
|
||||
m_Data: {fileID: 11400000, guid: c22f654c8aa9aa944b5d693ca9103328, type: 2}
|
||||
- m_RefCount: 339
|
||||
m_Data: {fileID: 11400000, guid: 83b63dbb237157d499ccae84db32bbff, type: 2}
|
||||
@ -28784,7 +28508,7 @@ Tilemap:
|
||||
m_Data: {fileID: 11400000, guid: 3246eecec4010e846a1b9f2581ede5ce, type: 2}
|
||||
- m_RefCount: 493
|
||||
m_Data: {fileID: 11400000, guid: 0e60b89cec4828f4ea1b1b30424c0259, type: 2}
|
||||
- m_RefCount: 144
|
||||
- m_RefCount: 140
|
||||
m_Data: {fileID: 11400000, guid: 9b586a46b81e0b34daf969de8ca99491, type: 2}
|
||||
- m_RefCount: 61
|
||||
m_Data: {fileID: 11400000, guid: 2a531f8e22611b3448f1faa2234cb6bb, type: 2}
|
||||
@ -28855,13 +28579,13 @@ Tilemap:
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
- m_RefCount: 318
|
||||
- m_RefCount: 313
|
||||
m_Data: {fileID: 1877226299, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 31
|
||||
m_Data: {fileID: 967020061, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 143
|
||||
- m_RefCount: 139
|
||||
m_Data: {fileID: -1084513563, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 154
|
||||
- m_RefCount: 150
|
||||
m_Data: {fileID: -776105136, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 0
|
||||
m_Data: {fileID: 0}
|
||||
@ -28871,7 +28595,7 @@ Tilemap:
|
||||
m_Data: {fileID: -1748505736, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 129
|
||||
m_Data: {fileID: 462095006, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 99
|
||||
- m_RefCount: 95
|
||||
m_Data: {fileID: -853772880, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 339
|
||||
m_Data: {fileID: -1210549817, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
@ -28879,7 +28603,7 @@ Tilemap:
|
||||
m_Data: {fileID: 462183523, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 493
|
||||
m_Data: {fileID: 233751764, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 144
|
||||
- m_RefCount: 140
|
||||
m_Data: {fileID: 534927881, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
- m_RefCount: 61
|
||||
m_Data: {fileID: -260359440, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
|
||||
@ -28928,7 +28652,7 @@ Tilemap:
|
||||
- m_RefCount: 2
|
||||
m_Data: {fileID: 435668745, guid: 5d712e80103d05a418217f3452dcd570, type: 3}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 2338
|
||||
- m_RefCount: 2317
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
@ -28965,7 +28689,7 @@ Tilemap:
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 2435
|
||||
- m_RefCount: 2414
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
@ -29240,28 +28964,8 @@ CompositeCollider2D:
|
||||
Y: -40000000
|
||||
- X: -430000000
|
||||
Y: -70000000
|
||||
- X: -690000000
|
||||
Y: -70000000
|
||||
- X: -690000000
|
||||
Y: -60000000
|
||||
- X: -700000000
|
||||
Y: -60000000
|
||||
- X: -700000000
|
||||
Y: -50000000
|
||||
- X: -710000000
|
||||
Y: -50000000
|
||||
- X: -710000000
|
||||
Y: -30000000
|
||||
- X: -720000000
|
||||
Y: -30000000
|
||||
- X: -720000000
|
||||
Y: -20000000
|
||||
- X: -730000000
|
||||
Y: -20000000
|
||||
- X: -730000000
|
||||
Y: 20000000
|
||||
- X: -740000000
|
||||
Y: 20000000
|
||||
Y: -70000000
|
||||
- X: -740000000
|
||||
Y: 50000000
|
||||
- X: -750000000
|
||||
@ -29869,17 +29573,7 @@ CompositeCollider2D:
|
||||
- {x: -25, y: -4}
|
||||
- {x: -43, y: -4}
|
||||
- {x: -43, y: -7}
|
||||
- {x: -69, y: -7}
|
||||
- {x: -69, y: -6}
|
||||
- {x: -70, y: -6}
|
||||
- {x: -70, y: -5}
|
||||
- {x: -71, y: -5}
|
||||
- {x: -71, y: -3}
|
||||
- {x: -72, y: -3}
|
||||
- {x: -72, y: -2}
|
||||
- {x: -73, y: -2}
|
||||
- {x: -73, y: 2}
|
||||
- {x: -74, y: 2}
|
||||
- {x: -74, y: -7}
|
||||
- {x: -74, y: 5}
|
||||
- {x: -75, y: 5}
|
||||
- {x: -75, y: 8}
|
||||
@ -30710,7 +30404,6 @@ Transform:
|
||||
- {fileID: 385820682}
|
||||
- {fileID: 834807260}
|
||||
- {fileID: 2012681692}
|
||||
- {fileID: 1552613237}
|
||||
- {fileID: 693229932}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 15
|
||||
@ -31128,10 +30821,63 @@ PrefabInstance:
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 2587898580844709860, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7454554424774629674}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
|
||||
--- !u!4 &7454554424774629672 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
|
||||
m_PrefabInstance: {fileID: 7454554424774629671}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7454554424774629673 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2587898580844709860, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
|
||||
m_PrefabInstance: {fileID: 7454554424774629671}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!61 &7454554424774629674
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7454554424774629673}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_ForceSendLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ForceReceiveLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ContactCaptureLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0.5}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
|
@ -19,16 +19,17 @@ public class PlayerBehavior : MonoBehaviour
|
||||
|
||||
[Header("Clarinet:")]
|
||||
bool unlockedClarinet;
|
||||
// things for dash
|
||||
public bool isDash = false;
|
||||
public float bonk = 2f;
|
||||
private Vector2 saveVelocity;
|
||||
public bool isInWater = false;
|
||||
//dont know if gravity matters
|
||||
public float dashForce = 1.2f;
|
||||
private float dashTime = 1.0f;
|
||||
private float dashInc = 0.1f;
|
||||
private float currentDash = 0.0f;
|
||||
Vector2 dashVec;
|
||||
// things for bounce
|
||||
public float reflectForce = 2f;
|
||||
private Vector2 saveVelocity;
|
||||
public bool isInWater = false;
|
||||
private bool lowSpeed = false;
|
||||
|
||||
[Header("Cymbals:")]
|
||||
@ -113,8 +114,6 @@ public class PlayerBehavior : MonoBehaviour
|
||||
isDash = true;
|
||||
playerInput.DeactivateInput();
|
||||
currentDash = 0.0f;
|
||||
// set so if in water dash will still be true
|
||||
// otherwise turn dash off
|
||||
}
|
||||
if (!playerController.IsGrounded() && isDash && (currentDash < dashTime))
|
||||
{
|
||||
@ -133,7 +132,6 @@ public class PlayerBehavior : MonoBehaviour
|
||||
else if (!isInWater)
|
||||
{
|
||||
isDash = false;
|
||||
|
||||
currentDash = 0.0f;
|
||||
_rb.AddForce(-(dashVec), ForceMode2D.Impulse);
|
||||
dashVec = Vector2.zero;
|
||||
@ -264,32 +262,40 @@ public class PlayerBehavior : MonoBehaviour
|
||||
}
|
||||
|
||||
void Bounce()
|
||||
{
|
||||
{/*
|
||||
Vector2 reflect;
|
||||
if (lowSpeed)
|
||||
if (Mathf.Abs(saveVelocity.y) < 1f)
|
||||
{
|
||||
reflect = new Vector2(saveVelocity.x, -(saveVelocity.y) * 0.75f);
|
||||
reflect = Vector2.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
reflect = new Vector2(saveVelocity.x, -(saveVelocity.y) * bonk);
|
||||
reflect = new Vector2(saveVelocity.x, -(saveVelocity.y) * reflectForce);
|
||||
}
|
||||
_rb.AddForce(reflect, ForceMode2D.Impulse);
|
||||
reflect = Vector2.zero;
|
||||
isDash = false;
|
||||
isDash = false;*/
|
||||
}
|
||||
|
||||
void Water()
|
||||
{
|
||||
/*if(isDash)
|
||||
{
|
||||
saveVelocity = _rb.velocity;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
/*
|
||||
if (Mathf.Abs(_rb.velocity.y) < 2f)
|
||||
{
|
||||
lowSpeed = true;
|
||||
saveVelocity = Vector2.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
saveVelocity = _rb.velocity;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
void OnTriggerEnter2D(Collider2D col)
|
||||
|
@ -313,10 +313,10 @@ public class PlayerMovement : MonoBehaviour
|
||||
//Caps maximum fall speed, so when falling over large distances we don't accelerate to insanely high speeds
|
||||
RB.velocity = new Vector2(RB.velocity.x, Mathf.Max(RB.velocity.y, -Data.maxFallSpeed));
|
||||
}
|
||||
else if (playerBehavior.isInWater)
|
||||
/*else if (playerBehavior.isInWater)
|
||||
{
|
||||
SetGravityScale(0);
|
||||
}
|
||||
}*/
|
||||
else
|
||||
{
|
||||
//Default gravity if standing on a platform or moving upwards
|
||||
|
Loading…
Reference in New Issue
Block a user