Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matts Patches for Character.cs and RedRunner.cs #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Assets/Animations/Characters/Blink.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Catch.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Fall 1.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Fall Next Jump.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Fall Next Run.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Fall during Run.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Fall.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Grounded 1.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Grounded.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Idle.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Jump during run (Grounded) .anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Jump during run .anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Jump.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Left & Right.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/New Run.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/RedRunner.controller
Binary file not shown.
Binary file modified Assets/Animations/Characters/Right Punch.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Roll in Jump.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Roll.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Run.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Sit down.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Slipanim.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Start Run.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Walk 1.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/Walk.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/block.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/fight 1.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/fight.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/guard.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/kick.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/left Punch.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/nim varo.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/poshtak.anim
Binary file not shown.
Binary file modified Assets/Animations/Characters/star.anim
Binary file not shown.
Binary file modified Assets/Animations/Chest Big Blue/Chest Big Blue.controller
Binary file not shown.
Binary file modified Assets/Animations/Chest Big Blue/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Chest Big/Chest Big.controller
Binary file not shown.
Binary file modified Assets/Animations/Chest Big/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Chest/Chest.controller
Binary file not shown.
Binary file modified Assets/Animations/Chest/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Coin/Coin.controller
Binary file not shown.
Binary file modified Assets/Animations/Coin/Collect.anim
Binary file not shown.
Binary file modified Assets/Animations/Coin/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/Loading/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/Loading/Loading Image.controller
Binary file not shown.
Binary file modified Assets/Animations/Loading/Loading Screen.controller
Binary file not shown.
Binary file modified Assets/Animations/Loading/Normal.anim
Binary file not shown.
Binary file modified Assets/Animations/Loading/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Mace/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/Mace/Mace.controller
Binary file not shown.
Binary file modified Assets/Animations/Mace/Smile.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/End Screen/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/End Screen/End Screen.controller
Binary file not shown.
Binary file modified Assets/Animations/Screens/End Screen/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/In-Game Screen/Close.anim
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Animations/Screens/In-Game Screen/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/Pause Screen/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/Pause Screen/Open.anim
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Animations/Screens/Start Screen/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/Start Screen/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/Screens/Start Screen/Start Screen.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Background/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Background/Open.anim
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Animations/UI/Buttons/Normal Button.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Buttons/Share Button.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Image/Coin Image.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Image/Collect.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Image/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Text/Coin Text.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Text/Collect.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Coin Text/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Score Text/Collect.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Score Text/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Score Text/Score Text.controller
Binary file not shown.
Binary file modified Assets/Animations/UI/Share Button/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Share Button/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Windows/Close.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Windows/Open.anim
Binary file not shown.
Binary file modified Assets/Animations/UI/Windows/Window.controller
Binary file not shown.
Binary file modified Assets/Animations/Water/Default.anim
Binary file not shown.
Binary file modified Assets/Animations/Water/image 1.controller
Binary file not shown.
Binary file modified Assets/AudioMixer.mixer
Binary file not shown.
Binary file modified Assets/Generation Settings.asset
Binary file not shown.
Binary file modified Assets/Materials/Blur.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 1 Far.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 1 Material.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 1 Very Far.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 2 Far.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 2 Material.mat
Binary file not shown.
Binary file modified Assets/Materials/Cloud 2 Very Far.mat
Binary file not shown.
Binary file modified Assets/Materials/Drop.mat
Binary file not shown.
Binary file modified Assets/Materials/Line Material.mat
Binary file not shown.
Binary file modified Assets/Materials/Mint Far Bottom.mat
Binary file not shown.
Binary file modified Assets/Materials/Mint Far Top.mat
Binary file not shown.
Binary file modified Assets/Materials/Mint Near Bottom.mat
Binary file not shown.
Binary file modified Assets/Materials/Mint White.mat
Binary file not shown.
Binary file modified Assets/Materials/Sky Material.mat
Binary file not shown.
Binary file modified Assets/Materials/Smoke.mat
Binary file not shown.
Binary file modified Assets/Materials/Sprites-Diffuse.mat
Binary file not shown.
Binary file modified Assets/Materials/Star.mat
Binary file not shown.
Binary file modified Assets/Materials/line 1.mat
Binary file not shown.
Binary file modified Assets/New Post-Processing Profile.asset
Binary file not shown.
Binary file modified Assets/Physics Materials 2D/Full Friction.physicsMaterial2D
Binary file not shown.
Binary file modified Assets/Physics Materials 2D/Grass.physicsMaterial2D
Binary file not shown.
Binary file modified Assets/Physics Materials 2D/Zero Friction.physicsMaterial2D
Binary file not shown.
Binary file modified Assets/Prefabs/Audio Manager.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_3.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Far_1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Far_2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Far_3.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Near_1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Near_2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Background Blocks/Block_Near_3.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_10.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_11.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_12.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_13.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_14.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_15.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_3.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_4.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_5.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_6.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_7.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_8.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Middle_9.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Blocks/Start.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/CameraMainAxis.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Collectables/Chest Big Blue.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Collectables/Chest Big.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Collectables/Chest.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Collectables/Coin Rigidbody2D.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Collectables/Coin.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Mace 256.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Mace.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Path.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw 512 With Circle.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw 512.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw Semicircular Left.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw Semicircular Right.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw with circle.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Saw.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Spike Up.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Enemies/Water.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Cave Dirt.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Column.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/Cave Dirt 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/Column 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/Dirt 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/DirtDown 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/DirtLeft 1.prefab
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/DirtRight 1.prefab
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/column_down 1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt With Physics/column_up 1.prefab
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Dirt.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/DirtDown.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/DirtLeft.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/DirtLeftCorner.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/DirtRight.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/DirtRightCorner.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Environment_0.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Environment_1.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/Grass.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassCliffLeft.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassCliffMid.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassCliffRight.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillLeft.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillLeft2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillLeft2_Down Shadow.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillRight.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillRight2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassHillRight2_Down Shadow.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillLeft.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillLeft2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillLeft2_Down Shadow.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillRight&Left.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillRight&Left2.prefab
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillRight.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillRight2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassJoinHillRight2_Down shadow.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassLeft.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassMid.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassRight.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/GrassSample_2.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/column_down.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/column_up.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/dirt hill left.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Grounds/dirt hill right.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Particles/Blood Particle System.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Particles/Mace Particle System.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/Particles/Water Particle System.prefab
Binary file not shown.
Binary file modified Assets/Prefabs/RedRunner.prefab
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Auto Save/Auto Save.unity
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Save Custom/Save Custom.unity
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Save Position/Save Position.unity
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Save Rotation/Save Rotation.unity
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Save Scale/Save Scale.unity
Binary file not shown.
Binary file modified Assets/SaveGameFree/Examples/Save Web/Save Web.unity
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Scenes/Creation.unity
Binary file not shown.
Binary file modified Assets/Scenes/Play.unity
Binary file not shown.
19 changes: 16 additions & 3 deletions Assets/Scripts/RedRunner/Characters/Character.cs
Original file line number Diff line number Diff line change
@@ -1,37 +1,50 @@
using System.Collections;
//Global Libraries
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

