mirror of
https://github.com/zoriya/Goulag-Prototype.git
synced 2025-12-06 06:36:29 +00:00
Conflict
This commit is contained in:
@@ -189,7 +189,6 @@ GameObject:
|
||||
- component: {fileID: 403186793}
|
||||
- component: {fileID: 403186792}
|
||||
- component: {fileID: 403186796}
|
||||
- component: {fileID: 403186795}
|
||||
- component: {fileID: 403186794}
|
||||
m_Layer: 0
|
||||
m_Name: GameManager
|
||||
@@ -234,101 +233,6 @@ AudioListener:
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 403186791}
|
||||
m_Enabled: 1
|
||||
--- !u!82 &403186795
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 403186791}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &403186796
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -36,11 +36,16 @@ public class EnvironementManager : MonoBehaviour
|
||||
BreakTile(new Vector3Int(pos.x, pos.y + 1, pos.z));
|
||||
SpawnFallingBlock(new Vector3Int(pos.x, pos.y + 1, pos.z));
|
||||
}
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && !BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z)))
|
||||
{
|
||||
BreakTile(new Vector3Int(pos.x, pos.y - 1, pos.z));
|
||||
SpawnFallingBlock(new Vector3Int(pos.x, pos.y - 1, pos.z));
|
||||
}
|
||||
}
|
||||
|
||||
bool BlockIsStable(Vector3Int pos, int loopUnder = 0, bool checkedLeft = false, bool checkedRight = false)
|
||||
bool BlockIsStable(Vector3Int pos, bool checkedBottom = false, bool checkedTop = false, bool checkedLeft = false, bool checkedRight = false, int loopUnder = 0, int loopTop = 0)
|
||||
{
|
||||
if (BlockStableUnder(pos, loopUnder))
|
||||
if (!checkedBottom && BlockStableUnder(pos, loopUnder))
|
||||
return true;
|
||||
|
||||
if (!checkedLeft && BlockStableLeft(pos))
|
||||
@@ -49,6 +54,9 @@ public class EnvironementManager : MonoBehaviour
|
||||
if (!checkedRight && BlockStableRight(pos))
|
||||
return true;
|
||||
|
||||
if (!checkedTop && BlockStableTop(pos, loopTop))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -57,7 +65,7 @@ public class EnvironementManager : MonoBehaviour
|
||||
if (tilemap.GetTile(pos) == imuable)
|
||||
return true;
|
||||
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z), loop + 1)))
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z), false, true, false, false, loop + 1)))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@@ -68,7 +76,7 @@ public class EnvironementManager : MonoBehaviour
|
||||
if (tilemap.GetTile(pos) == imuable)
|
||||
return true;
|
||||
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z), 0, false, true))
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z), false, false, false, true))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@@ -79,7 +87,18 @@ public class EnvironementManager : MonoBehaviour
|
||||
if (tilemap.GetTile(pos) == imuable)
|
||||
return true;
|
||||
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z), 0, true, false))
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z), false, false, true))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool BlockStableTop(Vector3Int pos, int loop)
|
||||
{
|
||||
if (tilemap.GetTile(pos) == imuable)
|
||||
return true;
|
||||
|
||||
if (tilemap.GetTile(new Vector3Int(pos.x, pos.y + 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y + 1, pos.z), true, false, false, false, 0, loop + 1)))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
8
Assets/Sound.meta
Normal file
8
Assets/Sound.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2c901014589da8e4f9503ca50c94f7c8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user