Skip to content

Commit 788a10c

Browse files
committed
merge from sachPico
2 parents 79aea89 + 6eeab39 commit 788a10c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4668
-50
lines changed

Assets/2-Gerakan-dan-Animasi/Scenes/Game.unity

Lines changed: 313 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ GameObject:
133133
- component: {fileID: 200492218}
134134
- component: {fileID: 200492217}
135135
- component: {fileID: 200492220}
136+
- component: {fileID: 200492221}
137+
- component: {fileID: 200492222}
136138
m_Layer: 0
137-
m_Name: NewPlayer
138-
m_TagString: Untagged
139+
m_Name: Player
140+
m_TagString: Player
139141
m_Icon: {fileID: 0}
140142
m_NavMeshLayer: 0
141143
m_StaticEditorFlags: 0
@@ -237,6 +239,57 @@ MonoBehaviour:
237239
m_Name:
238240
m_EditorClassIdentifier:
239241
speed: 5
242+
bulletSpawnDistance: 1
243+
bulletSpeed: 8
244+
playerBulletObject: {fileID: 2778955798494776353, guid: 1540f2a23978b7f40b4f6f39a65599fc,
245+
type: 3}
246+
--- !u!61 &200492221
247+
BoxCollider2D:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
m_GameObject: {fileID: 200492216}
253+
m_Enabled: 1
254+
m_Density: 1
255+
m_Material: {fileID: 0}
256+
m_IsTrigger: 0
257+
m_UsedByEffector: 0
258+
m_UsedByComposite: 0
259+
m_Offset: {x: 0, y: 0}
260+
m_SpriteTilingProperty:
261+
border: {x: 0, y: 0, z: 0, w: 0}
262+
pivot: {x: 0.5, y: 0.5}
263+
oldSize: {x: 2, y: 2}
264+
newSize: {x: 1, y: 1}
265+
adaptiveTilingThreshold: 0.5
266+
drawMode: 0
267+
adaptiveTiling: 0
268+
m_AutoTiling: 0
269+
serializedVersion: 2
270+
m_Size: {x: 1.5377634, y: 1.3293228}
271+
m_EdgeRadius: 0
272+
--- !u!50 &200492222
273+
Rigidbody2D:
274+
serializedVersion: 4
275+
m_ObjectHideFlags: 0
276+
m_CorrespondingSourceObject: {fileID: 0}
277+
m_PrefabInstance: {fileID: 0}
278+
m_PrefabAsset: {fileID: 0}
279+
m_GameObject: {fileID: 200492216}
280+
m_BodyType: 0
281+
m_Simulated: 1
282+
m_UseFullKinematicContacts: 0
283+
m_UseAutoMass: 0
284+
m_Mass: 1
285+
m_LinearDrag: 0
286+
m_AngularDrag: 0.05
287+
m_GravityScale: 0
288+
m_Material: {fileID: 0}
289+
m_Interpolate: 0
290+
m_SleepingMode: 0
291+
m_CollisionDetection: 0
292+
m_Constraints: 4
240293
--- !u!1 &743459980
241294
GameObject:
242295
m_ObjectHideFlags: 0
@@ -320,6 +373,217 @@ Transform:
320373
m_Father: {fileID: 0}
321374
m_RootOrder: 0
322375
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
376+
--- !u!1 &1016806216
377+
GameObject:
378+
m_ObjectHideFlags: 0
379+
m_CorrespondingSourceObject: {fileID: 0}
380+
m_PrefabInstance: {fileID: 0}
381+
m_PrefabAsset: {fileID: 0}
382+
serializedVersion: 6
383+
m_Component:
384+
- component: {fileID: 1016806218}
385+
- component: {fileID: 1016806217}
386+
- component: {fileID: 1016806222}
387+
- component: {fileID: 1016806221}
388+
- component: {fileID: 1016806220}
389+
- component: {fileID: 1016806219}
390+
- component: {fileID: 1016806223}
391+
m_Layer: 0
392+
m_Name: background
393+
m_TagString: Untagged
394+
m_Icon: {fileID: 0}
395+
m_NavMeshLayer: 0
396+
m_StaticEditorFlags: 0
397+
m_IsActive: 1
398+
--- !u!212 &1016806217
399+
SpriteRenderer:
400+
m_ObjectHideFlags: 0
401+
m_CorrespondingSourceObject: {fileID: 0}
402+
m_PrefabInstance: {fileID: 0}
403+
m_PrefabAsset: {fileID: 0}
404+
m_GameObject: {fileID: 1016806216}
405+
m_Enabled: 1
406+
m_CastShadows: 0
407+
m_ReceiveShadows: 0
408+
m_DynamicOccludee: 1
409+
m_MotionVectors: 1
410+
m_LightProbeUsage: 1
411+
m_ReflectionProbeUsage: 1
412+
m_RayTracingMode: 0
413+
m_RenderingLayerMask: 1
414+
m_RendererPriority: 0
415+
m_Materials:
416+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
417+
m_StaticBatchInfo:
418+
firstSubMesh: 0
419+
subMeshCount: 0
420+
m_StaticBatchRoot: {fileID: 0}
421+
m_ProbeAnchor: {fileID: 0}
422+
m_LightProbeVolumeOverride: {fileID: 0}
423+
m_ScaleInLightmap: 1
424+
m_ReceiveGI: 1
425+
m_PreserveUVs: 0
426+
m_IgnoreNormalsForChartDetection: 0
427+
m_ImportantGI: 0
428+
m_StitchLightmapSeams: 1
429+
m_SelectedEditorRenderState: 0
430+
m_MinimumChartSize: 4
431+
m_AutoUVMaxDistance: 0.5
432+
m_AutoUVMaxAngle: 89
433+
m_LightmapParameters: {fileID: 0}
434+
m_SortingLayerID: 0
435+
m_SortingLayer: 0
436+
m_SortingOrder: -1
437+
m_Sprite: {fileID: 21300000, guid: 55418215f822c6c43a6573e8139c29db, type: 3}
438+
m_Color: {r: 1, g: 1, b: 1, a: 1}
439+
m_FlipX: 0
440+
m_FlipY: 0
441+
m_DrawMode: 0
442+
m_Size: {x: 17.777779, y: 10}
443+
m_AdaptiveModeThreshold: 0.5
444+
m_SpriteTileMode: 0
445+
m_WasSpriteAssigned: 1
446+
m_MaskInteraction: 0
447+
m_SpriteSortPoint: 0
448+
--- !u!4 &1016806218
449+
Transform:
450+
m_ObjectHideFlags: 0
451+
m_CorrespondingSourceObject: {fileID: 0}
452+
m_PrefabInstance: {fileID: 0}
453+
m_PrefabAsset: {fileID: 0}
454+
m_GameObject: {fileID: 1016806216}
455+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
456+
m_LocalPosition: {x: 0, y: 0, z: 0}
457+
m_LocalScale: {x: 1, y: 1, z: 1}
458+
m_Children: []
459+
m_Father: {fileID: 0}
460+
m_RootOrder: 3
461+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
462+
--- !u!61 &1016806219
463+
BoxCollider2D:
464+
m_ObjectHideFlags: 0
465+
m_CorrespondingSourceObject: {fileID: 0}
466+
m_PrefabInstance: {fileID: 0}
467+
m_PrefabAsset: {fileID: 0}
468+
m_GameObject: {fileID: 1016806216}
469+
m_Enabled: 1
470+
m_Density: 1
471+
m_Material: {fileID: 0}
472+
m_IsTrigger: 0
473+
m_UsedByEffector: 0
474+
m_UsedByComposite: 0
475+
m_Offset: {x: 0, y: -5.5}
476+
m_SpriteTilingProperty:
477+
border: {x: 0, y: 0, z: 0, w: 0}
478+
pivot: {x: 0.5, y: 0.5}
479+
oldSize: {x: 17.777779, y: 10}
480+
newSize: {x: 17.777779, y: 10}
481+
adaptiveTilingThreshold: 0.5
482+
drawMode: 0
483+
adaptiveTiling: 0
484+
m_AutoTiling: 0
485+
serializedVersion: 2
486+
m_Size: {x: 17.777779, y: 1}
487+
m_EdgeRadius: 0
488+
--- !u!61 &1016806220
489+
BoxCollider2D:
490+
m_ObjectHideFlags: 0
491+
m_CorrespondingSourceObject: {fileID: 0}
492+
m_PrefabInstance: {fileID: 0}
493+
m_PrefabAsset: {fileID: 0}
494+
m_GameObject: {fileID: 1016806216}
495+
m_Enabled: 1
496+
m_Density: 1
497+
m_Material: {fileID: 0}
498+
m_IsTrigger: 0
499+
m_UsedByEffector: 0
500+
m_UsedByComposite: 0
501+
m_Offset: {x: 0, y: 3.5}
502+
m_SpriteTilingProperty:
503+
border: {x: 0, y: 0, z: 0, w: 0}
504+
pivot: {x: 0.5, y: 0.5}
505+
oldSize: {x: 17.777779, y: 10}
506+
newSize: {x: 17.777779, y: 10}
507+
adaptiveTilingThreshold: 0.5
508+
drawMode: 0
509+
adaptiveTiling: 0
510+
m_AutoTiling: 0
511+
serializedVersion: 2
512+
m_Size: {x: 15.777779, y: 3}
513+
m_EdgeRadius: 0
514+
--- !u!61 &1016806221
515+
BoxCollider2D:
516+
m_ObjectHideFlags: 0
517+
m_CorrespondingSourceObject: {fileID: 0}
518+
m_PrefabInstance: {fileID: 0}
519+
m_PrefabAsset: {fileID: 0}
520+
m_GameObject: {fileID: 1016806216}
521+
m_Enabled: 1
522+
m_Density: 1
523+
m_Material: {fileID: 0}
524+
m_IsTrigger: 0
525+
m_UsedByEffector: 0
526+
m_UsedByComposite: 0
527+
m_Offset: {x: 8.5, y: 0}
528+
m_SpriteTilingProperty:
529+
border: {x: 0, y: 0, z: 0, w: 0}
530+
pivot: {x: 0.5, y: 0.5}
531+
oldSize: {x: 17.777779, y: 10}
532+
newSize: {x: 17.777779, y: 10}
533+
adaptiveTilingThreshold: 0.5
534+
drawMode: 0
535+
adaptiveTiling: 0
536+
m_AutoTiling: 0
537+
serializedVersion: 2
538+
m_Size: {x: 0.7777786, y: 10}
539+
m_EdgeRadius: 0
540+
--- !u!61 &1016806222
541+
BoxCollider2D:
542+
m_ObjectHideFlags: 0
543+
m_CorrespondingSourceObject: {fileID: 0}
544+
m_PrefabInstance: {fileID: 0}
545+
m_PrefabAsset: {fileID: 0}
546+
m_GameObject: {fileID: 1016806216}
547+
m_Enabled: 1
548+
m_Density: 1
549+
m_Material: {fileID: 0}
550+
m_IsTrigger: 0
551+
m_UsedByEffector: 0
552+
m_UsedByComposite: 0
553+
m_Offset: {x: -8.5, y: 0}
554+
m_SpriteTilingProperty:
555+
border: {x: 0, y: 0, z: 0, w: 0}
556+
pivot: {x: 0.5, y: 0.5}
557+
oldSize: {x: 17.777779, y: 10}
558+
newSize: {x: 17.777779, y: 10}
559+
adaptiveTilingThreshold: 0.5
560+
drawMode: 0
561+
adaptiveTiling: 0
562+
m_AutoTiling: 0
563+
serializedVersion: 2
564+
m_Size: {x: 0.7777786, y: 10}
565+
m_EdgeRadius: 0
566+
--- !u!50 &1016806223
567+
Rigidbody2D:
568+
serializedVersion: 4
569+
m_ObjectHideFlags: 0
570+
m_CorrespondingSourceObject: {fileID: 0}
571+
m_PrefabInstance: {fileID: 0}
572+
m_PrefabAsset: {fileID: 0}
573+
m_GameObject: {fileID: 1016806216}
574+
m_BodyType: 2
575+
m_Simulated: 1
576+
m_UseFullKinematicContacts: 0
577+
m_UseAutoMass: 0
578+
m_Mass: 1
579+
m_LinearDrag: 0
580+
m_AngularDrag: 0.05
581+
m_GravityScale: 0
582+
m_Material: {fileID: 0}
583+
m_Interpolate: 0
584+
m_SleepingMode: 1
585+
m_CollisionDetection: 0
586+
m_Constraints: 4
323587
--- !u!1 &1347093906
324588
GameObject:
325589
m_ObjectHideFlags: 0
@@ -436,3 +700,50 @@ MonoBehaviour:
436700
m_Name:
437701
m_EditorClassIdentifier:
438702
speed: 8
703+
bulletSpawnDistance: 0
704+
bulletSpeed: 0
705+
playerBulletObject: {fileID: 0}
706+
--- !u!1 &1992817978
707+
GameObject:
708+
m_ObjectHideFlags: 0
709+
m_CorrespondingSourceObject: {fileID: 0}
710+
m_PrefabInstance: {fileID: 0}
711+
m_PrefabAsset: {fileID: 0}
712+
serializedVersion: 6
713+
m_Component:
714+
- component: {fileID: 1992817980}
715+
- component: {fileID: 1992817979}
716+
m_Layer: 0
717+
m_Name: GameController
718+
m_TagString: Untagged
719+
m_Icon: {fileID: 0}
720+
m_NavMeshLayer: 0
721+
m_StaticEditorFlags: 0
722+
m_IsActive: 1
723+
--- !u!114 &1992817979
724+
MonoBehaviour:
725+
m_ObjectHideFlags: 0
726+
m_CorrespondingSourceObject: {fileID: 0}
727+
m_PrefabInstance: {fileID: 0}
728+
m_PrefabAsset: {fileID: 0}
729+
m_GameObject: {fileID: 1992817978}
730+
m_Enabled: 1
731+
m_EditorHideFlags: 0
732+
m_Script: {fileID: 11500000, guid: d06c264cbf6283c4dae5672f9dbd7f23, type: 3}
733+
m_Name:
734+
m_EditorClassIdentifier:
735+
enemy: {fileID: 6849644610586864870, guid: 767873397da669d4e9898e78cd768952, type: 3}
736+
--- !u!4 &1992817980
737+
Transform:
738+
m_ObjectHideFlags: 0
739+
m_CorrespondingSourceObject: {fileID: 0}
740+
m_PrefabInstance: {fileID: 0}
741+
m_PrefabAsset: {fileID: 0}
742+
m_GameObject: {fileID: 1992817978}
743+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
744+
m_LocalPosition: {x: 0, y: 0, z: 0}
745+
m_LocalScale: {x: 1, y: 1, z: 1}
746+
m_Children: []
747+
m_Father: {fileID: 0}
748+
m_RootOrder: 4
749+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/2-Gerakan-dan-Animasi/Scripts/MovementInput.cs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44