//Local Libraries
using RedRunner.Utilities;

namespace RedRunner.Characters
{

//Required Components
[RequireComponent ( typeof ( Rigidbody2D ) )]
[RequireComponent ( typeof ( Collider2D ) )]
[RequireComponent ( typeof ( Animator ) )]
[RequireComponent ( typeof ( Skeleton ) )]

//This Class consist of public getter functions that allow other scripts in RedRunner to access information about otherwise private RedCharacter variables.
public abstract class Character : MonoBehaviour
{

//Function for handling a death event
public delegate void DeadHandler ();

//What to do upon death
public virtual event DeadHandler OnDead;

//Returns Character Max Run Speed
public abstract float MaxRunSpeed { get; }

//Returns Character settling time
public abstract float RunSmoothTime { get; }

//Returns current speed
public abstract float RunSpeed { get; }

//Returns walking speed
public abstract float WalkSpeed { get; }

//Returns the strength constant associated with jumping
public abstract float JumpStrength { get; }

//Returns vector speed of Character
public abstract Vector2 Speed { get; }

//Returns current actions in string array
public abstract string[] Actions { get; }

//Retuns single string with current action
public abstract string CurrentAction { get; }

public abstract int CurrentActionIndex { get; }
Expand Down
33 changes: 5 additions & 28 deletions Assets/Scripts/RedRunner/Characters/RedCharacter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ void Update ()
}
}

