Skip to content
This repository was archived by the owner on Aug 10, 2021. It is now read-only.

Commit 51c1e8a

Browse files
committed
Update samples
1 parent 309406f commit 51c1e8a

File tree

4 files changed

+63
-45
lines changed

4 files changed

+63
-45
lines changed

Samples/GameEvents/Prefabs/ShooterCamera.prefab

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GameObject:
1212
- component: {fileID: 6785867113212262384}
1313
- component: {fileID: 6785867113212262391}
1414
- component: {fileID: 6785867113212262386}
15+
- component: {fileID: 3563761561003061392}
1516
m_Layer: 0
1617
m_Name: ShooterCamera
1718
m_TagString: MainCamera
@@ -98,3 +99,34 @@ MonoBehaviour:
9899
m_EditorClassIdentifier:
99100
shotGameEvent: {fileID: 11400000, guid: d15108d9f7748d24584a3a876de12713, type: 2}
100101
shootButton: Fire1
102+
--- !u!114 &3563761561003061392
103+
MonoBehaviour:
104+
m_ObjectHideFlags: 0
105+
m_CorrespondingSourceObject: {fileID: 0}
106+
m_PrefabInstance: {fileID: 0}
107+
m_PrefabAsset: {fileID: 0}
108+
m_GameObject: {fileID: 6785867113212262390}
109+
m_Enabled: 1
110+
m_EditorHideFlags: 0
111+
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
112+
m_Name:
113+
m_EditorClassIdentifier:
114+
m_RenderShadows: 1
115+
m_RequiresDepthTextureOption: 2
116+
m_RequiresOpaqueTextureOption: 2
117+
m_CameraType: 0
118+
m_Cameras: []
119+
m_RendererIndex: -1
120+
m_VolumeLayerMask:
121+
serializedVersion: 2
122+
m_Bits: 1
123+
m_VolumeTrigger: {fileID: 0}
124+
m_RenderPostProcessing: 0
125+
m_Antialiasing: 0
126+
m_AntialiasingQuality: 2
127+
m_StopNaN: 0
128+
m_Dithering: 0
129+
m_ClearDepth: 1
130+
m_RequiresDepthTexture: 0
131+
m_RequiresColorTexture: 0
132+
m_Version: 2

Samples/GameEvents/Prefabs/Spawner.prefab

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ BoxCollider:
4444
m_IsTrigger: 0
4545
m_Enabled: 1
4646
serializedVersion: 2
47-
m_Size: {x: 15, y: 1, z: 15}
47+
m_Size: {x: 15, y: 0.5, z: 15}
4848
m_Center: {x: 0, y: 0, z: 0}
4949
--- !u!114 &1775778486484008960
5050
MonoBehaviour:
@@ -88,3 +88,4 @@ MonoBehaviour:
8888
spawnedLimit: 10
8989
spawnPrefab: {fileID: 7326214114355414923, guid: 499fa445dcd1c5e4691103ff3cf960d3,
9090
type: 3}
91+
maxRandomScale: {x: 1, y: 2, z: 1}

