mevulfmp3
/
MuseumGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaked shrink powerup

Browse Source
main
Ivy 4 years ago
parent fadfd06116
commit 8b8765c94c
4 changed files with 247 additions and 31 deletions
Show Stats Download Patch File Download Diff File

177
MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity
Unescape View File

@ -123,6 +123,148 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &13055933
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 13055938}
- component: {fileID: 13055937}
- component: {fileID: 13055936}
- component: {fileID: 13055935}
- component: {fileID: 13055934}
m_Layer: 0
m_Name: Capsule
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &13055934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13055933}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 37e947767f230cb45b7cca13e4b4dbb3, type: 3}
m_Name:
m_EditorClassIdentifier:
canUnShrink: 1
canShrink: 0
isShrunk: 0
minRbSize: {x: 0, y: 0, z: 0}
minColSize: {x: 0, y: 0}
defaultRbSize: {x: 0, y: 0, z: 0}
defaultColSize: {x: 0, y: 0}
minSize: 0.5
--- !u!70 &13055935
CapsuleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13055933}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Size: {x: 1, y: 2}
m_Direction: 0
--- !u!50 &13055936
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13055933}
m_BodyType: 2
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!212 &13055937
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13055933}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -9095717837082945937, guid: 34587324d412940a79d530020c957dc0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &13055938
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13055933}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.71, y: -0.97, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &56401782
GameObject:
m_ObjectHideFlags: 0
@ -508,6 +650,7 @@ GameObject:
- component: {fileID: 273288223}
- component: {fileID: 273288225}
- component: {fileID: 273288224}
- component: {fileID: 273288226}
m_Layer: 0
m_Name: Background
m_TagString: Untagged
@ -2249,6 +2392,32 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!61 &273288226
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 273288222}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 1.5}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 22, y: 9}
m_EdgeRadius: 0
--- !u!1 &355907459
GameObject:
m_ObjectHideFlags: 0
@ -2658,7 +2827,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
propertyPath: m_LocalPosition.y
value: -2.4
value: -1.99
objectReference: {fileID: 0}
- target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
propertyPath: m_LocalPosition.z
@ -2724,6 +2893,10 @@ PrefabInstance:
propertyPath: m_Offset.y
value: -0.004920721
objectReference: {fileID: 0}
- target: {fileID: 4469907059167699923, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
--- !u!1 &637676176
@ -2770,7 +2943,7 @@ MonoBehaviour:
artImage: {fileID: 430284682}
obtainedPowerups:
powerupStatus:
sceneToLoad: Museum
sceneToLoad:
music:
- {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3}
--- !u!4 &637676178

8
MuseumGame/Assets/Scenes/DogLevel.meta
Unescape View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd810b025062c48fd978cb6d9a7d34b1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

75
MuseumGame/Assets/Scripts/Shrink.cs
Unescape View File

@ -6,21 +6,36 @@ public class Shrink : MonoBehaviour
{
private Rigidbody2D rb2d;
private CapsuleCollider2D col;
private bool canUnShrink = true;
public bool isShrunk = false;
public bool canUnShrink = true;
public bool canShrink = false;
public bool isShrunk = true;
private float scaleShrink = (6f/7f);
private float scaleUnShrink = (7f/6f);
public Vector3 minRbSize = new Vector3(0.0f, 0.0f, 0.0f);
public Vector2 minColSize = new Vector2(0.0f, 0.0f);
public Vector3 defaultRbSize = new Vector3(0.0f, 0.0f, 0.0f);
public Vector2 defaultColSize = new Vector2(0.0f, 0.0f);
// Start is called before the first frame update
void Start()
{
rb2d = GetComponent<Rigidbody2D>();
col = GetComponent<CapsuleCollider2D>();
minRbSize = new Vector3(rb2d.transform.localScale.x * scaleShrink, rb2d.transform.localScale.y * scaleShrink, rb2d.transform.localScale.z);
minColSize = new Vector2(col.size.x * scaleShrink, col.size.y * scaleShrink);
defaultRbSize = rb2d.transform.localScale;
defaultColSize = col.size;
}
// Update is called once per frame
void Update()
{
print(col.size + " " + rb2d.transform.localScale);
startShrinking();
}
public void startShrinking()
@ -30,38 +45,58 @@ public class Shrink : MonoBehaviour
IEnumerator shrinkLogic()
{
if (isShrunk)
{
for (int i = 0; i < 4; i++)
if (isShrunk && canShrink)
{
rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleUnShrink, rb2d.transform.localScale.y * scaleUnShrink, rb2d.transform.localScale.z);
col.size = new Vector2(col.size.x * scaleUnShrink, col.size.y * scaleUnShrink);
yield return new WaitForSeconds(0.1f);
print("true");
for (int i = 0; i < 3; i++) //unshrink
{
if(((defaultColSize.x >= col.size.x) || (defaultRbSize.x >= rb2d.transform.localScale.x)))
{
rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleUnShrink, rb2d.transform.localScale.y * scaleUnShrink, rb2d.transform.localScale.z);
col.size = new Vector2(col.size.x * scaleUnShrink, col.size.y * scaleUnShrink);
yield return new WaitForSeconds(0.1f);
}
}
isShrunk = false;
}
isShrunk = false;
}
else if(!isShrunk && canUnShrink)
{
for (int i = 0; i < 4; i++)
else if (!isShrunk && canUnShrink)
{
rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleShrink, rb2d.transform.localScale.y * scaleShrink, rb2d.transform.localScale.z);
col.size = new Vector2(col.size.x * scaleShrink, col.size.y * scaleShrink);
yield return new WaitForSeconds(0.1f);
}
for (int i = 0; i < 3; i++) //shrink
{
if (((minColSize.x <= col.size.x) || (minRbSize.x <= rb2d.transform.localScale.x)))
{
rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleShrink, rb2d.transform.localScale.y * scaleShrink, rb2d.transform.localScale.z);
col.size = new Vector2(col.size.x * scaleShrink, col.size.y * scaleShrink);
yield return new WaitForSeconds(0.1f);
}
}
isShrunk = true;
}
StopCoroutine(shrinkLogic());
}
private void OnTriggerEnter2D(Collider2D collision)
{
Debug.Log("Can't Shrink");
canUnShrink = false;
ShrinkFunction();
}
private void OnTriggerExit2D(Collider2D collision)
{
Debug.Log("Can Shrink");
Unshrink();
}
public void ShrinkFunction()
{
canShrink = false;
canUnShrink = true;
}
public void Unshrink()
{
canShrink = true;
canUnShrink = false;
}
}

18
MuseumGame/UserSettings/EditorUserSettings.asset
Unescape View File

@ -6,31 +6,31 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0

Write Preview
Loading…
Cancel
Save