//Updates all the Parameters for the RedCharacter
void LateUpdate ()
{
m_Animator.SetFloat ( "Speed", m_Speed.x );
Expand All @@ -357,34 +358,11 @@ void LateUpdate ()
}
}

// void OnCollisionEnter2D ( Collision2D collision2D )
// {
// bool isGround = collision2D.collider.CompareTag ( GroundCheck.GROUND_TAG );
// if ( isGround && !m_IsDead )
// {
// bool isBottom = false;
// for ( int i = 0; i < collision2D.contacts.Length; i++ )
// {
// if ( !isBottom )
// {
// isBottom = collision2D.contacts [ i ].normal.y == 1;
// }
// else
// {
// break;
// }
// }
// if ( isBottom )
// {
// m_JumpParticleSystem.Play ();
// }
// }
// }

#endregion

#region Private Methods

//Manipulates the Skeloton used in unity to close the eyes of the RedCharacter
IEnumerator CloseEye ()
{
m_ClosingEye = true;
Expand All @@ -411,6 +389,7 @@ IEnumerator CloseEye ()

#region Public Methods

//Makes footstep swounds if RedCharacter is contacting the ground
public virtual void PlayFootstepSound ()
{
if ( m_GroundCheck.IsGrounded )
Expand All @@ -419,15 +398,12 @@ public virtual void PlayFootstepSound ()
}
}

//Calculates and sets the velocity and position of the players movement
public override void Move ( float horizontalAxis )
{
if ( !IsDead.Value )
{
float speed = m_CurrentRunSpeed;
// if ( CrossPlatformInputManager.GetButton ( "Walk" ) )
// {
// speed = m_WalkSpeed;
// }
Vector2 velocity = m_Rigidbody2D.velocity;
velocity.x = speed * horizontalAxis;
m_Rigidbody2D.velocity = velocity;
Expand All @@ -446,6 +422,7 @@ public override void Move ( float horizontalAxis )
}
}


public override void Jump ()
{
if ( !IsDead.Value )
Expand Down
Binary file modified Assets/Sprites/RedRunner/Tiles Atlas.spriteatlas
Binary file not shown.
8 changes: 8 additions & 0 deletions Logs/Packages-Update.log
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@ The following packages were updated:
com.unity.analytics from version 2.0.16 to 3.2.2
com.unity.package-manager-ui from version 1.9.11 to 2.0.3
com.unity.textmeshpro from version 1.2.4 to 1.3.0

=== Thu Apr 4 12:19:52 2019

Packages were changed.
Update Mode: updateDependencies

The following packages were updated:
com.unity.package-manager-ui from version 2.0.3 to 2.0.7
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.0.3",
"com.unity.package-manager-ui": "2.0.7",
"com.unity.postprocessing": "2.1.3",
"com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.3.0",
Expand Down
Binary file modified ProjectSettings/AudioManager.asset
Binary file not shown.
Binary file modified ProjectSettings/ClusterInputManager.asset
Binary file not shown.
Binary file modified ProjectSettings/DynamicsManager.asset
Binary file not shown.
Binary file modified ProjectSettings/EditorBuildSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/EditorSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/GraphicsSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/InputManager.asset
Binary file not shown.
Binary file modified ProjectSettings/NavMeshAreas.asset
Binary file not shown.
Binary file modified ProjectSettings/Physics2DSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/PresetManager.asset
Binary file not shown.
Binary file modified ProjectSettings/ProjectSettings.asset
Binary file not shown.
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m_EditorVersion: 2018.3.5f1
m_EditorVersion: 2018.2.3f1
Binary file modified ProjectSettings/QualitySettings.asset
Binary file not shown.
Binary file modified ProjectSettings/TagManager.asset
Binary file not shown.
Binary file modified ProjectSettings/TimeManager.asset
Binary file not shown.
Binary file modified ProjectSettings/UnityConnectSettings.asset
Binary file not shown.