Samples/GameEvents/Scenes/GameEvents.unity

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -350,43 +350,6 @@ RectTransform:
350350
m_AnchoredPosition: {x: 0, y: 0}
351351
m_SizeDelta: {x: 0, y: 0}
352352
m_Pivot: {x: 0, y: 0}
353-
--- !u!1 &797437021 stripped
354-
GameObject:
355-
m_CorrespondingSourceObject: {fileID: 6785867113212262390, guid: 39aea4008adc3114ba8ad37589825c2a,
356-
type: 3}
357-
m_PrefabInstance: {fileID: 6785867112939382004}
358-
m_PrefabAsset: {fileID: 0}
359-
--- !u!114 &797437022
360-
MonoBehaviour:
361-
m_ObjectHideFlags: 0
362-
m_CorrespondingSourceObject: {fileID: 0}
363-
m_PrefabInstance: {fileID: 0}
364-
m_PrefabAsset: {fileID: 0}
365-
m_GameObject: {fileID: 797437021}
366-
m_Enabled: 1
367-
m_EditorHideFlags: 0
368-
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
369-
m_Name:
370-
m_EditorClassIdentifier:
371-
m_RenderShadows: 1
372-
m_RequiresDepthTextureOption: 2
373-
m_RequiresOpaqueTextureOption: 2
374-
m_CameraType: 0
375-
m_Cameras: []
376-
m_RendererIndex: -1
377-
m_VolumeLayerMask:
378-
serializedVersion: 2
379-
m_Bits: 1
380-
m_VolumeTrigger: {fileID: 0}
381-
m_RenderPostProcessing: 0
382-
m_Antialiasing: 0
383-
m_AntialiasingQuality: 2
384-
m_StopNaN: 0
385-
m_Dithering: 0
386-
m_ClearDepth: 1
387-
m_RequiresDepthTexture: 0
388-
m_RequiresColorTexture: 0
389-
m_Version: 2
390353
--- !u!1 &1418809548
391354
GameObject:
392355
m_ObjectHideFlags: 0
@@ -728,7 +691,7 @@ PrefabInstance:
728691
- target: {fileID: 3952613158653746744, guid: cde315354eda1ba4fae3b0c33583e9a1,
729692
type: 3}
730693
propertyPath: m_LocalPosition.y
731-
value: 1
694+
value: 0.25
732695
objectReference: {fileID: 0}
733696
- target: {fileID: 3952613158653746744, guid: cde315354eda1ba4fae3b0c33583e9a1,
734697
type: 3}
@@ -792,17 +755,17 @@ PrefabInstance:
792755
- target: {fileID: 6785867113212262385, guid: 39aea4008adc3114ba8ad37589825c2a,
793756
type: 3}
794757
propertyPath: m_LocalPosition.x
795-
value: -5
758+
value: -7
796759
objectReference: {fileID: 0}
797760
- target: {fileID: 6785867113212262385, guid: 39aea4008adc3114ba8ad37589825c2a,
798761
type: 3}
799762
propertyPath: m_LocalPosition.y
800-
value: 9.89
763+
value: 7
801764
objectReference: {fileID: 0}
802765
- target: {fileID: 6785867113212262385, guid: 39aea4008adc3114ba8ad37589825c2a,
803766
type: 3}
804767
propertyPath: m_LocalPosition.z
805-
value: -5
768+
value: -7
806769
objectReference: {fileID: 0}
807770
- target: {fileID: 6785867113212262385, guid: 39aea4008adc3114ba8ad37589825c2a,
808771
type: 3}

Samples/GameEvents/Scripts/Spawner.cs

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ public class Spawner : MonoBehaviour
1212
[SerializeField]
1313
private UnityEngine.GameObject spawnPrefab = default;
1414

15+
[Min(1f)]
16+
[SerializeField]
17+
private UnityEngine.Vector3 maxRandomScale =
18+
new UnityEngine.Vector3(1f, 2f, 1f);
19+
1520
private new BoxCollider collider;
1621
private int spawned;
1722

@@ -32,7 +37,15 @@ private bool IsSpawn()
3237

3338
private void Spawn()
3439
{
35-
Instantiate(spawnPrefab, GetSpawnPosition(), GetSpawnRotation(), transform);
40+
var instance = Instantiate(
41+
spawnPrefab,
42+
GetSpawnPosition(),
43+
GetSpawnRotation(),
44+
transform
45+
);
46+
47+
instance.transform.localScale = GetSpawnScale();
48+
3649
spawned++;
3750
}
3851

@@ -51,9 +64,9 @@ private UnityEngine.Vector3 GetSpawnPosition()
5164
private static Quaternion GetSpawnRotation()
5265
{
5366
var angles = new UnityEngine.Vector3(
67+
0f,
5468
GetRandomAngle(),
55-
GetRandomAngle(),
56-
GetRandomAngle()
69+
0f
5770
);
5871

5972
return Quaternion.Euler(angles);
@@ -64,6 +77,15 @@ private static float GetRandomAngle()
6477
return Random.Range(0f, 360f);
6578
}
6679

80+
private UnityEngine.Vector3 GetSpawnScale()
81+
{
82+
return new UnityEngine.Vector3(
83+
Random.Range(1f, maxRandomScale.x),
84+
Random.Range(1f, maxRandomScale.y),
85+
Random.Range(1f, maxRandomScale.z)
86+
);
87+
}
88+
6789
public void DecreaseSpawned()
6890
{
6991
spawned--;

0 commit comments

Comments
 (0)