diff --git a/unity/Assets/Scenes/SampleScene.unity b/unity/Assets/Scenes/SampleScene.unity index 665869a..ddaf480 100644 --- a/unity/Assets/Scenes/SampleScene.unity +++ b/unity/Assets/Scenes/SampleScene.unity @@ -357,7 +357,7 @@ GameObject: - component: {fileID: 480143057} - component: {fileID: 480143059} - component: {fileID: 480143060} - m_Layer: 0 + m_Layer: 6 m_Name: Dragon_Red m_TagString: Untagged m_Icon: {fileID: 0} @@ -785,7 +785,7 @@ GameObject: - component: {fileID: 629347646} - component: {fileID: 629347645} - component: {fileID: 629347644} - m_Layer: 0 + m_Layer: 6 m_Name: Dragon_Green m_TagString: Untagged m_Icon: {fileID: 0} @@ -1453,7 +1453,7 @@ GameObject: - component: {fileID: 1208042748} - component: {fileID: 1208042747} - component: {fileID: 1208042746} - m_Layer: 0 + m_Layer: 6 m_Name: Dragon_Blue m_TagString: Untagged m_Icon: {fileID: 0} @@ -1631,7 +1631,7 @@ GameObject: - component: {fileID: 1588360794} - component: {fileID: 1588360793} - component: {fileID: 1588360792} - m_Layer: 0 + m_Layer: 6 m_Name: Dragon_Bronze m_TagString: Untagged m_Icon: {fileID: 0} @@ -1700,7 +1700,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 215fa8664178e8d409e5d9e40cc77cf2, type: 3} m_Name: m_EditorClassIdentifier: - FlapKey: 32 + FlapKey: 110 FlapForce: 3000 FlapLength: 0.1 _fireballPrefab: {fileID: 3013654646655086450, guid: a0ff208e909d8cd469c02ed1f8eda034, type: 3} diff --git a/unity/Assets/Scripts/DragonMovement.cs b/unity/Assets/Scripts/DragonMovement.cs index e6324d1..3a33b9d 100644 --- a/unity/Assets/Scripts/DragonMovement.cs +++ b/unity/Assets/Scripts/DragonMovement.cs @@ -44,11 +44,11 @@ public class DragonMovement : MonoBehaviour if (fireball.AttackType == AttackType.CONE) { - _stunTime = .6666f; + _stunTime = .4f; } else { - _stunTime = .3333f; + _stunTime = .2f; } _animator.Play("fall"); } diff --git a/unity/Assets/Scripts/Fireball.cs b/unity/Assets/Scripts/Fireball.cs index f109d21..b5acc19 100644 --- a/unity/Assets/Scripts/Fireball.cs +++ b/unity/Assets/Scripts/Fireball.cs @@ -1,3 +1,4 @@ + using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -5,7 +6,7 @@ using UnityEngine; public class Fireball : MonoBehaviour { DragonMovement.AttackType _attackType = DragonMovement.AttackType.FIREBALL; - + float _lifeSpan = 0f; public DragonMovement.AttackType AttackType { get => _attackType; set => _attackType = value; } // Start is called before the first frame update @@ -17,6 +18,7 @@ public class Fireball : MonoBehaviour // Update is called once per frame void Update() { + _lifeSpan += Time.deltaTime; float speed = 1000f; //fireball if (_attackType == DragonMovement.AttackType.CONE) { @@ -32,7 +34,7 @@ public class Fireball : MonoBehaviour transform.position = new Vector3(transform.position.x + speed * Time.deltaTime, transform.position.y, transform.position.z); - if (transform.position.x > 2110f) + if (_lifeSpan >= 0.8f) { GameObject.Destroy(this.gameObject); } diff --git a/unity/ProjectSettings/DynamicsManager.asset b/unity/ProjectSettings/DynamicsManager.asset index fc90ab9..77eaa25 100644 --- a/unity/ProjectSettings/DynamicsManager.asset +++ b/unity/ProjectSettings/DynamicsManager.asset @@ -7,6 +7,7 @@ PhysicsManager: m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -17,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/unity/ProjectSettings/SceneTemplateSettings.json b/unity/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/unity/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/unity/ProjectSettings/TagManager.asset b/unity/ProjectSettings/TagManager.asset index 005ff86..fba58f8 100644 --- a/unity/ProjectSettings/TagManager.asset +++ b/unity/ProjectSettings/TagManager.asset @@ -12,7 +12,7 @@ TagManager: - - Water - UI - - + - Dragon - - -