diff --git a/UnityClient/.vsconfig b/UnityClient/.vsconfig new file mode 100644 index 00000000..d70cd98b --- /dev/null +++ b/UnityClient/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs b/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs new file mode 100644 index 00000000..4664a8f3 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraFacingBillboard : MonoBehaviour +{ + private void Update() + { + Camera cam = Camera.main; + + if (cam != null) + { + transform.LookAt(transform.position + cam.transform.rotation * Vector3.forward, + cam.transform.rotation * Vector3.up); + } + else + { + Debug.LogError("Main camera is NULL!"); + } + } +} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs.meta b/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs.meta new file mode 100644 index 00000000..98f10be5 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/CameraFacingBillboard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f7a7237e682886489ec5a3bc280b1d6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs b/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs new file mode 100644 index 00000000..17dc9d37 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs @@ -0,0 +1,72 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + public int maxHealth = 1000; + public int currentHealth = 0; + + public bool isAlive = true; + public bool resetHealthOnDeath = true; + + public float healthResetDelay = 0.2f; + + [SerializeField] + private RectTransform healthFill; + + private Color defaultColor; + private Renderer renderer; + + public float GetHealthPercentage() + { + return (float)currentHealth / maxHealth; + } + + public void ResetHealth() + { + isAlive = true; + currentHealth = maxHealth; + } + + public void ResetColor() + { + renderer.material.color = defaultColor; + } + + public void ChangeColor(Color color, float resetDelay) + { + renderer.material.color = color; + Invoke("ResetColor", resetDelay); + } + + public void TakeDamage(int value) + { + if (currentHealth > 0) + { + currentHealth -= value; + healthFill.localScale = new Vector3(GetHealthPercentage(), 1f, 1f); + } + else + { + isAlive = false; + + if(resetHealthOnDeath) + Invoke("ResetHealth", healthResetDelay); + } + } + // Start is called before the first frame update + void Start() + { + renderer = GetComponent(); + defaultColor = renderer.material.color; + + ResetHealth(); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs.meta b/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs.meta new file mode 100644 index 00000000..d0382392 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/Enemy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 300dc5a76b0b673489200107f1ffa8ce +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/Feature-Sample.unity b/UnityClient/Assets/_DEV/Feature-Sample/Feature-Sample.unity index e9db8b93..4c332ffe 100644 --- a/UnityClient/Assets/_DEV/Feature-Sample/Feature-Sample.unity +++ b/UnityClient/Assets/_DEV/Feature-Sample/Feature-Sample.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,9 +118,95 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &58943679 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 109449766} + m_Modifications: + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.y + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.z + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.75299996 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3351705 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.81337404 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.w + value: -4.3297806e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.x + value: -4.32978e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Name + value: training-doll_3 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f94c02e7128f69145b612f43c5fc8678, type: 3} --- !u!1 &81280421 GameObject: m_ObjectHideFlags: 0 @@ -172,9 +258,9 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 + field of view: 63.5 + orthographic: 1 + orthographic size: 8 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -197,13 +283,279 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81280421} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.35228822, y: -0.4053666, z: 0.1364609, w: 0.83243585} + m_LocalPosition: {x: 29.57, y: 35.23, z: -19.93} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 44.199, y: -53.828, z: -4.674} +--- !u!1 &109449765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 109449766} + m_Layer: 0 + m_Name: training_dolls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &109449766 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 109449765} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.673, y: 1.2548295, z: 3.396626} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 653103232} + - {fileID: 727234608} + - {fileID: 1094919994} + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &275791755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 109449766} + m_Modifications: + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.y + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.z + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.77700007 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3351705 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.81337404 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.w + value: -4.3297806e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.x + value: -4.32978e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Name + value: training_doll_2 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f94c02e7128f69145b612f43c5fc8678, type: 3} +--- !u!1001 &298788568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalScale.x + value: 1.6661187 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalScale.y + value: 1.6661187 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalScale.z + value: 1.6661187 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.39 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.08 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.08 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + propertyPath: m_Name + value: erika_archer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 105c1798bf002834ca3ef409b5264b9c, type: 3} +--- !u!1 &504496086 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 105c1798bf002834ca3ef409b5264b9c, + type: 3} + m_PrefabInstance: {fileID: 298788568} + m_PrefabAsset: {fileID: 0} +--- !u!114 &504496087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504496086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d750453dc101154396938f78af77206, type: 3} + m_Name: + m_EditorClassIdentifier: + inFireMode: 0 + skillDamage: 100 + skillDuration: 4 + skillFireRate: 1.25 + skillAoeRadius: 3 + skillAoeHeight: 100 + skillAnimationDuration: 0.2 + skillAreaPrefab: {fileID: 3497271192373484708, guid: 6d43cf8cddb6e944a8ef36caf674a18d, + type: 3} + skillAreaMask: + serializedVersion: 2 + m_Bits: 8 + skillTargetMask: + serializedVersion: 2 + m_Bits: 64 + skillHitColor: {r: 1, g: 0.24056602, b: 0.24056602, a: 0.34901962} +--- !u!95 &504496088 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504496086} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e804199cba4ce0a4e8efc7389dfada00, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &653103232 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + m_PrefabInstance: {fileID: 8437759898821616262} + m_PrefabAsset: {fileID: 0} +--- !u!4 &727234608 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + m_PrefabInstance: {fileID: 275791755} + m_PrefabAsset: {fileID: 0} --- !u!1 &934858749 GameObject: m_ObjectHideFlags: 0 @@ -216,7 +568,7 @@ GameObject: - component: {fileID: 934858752} - component: {fileID: 934858751} - component: {fileID: 934858750} - m_Layer: 0 + m_Layer: 3 m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} @@ -252,10 +604,11 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 27077e9f748119848ac9637ac14db966, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -276,6 +629,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &934858752 MeshFilter: m_ObjectHideFlags: 0 @@ -293,10 +647,10 @@ Transform: m_GameObject: {fileID: 934858749} 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_LocalScale: {x: 2.0019, y: 2.0019, z: 2.0019} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088818261 GameObject: @@ -374,6 +728,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1088818263 @@ -388,5 +743,95 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &1094919994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + m_PrefabInstance: {fileID: 58943679} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8437759898821616262 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 109449766} + m_Modifications: + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.y + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalScale.z + value: 0.14802285 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3351705 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.0033740997 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.w + value: -4.3297806e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.x + value: -4.32978e-17 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8255740855880299802, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Name + value: training_doll_1 + objectReference: {fileID: 0} + - target: {fileID: 8780216339699396512, guid: f94c02e7128f69145b612f43c5fc8678, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f94c02e7128f69145b612f43c5fc8678, type: 3} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat b/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat new file mode 100644 index 00000000..bb143031 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat.meta b/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat.meta new file mode 100644 index 00000000..0191ac0c --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/New Material 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c64ed23335f92aa439045e32ecb00237 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat b/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat new file mode 100644 index 00000000..719775bb --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.764151, g: 0.58767176, b: 0.49381453, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat.meta b/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat.meta new file mode 100644 index 00000000..80f09ef5 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/New Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27077e9f748119848ac9637ac14db966 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller b/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller new file mode 100644 index 00000000..09e0a243 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller @@ -0,0 +1,220 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8812088173636214393 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BeginShoot + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4163509190300751260} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9509804 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-7459904111867534808 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Standing Aim Recoil + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6969992295452356531} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: caf810e4f30250f4da9345d68e07703f, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-5829339081849302196 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: EndShoot + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7459904111867534808} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7580645 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimation + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: BeginShoot + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: EndShoot + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8766332993788344441} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &4163509190300751260 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Standing Draw Arrow + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5829339081849302196} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: 56e6816834a71574a811b3820beb2b4f, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5767105861373970195 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Standing Idle 03 Examine + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8812088173636214393} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: 75cea127ebd60a2489bc87571a8708bc, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6969992295452356531 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5767105861373970195} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6428572 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &8766332993788344441 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5767105861373970195} + m_Position: {x: 310, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4163509190300751260} + m_Position: {x: 310, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7459904111867534808} + m_Position: {x: 570, y: 20, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5767105861373970195} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller.meta b/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller.meta new file mode 100644 index 00000000..5116f952 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/PlayerAnimation.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e804199cba4ce0a4e8efc7389dfada00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab b/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab new file mode 100644 index 00000000..854be54d --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3497271192373484708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6759694687800687060} + - component: {fileID: 7378763680619759597} + - component: {fileID: 547629608389894596} + m_Layer: 0 + m_Name: SkillArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6759694687800687060 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497271192373484708} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0.017168282, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7378763680619759597 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497271192373484708} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &547629608389894596 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497271192373484708} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 363816ecdfd8d724297d2f72c92d5b25, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab.meta b/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab.meta new file mode 100644 index 00000000..efff821c --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/SkillArea.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6d43cf8cddb6e944a8ef36caf674a18d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs b/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs new file mode 100644 index 00000000..c62430ae --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs @@ -0,0 +1,151 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SkillCaster : MonoBehaviour +{ + public bool inFireMode = false; + + public int skillDamage = 10; + public float skillDuration = 2.0f; + public float skillFireRate = 2.0f; + + public float skillAoeRadius = 3.0f; + public float skillAoeHeight = 100f; + public float skillAnimationDuration = 0.1f; + + public GameObject skillAreaPrefab; + + public LayerMask skillAreaMask; + public LayerMask skillTargetMask; + public Color skillHitColor; + + private GameObject skillArea; + private Color skillDefaultColor; + private Renderer skillRenderer; + + private Animator animator; + + + + private Vector3 GetTargetPosition() + { + RaycastHit _hit; + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out _hit, 1000, skillAreaMask)) + { + return _hit.point; + } + else + { + Debug.LogError("Mouse position doesn't intersect plane!"); + return transform.position + transform.forward * 6.0f; + } + } + + void StopShooting() + { + CancelInvoke("Shoot"); + } + + public void ResetColor() + { + skillRenderer.material.color = skillDefaultColor; + } + + public void ChangeColor(Color color, float resetDelay) + { + skillRenderer.material.color = color; + Invoke("ResetColor", resetDelay); + } + + void Shoot() + { + if (skillArea != null) + { + Vector3 _damageCenter = skillArea.transform.position; + _damageCenter.y = skillAoeHeight / 2; + + // use box to simulate height + Collider[] affectedEnemies = Physics.OverlapBox(_damageCenter, new Vector3(skillAoeRadius, skillAoeHeight / 2, skillAoeRadius), Quaternion.identity, skillTargetMask); + + foreach (Collider enemyCollider in affectedEnemies) + { + Enemy _enemy = enemyCollider.gameObject.GetComponent(); + + if (_enemy != null) + { + Vector3 _enemyPosition = _enemy.transform.position; + + // Project enemypos and damageCenter on the same plane + _enemyPosition.y = _damageCenter.y; + + if (Vector3.Distance(_enemyPosition, _damageCenter) <= skillAoeRadius) + { + _enemy.TakeDamage(skillDamage); + //_enemy.ChangeColor(Color.red, skillAnimationDuration); + } + } + } + + ChangeColor(skillHitColor, skillAnimationDuration); + } + } + + private void Start() + { + animator = GetComponent(); + } + + void Update() + { + if (Input.GetButtonDown("Fire1")) + { + if (!inFireMode) + { + inFireMode = true; + animator.SetTrigger("BeginShoot"); + + Vector3 _target = GetTargetPosition(); + transform.LookAt(_target); + + skillArea = Instantiate(skillAreaPrefab, _target, Quaternion.identity); + + skillRenderer = skillArea.GetComponent(); + skillDefaultColor = skillRenderer.material.color; + + float yScale = skillArea.transform.localScale.y; + skillArea.transform.localScale = new Vector3(skillAoeRadius * 2, yScale, skillAoeRadius * 2); + } + } + else if (Input.GetButtonUp("Fire1")) + { + inFireMode = false; + animator.SetTrigger("EndShoot"); + + if (skillArea != null) + { + if (skillFireRate > 0.0f) + { + InvokeRepeating("Shoot", 0.0f, 1f / skillFireRate); + Invoke("StopShooting", skillDuration); + } + + Destroy(skillArea, skillDuration); + } + } + + if (inFireMode) + { + if (skillArea != null) + { + Vector3 _target = GetTargetPosition(); + + skillArea.transform.position = _target; + transform.LookAt(_target); + } + + } + } +} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs.meta b/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs.meta new file mode 100644 index 00000000..d9c1634d --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/SkillCaster.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d750453dc101154396938f78af77206 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx new file mode 100644 index 00000000..4832da68 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:168a22a585441dce07213126b6dd6f48f192f67a6ef2944bee9b193eb44c8cfd +size 16128112 diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx.meta b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx.meta new file mode 100644 index 00000000..55c863aa --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: 105c1798bf002834ca3ef409b5264b9c +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: mixamo.com + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx new file mode 100644 index 00000000..bbcea6f9 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e9f908dadf66df9a7b54d81f0ad42f7359168afbb8ac6e7b0cafc441e6cdd42 +size 323376 diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx.meta b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx.meta new file mode 100644 index 00000000..3a31bd31 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Aim Recoil.fbx.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: caf810e4f30250f4da9345d68e07703f +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: Standing Aim Recoil + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Standing Aim Recoil + takeName: mixamo.com + internalID: 0 + firstFrame: 0 + lastFrame: 21 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx new file mode 100644 index 00000000..780903ac --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11bdea4f595be7336a0bf42170a044e5a431811717b2f58be448304b40776144 +size 357280 diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx.meta b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx.meta new file mode 100644 index 00000000..5699e866 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Draw Arrow.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: 56e6816834a71574a811b3820beb2b4f +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: mixamo.com + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx new file mode 100644 index 00000000..b8bffd85 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c06cdaa6bc228de0b2007ac85ef413b949f564721457a3b8ec3d54e24558428e +size 634688 diff --git a/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx.meta b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx.meta new file mode 100644 index 00000000..8a06e578 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/erika_archer_bow_arrow@Standing Idle 03 Examine.fbx.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: 75cea127ebd60a2489bc87571a8708bc +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: Standing Idle 03 Examine + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Standing Idle 03 Examine + takeName: mixamo.com + internalID: 0 + firstFrame: 0 + lastFrame: 153 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat b/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat new file mode 100644 index 00000000..c7585354 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: skill_area + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.09620416, g: 1, b: 0, a: 0.2901961} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat.meta b/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat.meta new file mode 100644 index 00000000..06b1e279 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/skill_area.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 363816ecdfd8d724297d2f72c92d5b25 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab b/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab new file mode 100644 index 00000000..87be73a3 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab @@ -0,0 +1,403 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &515602300880474090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2803493271085945809} + - component: {fileID: 8112197645301376160} + - component: {fileID: 6155904653118399437} + m_Layer: 5 + m_Name: HealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2803493271085945809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515602300880474090} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000089777} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8073228830905735054} + m_Father: {fileID: 2224565522578659708} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -1.3} + m_SizeDelta: {x: 89.71, y: 10.89} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8112197645301376160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515602300880474090} + m_CullTransparentMesh: 1 +--- !u!114 &6155904653118399437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515602300880474090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.50980395} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5363472810516241851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8073228830905735054} + - component: {fileID: 3303207484927802672} + - component: {fileID: 7550722582112226526} + m_Layer: 5 + m_Name: HealthBarFill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8073228830905735054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363472810516241851} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000211351} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2803493271085945809} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -44.855003, y: -0.000023007393} + m_SizeDelta: {x: 89.71, y: 10.89} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3303207484927802672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363472810516241851} + m_CullTransparentMesh: 1 +--- !u!114 &7550722582112226526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5363472810516241851} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.045136333, g: 1, b: 0, a: 0.8235294} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7293248624484871951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2224565522578659708} + - component: {fileID: 3103962632291062123} + - component: {fileID: 7676355957980130055} + - component: {fileID: 3212459585432813256} + - component: {fileID: 7318161034923300653} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2224565522578659708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7293248624484871951} + m_LocalRotation: {x: 4.32978e-17, y: -0.7071067, z: -0.7071068, w: -4.3297806e-17} + m_LocalPosition: {x: 0, y: 0, z: 7.16} + m_LocalScale: {x: 0.07967, y: 0.079670005, z: 0.079670005} + m_Children: + - {fileID: 2803493271085945809} + m_Father: {fileID: 8255740855880299802} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3103962632291062123 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7293248624484871951} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7676355957980130055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7293248624484871951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &3212459585432813256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7293248624484871951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &7318161034923300653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7293248624484871951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7a7237e682886489ec5a3bc280b1d6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &8437759898578703089 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalScale.x + value: 0.14802286 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalScale.y + value: 0.14802286 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalScale.z + value: 0.14802286 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalRotation.w + value: -4.3297806e-17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalRotation.x + value: -4.32978e-17 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c64ed23335f92aa439045e32ecb00237, type: 2} + - target: {fileID: 919132149155446097, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_Name + value: training-doll Variant + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 45ad71ceb31d13441b95706c27d059d9, type: 3} +--- !u!1 &8780216339699396512 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + m_PrefabInstance: {fileID: 8437759898578703089} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8255740855880299802 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 45ad71ceb31d13441b95706c27d059d9, + type: 3} + m_PrefabInstance: {fileID: 8437759898578703089} + m_PrefabAsset: {fileID: 0} +--- !u!65 &9006301802957135703 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8780216339699396512} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 8.345469, y: 4.382157, z: 13.924218} + m_Center: {x: -5.966536e-23, y: -0.022793783, z: -2.2643158} +--- !u!114 &8442242774567993577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8780216339699396512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 300dc5a76b0b673489200107f1ffa8ce, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 1000 + currentHealth: 0 + isAlive: 1 + resetHealthOnDeath: 1 + healthResetDelay: 0.2 + healthFill: {fileID: 8073228830905735054} diff --git a/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab.meta b/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab.meta new file mode 100644 index 00000000..8d14eba7 --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/training-doll Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f94c02e7128f69145b612f43c5fc8678 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx b/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx new file mode 100644 index 00000000..78ded0ba --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83a70199551f955b611173edcafecdbda89802047b0db1499adb4ab86249cbe2 +size 29852 diff --git a/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx.meta b/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx.meta new file mode 100644 index 00000000..546a11be --- /dev/null +++ b/UnityClient/Assets/_DEV/Feature-Sample/training-doll.fbx.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: 45ad71ceb31d13441b95706c27d059d9 +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Packages/manifest.json b/UnityClient/Packages/manifest.json index bbb2150a..1c3980be 100644 --- a/UnityClient/Packages/manifest.json +++ b/UnityClient/Packages/manifest.json @@ -1,11 +1,12 @@ { "dependencies": { - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.2", - "com.unity.test-framework": "1.1.18", - "com.unity.textmeshpro": "2.1.1", - "com.unity.timeline": "1.2.17", + "com.unity.collab-proxy": "1.15.1", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.4", + "com.unity.test-framework": "1.1.29", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/UnityClient/Packages/packages-lock.json b/UnityClient/Packages/packages-lock.json index 92686fda..342a22d8 100644 --- a/UnityClient/Packages/packages-lock.json +++ b/UnityClient/Packages/packages-lock.json @@ -1,21 +1,24 @@ { "dependencies": { "com.unity.collab-proxy": { - "version": "1.2.16", + "version": "1.15.1", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0", + "com.unity.services.core": "1.0.1" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -23,26 +26,51 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { - "version": "1.2.2", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.1.18", + "version": "1.1.29", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -51,10 +79,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.17", + "version": "1.4.8", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -199,6 +232,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/UnityClient/ProjectSettings/PackageManagerSettings.asset b/UnityClient/ProjectSettings/PackageManagerSettings.asset index e5c938b5..7658c792 100644 --- a/UnityClient/ProjectSettings/PackageManagerSettings.asset +++ b/UnityClient/ProjectSettings/PackageManagerSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b67e5b5e8b74f980d8cb2bcf4b51384843fd5d6b4e4037dda68c3262df587deb -size 881 +oid sha256:a7dabba589abe7fc2b45bd3d3fba3fe9be97043492703f716da2d9131c13a807 +size 1003 diff --git a/UnityClient/ProjectSettings/ProjectVersion.txt b/UnityClient/ProjectSettings/ProjectVersion.txt index 66132d0e..24993f71 100644 --- a/UnityClient/ProjectSettings/ProjectVersion.txt +++ b/UnityClient/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.13f1 -m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84) +m_EditorVersion: 2020.3.23f1 +m_EditorVersionWithRevision: 2020.3.23f1 (c5d91304a876) diff --git a/UnityClient/ProjectSettings/TagManager.asset b/UnityClient/ProjectSettings/TagManager.asset index 4b69f598..39df794b 100644 --- a/UnityClient/ProjectSettings/TagManager.asset +++ b/UnityClient/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e18b1c820e9c09e16bbd1f1b7842e9fb3b0158a0921b0964e0b8fa12c6e2c01 -size 378 +oid sha256:5806cbd2b8d61c9eeb24a71ce5ddd616e18ecf50a323620971f83c0bb1c7ade8 +size 394 diff --git a/UnityClient/ProjectSettings/VersionControlSettings.asset b/UnityClient/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000..6e1e4026 --- /dev/null +++ b/UnityClient/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7bda45bf7a394745fee1316e6c71fa676004d591ad1f3aa247fd3e4ceb86071 +size 188 diff --git a/UnityClient/UserSettings/EditorUserSettings.asset b/UnityClient/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000..e14372c0 --- /dev/null +++ b/UnityClient/UserSettings/EditorUserSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43c2d13fe53daf6e5597248cc9e357b4e1336a3e7fc2153e1c7dfdc57c1e375b +size 637