Skip to content

Commit

Permalink
-Updated to 2019.2
Browse files Browse the repository at this point in the history
-Updated to Entities preview -0.1.1
  • Loading branch information
mikegeig committed Sep 9, 2019
1 parent b263f77 commit a6d688e
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 18 deletions.
9 changes: 5 additions & 4 deletions AngryDOTS/Assets/Scenes/ECS Shooter.unity
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ LightmapSettings:
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 112000002, guid: d235646aaa0510e46bd9ad6cd956ac82,
type: 2}
m_UseShadowmask: 0
Expand Down Expand Up @@ -177,7 +177,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220979866}
m_LocalRotation: {x: 0.1724006, y: 0.82731766, z: -0.38972017, w: 0.36598048}
m_LocalRotation: {x: 0.1724006, y: 0.8273177, z: -0.3897202, w: 0.36598048}
m_LocalPosition: {x: -8.095254, y: 5.072219, z: 4.8838463}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
Expand Down Expand Up @@ -338,6 +338,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -556,7 +557,7 @@ PrefabInstance:
- target: {fileID: 114167452494013206, guid: 387be402c6e254edb8f04a699355f406,
type: 3}
propertyPath: spreadShot
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114167452494013206, guid: 387be402c6e254edb8f04a699355f406,
type: 3}
Expand Down Expand Up @@ -893,7 +894,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496275636}
m_LocalRotation: {x: 0.1724006, y: 0.82731766, z: -0.38972017, w: 0.36598048}
m_LocalRotation: {x: 0.1724006, y: 0.8273177, z: -0.3897202, w: 0.36598048}
m_LocalPosition: {x: -8.095254, y: 5.072219, z: 4.8838463}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
Expand Down
2 changes: 1 addition & 1 deletion AngryDOTS/Assets/Scripts/ECS/Data/HealthComponent.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using Unity.Entities;

[Serializable]
public struct Health : IComponentData
{
public float Value;
}


5 changes: 4 additions & 1 deletion AngryDOTS/Assets/Scripts/EnemyBehaviour.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ void Update()
rigidBody.MovePosition(transform.position + movement);
}

//Enemy Collision
void OnTriggerEnter(Collider theCollider)
{
if (!theCollider.CompareTag("Bullet"))
return;

if(--enemyHealth <= 0)
enemyHealth--;

if(enemyHealth <= 0)
{
Destroy(gameObject);
BulletImpactPool.PlayBulletImpact(transform.position);
Expand Down
5 changes: 4 additions & 1 deletion AngryDOTS/Assets/Scripts/PlayerMovementAndLook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@ void AnimateThePlayer(Vector3 desiredDirection)
playerAnimator.SetFloat("Strafe", stra);
}

//Player Collision
void OnTriggerEnter(Collider theCollider)
{
if (!theCollider.CompareTag("Enemy"))
return;

if(--playerHealth <= 0)
playerHealth--;

if(playerHealth <= 0)
{
Settings.PlayerDied();
}
Expand Down
20 changes: 20 additions & 0 deletions AngryDOTS/Logs/Packages-Update.log
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,23 @@ The following packages were updated:
com.unity.purchasing from version 2.0.3 to 2.0.6
com.unity.render-pipelines.lightweight from version 5.6.1 to 5.7.2
com.unity.xr.legacyinputhelpers from version 1.0.0 to 2.0.2

=== Mon Sep 9 13:15:48 2019

Packages were changed.
Update Mode: updateDependencies

The following packages were added:
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
The following packages were updated:
com.unity.burst from version 1.0.4 to 1.1.2
com.unity.package-manager-ui from version 2.1.2 to 2.2.0
com.unity.render-pipelines.lightweight from version 5.7.2 to 6.9.0
com.unity.timeline from version 1.0.0 to 1.1.0
19 changes: 13 additions & 6 deletions AngryDOTS/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{
"registry": "https://staging-packages.unity.com",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.3.2",
"com.unity.burst": "1.0.4",
"com.unity.burst": "1.1.2",
"com.unity.cinemachine": "2.3.3",
"com.unity.collab-proxy": "1.2.16",
"com.unity.entities": "0.0.12-preview.33",
"com.unity.package-manager-ui": "2.1.2",
"com.unity.entities": "0.1.1-preview",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.vscode": "1.1.0",
"com.unity.package-manager-ui": "2.2.0",
"com.unity.purchasing": "2.0.6",
"com.unity.render-pipelines.lightweight": "5.7.2",
"com.unity.render-pipelines.lightweight": "6.9.0",
"com.unity.rendering.hybrid": "0.0.1-preview.13",
"com.unity.timeline": "1.0.0",
"com.unity.test-framework": "1.0.13",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
Expand Down
15 changes: 12 additions & 3 deletions AngryDOTS/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 16
serializedVersion: 18
productGUID: aa9906f0ae94e49abb30233248b87233
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
Expand Down Expand Up @@ -52,8 +52,8 @@ PlayerSettings:
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1
iosUseCustomAppBackgroundBehavior: 0
iosAllowHTTPDownload: 1
allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1
Expand All @@ -65,6 +65,7 @@ PlayerSettings:
disableDepthAndStencilBuffers: 0
androidStartInFullscreen: 1
androidRenderOutsideSafeArea: 0
androidUseSwappy: 0
androidBlitType: 1
defaultIsNativeResolution: 1
macRetinaSupport: 1
Expand All @@ -79,6 +80,7 @@ PlayerSettings:
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1
resizableWindow: 0
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
Expand Down Expand Up @@ -148,6 +150,9 @@ PlayerSettings:
oculus:
sharedDepthBuffer: 0
dashSupport: 0
lowOverheadMode: 0
protectedContext: 0
v2Signing: 0
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
protectGraphicsMemory: 0
Expand Down Expand Up @@ -267,16 +272,18 @@ PlayerSettings:
height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
m_BuildTargetVRSettings: []
m_BuildTargetEnableVuforiaSettings: []
openGLRequireES31: 0
openGLRequireES31AEP: 0
openGLRequireES32: 0
vuforiaEnabled: 0
m_TemplateCustomTags: {}
mobileMTRendering:
Android: 1
Expand Down Expand Up @@ -494,6 +501,7 @@ PlayerSettings:
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
blurSplashScreenBackground: 1
spritePackerPolicy:
webGLMemorySize: 256
webGLExceptionSupport: 1
Expand Down Expand Up @@ -526,6 +534,7 @@ PlayerSettings:
26: UNITY_POST_PROCESSING_STACK_V2;PROBUILDER_FBX_PLUGIN_ENABLED
27: UNITY_POST_PROCESSING_STACK_V2;PROBUILDER_FBX_PLUGIN_ENABLED
28: UNITY_POST_PROCESSING_STACK_V2
29: UNITY_POST_PROCESSING_STACK_V2
platformArchitecture: {}
scriptingBackend: {}
il2cppCompilerConfiguration: {}
Expand Down
4 changes: 2 additions & 2 deletions AngryDOTS/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2019.1.0f2
m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)
m_EditorVersion: 2019.2.4f1
m_EditorVersionWithRevision: 2019.2.4f1 (c63b2af89a85)

0 comments on commit a6d688e

Please sign in to comment.