55
public class MovementInput : MonoBehaviour
66
{
7+
private Rigidbody2D rb;
78
private int directionID;
89
private Animator animator;
910
private Vector3 mouseScreenToWorld, mouseToPlayer;
1011
public float speed = 5f;
12+
public float bulletSpawnDistance;
13+
public float bulletSpeed;
14+
public GameObject playerBulletObject;
1115

1216
void Start()
1317
{
1418
animator = gameObject.GetComponent<Animator>();
19+
rb = gameObject.GetComponent<Rigidbody2D>();
1520
}
1621

1722
void Update()
@@ -25,13 +30,19 @@ void Update()
2530
Vector3 movement = new Vector3(inputX, inputY, 0f).normalized;
2631
mouseScreenToWorld = Camera.main.ScreenToWorldPoint(Input.mousePosition);
2732
mouseToPlayer = (mouseScreenToWorld - transform.position);
28-
directionID = (int)((((Mathf.Atan2(mouseToPlayer.y, mouseToPlayer.x) * Mathf.Rad2Deg)+360f)%360 + 22.5f)/ 45)%8;
29-
// Debug.Log((Mathf.Atan2(mouseToPlayer.y, mouseToPlayer.x) * Mathf.Rad2Deg + 360f)%360 + ", "+directionID + "("+ mouseToPlayer.x + ", "+mouseToPlayer.y+")");
30-
// Debug.DrawLine(transform.position, mouseScreenToWorld, Color.red);
33+
directionID = (int)(((Mathf.Atan2(mouseToPlayer.y, mouseToPlayer.x) * Mathf.Rad2Deg + 360)%360f + 22.5f)/ 45)%8;
3134

32-
3335
// Atur animasi dan gerakkan pemain
3436
animator.SetInteger("directionIndex", directionID);
35-
transform.Translate(movement * speed * Time.deltaTime);
37+
rb.velocity = new Vector2(movement.x, movement.y) * speed;
38+
// transform.Translate(movement * speed * Time.deltaTime);
39+
40+
if(Input.GetMouseButtonDown(0))
41+
{
42+
Vector3 bulletSpawnPoint = mouseToPlayer.normalized * bulletSpawnDistance + transform.position;
43+
GameObject spawnedPlayerBullet = Instantiate(playerBulletObject, bulletSpawnPoint, Quaternion.identity);
44+
spawnedPlayerBullet.GetComponent<BulletMovement>().direction = Mathf.Atan2(mouseToPlayer.y, mouseToPlayer.x)*Mathf.Rad2Deg%360f;
45+
spawnedPlayerBullet.GetComponent<BulletMovement>().bulletSpeed = bulletSpeed;
46+
}
3647
}
3748
}

0 commit comments

Comments
 (0)