BRNSystems/GeoJam2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fixed bug by @Tucan444

Browse Source
This commit is contained in:
Bruno Rybársky
2021-07-22 16:52:00 +02:00
parent b1dad755b6
commit 2168955a99
4 changed files with 331 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

325
Assets/Scenes/Level5.unity
View File

@ -185,7 +185,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109409225}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 37.8, y: 0.20000029, z: 0.70835644}
m_LocalPosition: {x: -49.2, y: -6, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1985907937}
@ -301,8 +301,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 20c0ecf95ac68c343bdf7b8295ff699c, type: 3}
m_Name:
m_EditorClassIdentifier:
width: 30
height: 0
width: 0
height: 60
speed: 4
--- !u!1 &219660005
GameObject:
@ -5382,6 +5382,156 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!1 &245397573
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 245397574}
- component: {fileID: 245397578}
- component: {fileID: 245397577}
- component: {fileID: 245397576}
- component: {fileID: 245397575}
m_Layer: 3
m_Name: Floor (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &245397574
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 245397573}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -100.1, y: 61.6, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1985907937}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &245397575
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 245397573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4366df60f8ac7f428d235d55b5dfc13, type: 3}
m_Name:
m_EditorClassIdentifier:
rotation_center: {fileID: 2033623433}
static_center: 1
right_rotation: 1
flipping: 1
speed: 0.5
flip_angle: 3
--- !u!50 &245397576
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 245397573}
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: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &245397577
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 245397573}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
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
--- !u!212 &245397578
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 245397573}
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: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
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: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0, g: 1, b: 0.5628011, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &246033624
GameObject:
m_ObjectHideFlags: 0
@ -5556,7 +5706,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 252954236}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.57, y: 0.20000029, z: 0.70835644}
m_LocalPosition: {x: -12.8, y: 0.20000029, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 343801489}
@ -6007,7 +6157,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 418549210}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -64.6, y: 1.2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2033623434}
@ -6256,6 +6406,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
player: {fileID: 685738189}
smoothing: 0.6
--- !u!20 &519420031
Camera:
m_ObjectHideFlags: 0
@ -11996,7 +12147,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -12.97, y: 2.04}
m_AnchoredPosition: {x: -33.9, y: 0.4}
m_SizeDelta: {x: 20, y: 4.4791}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &879779304
@ -12019,7 +12170,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Let 's test out your skills before the grand finale...
m_text: Let 's try out some new things
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: ef325a480290fa14fba489996636a572, type: 2}
m_sharedMaterial: {fileID: -8345311776861960751, guid: ef325a480290fa14fba489996636a572, type: 2}
@ -27146,7 +27297,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1196936239}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 90.4, y: 94.6, z: 0.70835644}
m_LocalPosition: {x: -53.9, y: 89, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 343801489}
@ -42468,6 +42619,156 @@ TrailRenderer:
m_MinVertexDistance: 0.1
m_Autodestruct: 0
m_Emitting: 1
--- !u!1 &1680513680
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1680513681}
- component: {fileID: 1680513685}
- component: {fileID: 1680513684}
- component: {fileID: 1680513683}
- component: {fileID: 1680513682}
m_Layer: 3
m_Name: Floor (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1680513681
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1680513680}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -73.3, y: 74.6, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1985907937}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1680513682
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1680513680}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4366df60f8ac7f428d235d55b5dfc13, type: 3}
m_Name:
m_EditorClassIdentifier:
rotation_center: {fileID: 2033623433}
static_center: 1
right_rotation: 1
flipping: 1
speed: 0.5
flip_angle: 3
--- !u!50 &1680513683
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1680513680}
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: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &1680513684
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1680513680}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
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
--- !u!212 &1680513685
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1680513680}
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: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
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: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
m_Color: {r: 0, g: 1, b: 0.5628011, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1744140755
GameObject:
m_ObjectHideFlags: 0
@ -43317,6 +43618,8 @@ Transform:
- {fileID: 246033625}
- {fileID: 109409226}
- {fileID: 2041384883}
- {fileID: 245397574}
- {fileID: 1680513681}
m_Father: {fileID: 343801489}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -43344,7 +43647,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2033623433}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 117.8, y: 59.8, z: 0}
m_LocalPosition: {x: -3.3, y: 61.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 418549211}
@ -43378,7 +43681,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041384882}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 147.30002, y: 39.1, z: 0.70835644}
m_LocalPosition: {x: -59.6, y: 51.399998, z: 0.70835644}
m_LocalScale: {x: 30, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1985907937}
@ -43401,7 +43704,7 @@ MonoBehaviour:
right_rotation: 1
flipping: 1
speed: 0.5
flip_angle: 5
flip_angle: 3
--- !u!50 &2041384885
Rigidbody2D:
serializedVersion: 4

12
Assets/Scripts/RotateAroundSelfAxis.cs
View File

@ -21,15 +21,13 @@ public class RotateAroundSelfAxis : MonoBehaviour
// Update is called once per frame
void Update()
{
rotation = transform.rotation;
if(right_rotation) {
rotation[2] -= speed * Time.deltaTime;
transform.localRotation *= Quaternion.AngleAxis(speed * Time.deltaTime, new Vector3(0f, 0f, -1f));
} else {
rotation[2] += speed * Time.deltaTime;
transform.localRotation *= Quaternion.AngleAxis(speed * Time.deltaTime, new Vector3(0f, 0f, 1f));
}
Debug.Log(speed * Time.deltaTime);
transform.rotation = rotation;
Debug.Log(rotation[2]);
}
}

4
Assets/Scripts/Rotation.cs
View File

@ -10,8 +10,8 @@ public class Rotation : MonoBehaviour
public bool static_center = true;
public bool right_rotation = true;
public bool flipping = false;
[Range(0.1f, 8)] [SerializeField] private float speed = 1;
[Range(0, (float)Math.PI * 2)] [SerializeField] private float flip_angle = 0;
[Range(0.1f, 8)] public float speed = 1;
[Range(0, (float)Math.PI * 2)] public float flip_angle = 0;
private float angle;
private float magnitude;

20
UserSettings/EditorUserSettings.asset
View File

@ -12,22 +12,22 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c73150012147f623d28393930
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c731500121479623d28393930
flags: 0
RecentlyUsedScenePath-6:
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c73150012147e623d28393930
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c731500121479623d28393930
value: 22424703114646680e0b0227036c73150012147f623d28393930
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c73150012147b623d28393930