diff --git a/Assets/Prefabs/Towers/BaseTower.prefab b/Assets/Prefabs/Towers/BaseTower.prefab index 839639c..c45ea00 100644 --- a/Assets/Prefabs/Towers/BaseTower.prefab +++ b/Assets/Prefabs/Towers/BaseTower.prefab @@ -246,7 +246,7 @@ LineRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -344,6 +344,7 @@ MonoBehaviour: visualRadius: 1 knob: {fileID: 5325871420816673616} knobSensitiviy: 1 + moveKnobAxisName: Mouse X rotationMinMax: {x: -30, y: 30} --- !u!1 &5036551877689028418 GameObject: @@ -519,7 +520,7 @@ LineRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -617,6 +618,7 @@ MonoBehaviour: visualRadius: 1 knob: {fileID: 6589470144374164838} knobSensitiviy: 1 + moveKnobAxisName: Mouse X rotationMinMax: {x: -30, y: 30} --- !u!1 &8464444921411020014 GameObject: diff --git a/Assets/Prefabs/Towers/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index 8952275..2175959 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -13,6 +13,41 @@ PrefabInstance: propertyPath: m_Positions.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.r + value: 0.30863357 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key1.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key1.r + value: 0.30980393 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.m_ColorSpace + value: 0 + objectReference: {fileID: 0} - target: {fileID: 639897978325975064, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].value @@ -36,7 +71,7 @@ PrefabInstance: - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.12817177 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} @@ -46,27 +81,27 @@ PrefabInstance: - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.34760666 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.5129842 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.858398 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} @@ -76,7 +111,7 @@ PrefabInstance: - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 118.274 objectReference: {fileID: 0} - target: {fileID: 7523567070824087546, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} @@ -93,6 +128,46 @@ PrefabInstance: propertyPath: m_Positions.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key0.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key1.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key1.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.key1.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, + type: 3} + propertyPath: m_Parameters.colorGradient.m_ColorSpace + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8501533562697966838, guid: c309e2ab8a7e17f049cee02d2d5e1af3, type: 3} propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].value diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index 6730563..33c3cae 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -440,16 +440,6 @@ PrefabInstance: propertyPath: m_Name value: Turret objectReference: {fileID: 0} - - target: {fileID: 841175348891104259, guid: 9415cb10a1bd579269301ca4f61a1554, - type: 3} - propertyPath: verticalRotationMinMax.x - value: -38.2 - objectReference: {fileID: 0} - - target: {fileID: 841175348891104259, guid: 9415cb10a1bd579269301ca4f61a1554, - type: 3} - propertyPath: horizontalRotationMinMax.x - value: -35.7 - objectReference: {fileID: 0} - target: {fileID: 6499929602381336473, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} propertyPath: m_LocalPosition.x