Selaa lähdekoodia

New Player Prefab

Erik Wittkorn 9 vuotta sitten
vanhempi
commit
ce8f67055d

+ 9 - 0
game/Assets/Animation.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d50ec002efdd94687908f0e27e2d45c8
+folderAsset: yes
+timeCreated: 1501346877
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
game/Assets/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8db886966ab03481798a18eb702a04fe
+folderAsset: yes
+timeCreated: 1501419311
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 857 - 43
game/Assets/Prefabs/Player.prefab


+ 169 - 0
game/Assets/Prefabs/Spinner.prefab

@@ -0,0 +1,169 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1823419480998182}
+  m_IsPrefabParent: 1
+--- !u!1 &1023692998934438
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4910722841464584}
+  m_Layer: 0
+  m_Name: SpinnerPivot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1770017527029210
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4929338172196046}
+  - component: {fileID: 33866552146231046}
+  - component: {fileID: 23775418827657386}
+  - component: {fileID: 65616611097211800}
+  m_Layer: 0
+  m_Name: Spinner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1823419480998182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4971136084876632}
+  - component: {fileID: 54376493206981186}
+  m_Layer: 0
+  m_Name: Spinner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4910722841464584
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1023692998934438}
+  m_LocalRotation: {x: 0.7042534, y: 0.063461155, z: 0.06346115, w: -0.70425326}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 10.94912, y: 10.949146, z: 10.9491415}
+  m_Children:
+  - {fileID: 4929338172196046}
+  m_Father: {fileID: 4971136084876632}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 349.702}
+--- !u!4 &4929338172196046
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1770017527029210}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.02846998, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4910722841464584}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4971136084876632
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1823419480998182}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4910722841464584}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23775418827657386
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1770017527029210}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 2e86d1dcecc0fb245bec429d7d6df6e2, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &33866552146231046
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1770017527029210}
+  m_Mesh: {fileID: 4300002, guid: c69bf052a16339e4293c9f1dd3d69734, type: 3}
+--- !u!54 &54376493206981186
+Rigidbody:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1823419480998182}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &65616611097211800
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1770017527029210}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.06, y: 0.06, z: 0.003}
+  m_Center: {x: 0.000060200917, y: -0.02377817, z: 0.001505636}

+ 9 - 0
game/Assets/Prefabs/Spinner.prefab.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b7a50776d2afe4da29c642bd08d6e556
+timeCreated: 1501440288
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1101 - 0
game/Assets/Scenes/PlayerMovementAnimation.unity


+ 8 - 0
game/Assets/Scenes/PlayerMovementAnimation.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28939ab722e6b4e3cb21066f2ad3c3e2
+timeCreated: 1501337566
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 2
game/Assets/Scripts/Player.cs

@@ -234,15 +234,15 @@ public class Player : MonoBehaviour
 
         if (shooting)
         {
-            if (Time.frameCount % 2 == 0)
+            if (Time.frameCount % 4 == 0)
             {
                 muzzleLight.intensity = 0;
+                Shoot();
             }
             else
             {
                 muzzleLight.intensity = Random.Range(.5f, 2f) * lightIntensity;
             }
-            Shoot();
         }
         else
         {
@@ -250,6 +250,7 @@ public class Player : MonoBehaviour
         }
     }
 
+    public float fidgetSpin = 200.0f;
 
     int bulletCounter = 5;
     private void Shoot()
@@ -257,6 +258,8 @@ public class Player : MonoBehaviour
         var rb = Instantiate<Rigidbody>(bulletPrefab);
         rb.transform.position = gunTransform.position;
         rb.transform.forward = gunTransform.forward;
+        // rb.maxAngularVelocity = fidgetSpin;
+        // rb.AddTorque(transform.up * fidgetSpin, ForceMode.VelocityChange);
         rb.AddForce(bulletForce * (transform.forward + Vector3.up * bulletUpBias), ForceMode.VelocityChange);
         Destroy(rb.gameObject, 2f);
         if (bulletCounter == 5)