diff --git a/Assets/3rdParty/ArcherSkeleton/prefab.meta b/Assets/3rdParty/ArcherSkeleton/prefab.meta new file mode 100644 index 0000000..42ddf7e --- /dev/null +++ b/Assets/3rdParty/ArcherSkeleton/prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 456228f09d87f2c4a9df7b9ef04226bc +folderAsset: yes +timeCreated: 1477752003 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rdParty/DemonImp/prefab.meta b/Assets/3rdParty/DemonImp/prefab.meta new file mode 100644 index 0000000..638eafb --- /dev/null +++ b/Assets/3rdParty/DemonImp/prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f69e4ae1ab31a7b429d8d29157ff18a8 +folderAsset: yes +timeCreated: 1477757782 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CameraController.cs b/Assets/CameraController.cs index 487065b..c59ec74 100644 --- a/Assets/CameraController.cs +++ b/Assets/CameraController.cs @@ -9,11 +9,14 @@ public class CameraController : MonoBehaviour { // Use this for initialization void Start () { + Vector3 a = new Vector3 (1, 0, 0); offset = transform.position - target.transform.position; + offset = offset + a; } // Update is called once per frame void LateUpdate () { - transform.position = target.transform.position + offset; + transform.position = Vector3.Lerp (transform.position, target.transform.position + offset, 5.0f * Time.deltaTime); + //transform.position = target.transform.position + offset; } } diff --git a/Assets/FloorCreator/Delimiter.prefab b/Assets/FloorCreator/Delimiter.prefab new file mode 100644 index 0000000..f9404cd --- /dev/null +++ b/Assets/FloorCreator/Delimiter.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1000012343782000} + m_IsPrefabParent: 1 +--- !u!1 &1000012343782000 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 4000012172142376} + - 33: {fileID: 33000013124551750} + - 23: {fileID: 23000010768009918} + m_Layer: 0 + m_Name: Delimiter + m_TagString: Delimiter + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000012172142376 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012343782000} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5133898, y: 1.2, z: 3} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!23 &23000010768009918 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012343782000} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2ce1ad742aae3554997292eed468d59f, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!33 &33000013124551750 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012343782000} + m_Mesh: {fileID: 4300000, guid: 6022821a30f1a3c44a65bbe690dff0db, type: 3} diff --git a/Assets/FloorCreator/Delimiter.prefab.meta b/Assets/FloorCreator/Delimiter.prefab.meta new file mode 100644 index 0000000..d9765b7 --- /dev/null +++ b/Assets/FloorCreator/Delimiter.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77731505be18bad49b0ff7c25a2fdea3 +timeCreated: 1478090577 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/Father.prefab b/Assets/FloorCreator/Father.prefab index bc51618..8177934 100644 --- a/Assets/FloorCreator/Father.prefab +++ b/Assets/FloorCreator/Father.prefab @@ -20,8 +20,6 @@ GameObject: m_Component: - 4: {fileID: 4000011579287534} - 33: {fileID: 33000010716199292} - - 65: {fileID: 65000012841509122} - - 23: {fileID: 23000013877990604} m_Layer: 0 m_Name: Father m_TagString: Untagged @@ -42,35 +40,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!23 &23000013877990604 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000011495271182} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 --- !u!33 &33000010716199292 MeshFilter: m_ObjectHideFlags: 1 @@ -78,15 +47,3 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011495271182} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65000012841509122 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000011495271182} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/FloorCreator/FloorCreator.prefab b/Assets/FloorCreator/FloorCreator.prefab index 599ae77..efe2b34 100644 --- a/Assets/FloorCreator/FloorCreator.prefab +++ b/Assets/FloorCreator/FloorCreator.prefab @@ -51,13 +51,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2f46523907ab5e348b0cd6200ec9e6ee, type: 3} m_Name: m_EditorClassIdentifier: - basic_floor: {fileID: 1000011495271182, guid: 884954c970b51ca4d9c3f5b47d59a2c5, + basic_floor: {fileID: 1000011495271182, guid: a6d57f8cc0baf3545873654c3ae25492, type: 2} basic_floor_father: {fileID: 1000011495271182, guid: 76fffd23e9027e347bad342ef89456f9, type: 2} - nhabitable_floor: {fileID: 1000013422381662, guid: dd4679e61b0d25848aa2088bfeaa13e0, + nhabitable_floor: {fileID: 1000013422381662, guid: f3b3de213fb3e0a4d9040dc4745e6303, type: 2} light_form: {fileID: 1000010428274642, guid: 3ef491365c1c7de4b9eacacd54de259f, type: 2} + delimiter: {fileID: 1000012343782000, guid: 77731505be18bad49b0ff7c25a2fdea3, type: 2} texture_floor: - {fileID: 2800000, guid: 3377fca7e6042b64f99e0a68b4db477b, type: 3} - {fileID: 2800000, guid: 14f79ddfb22057946a2c291df17dd8b8, type: 3} diff --git a/Assets/FloorCreator/FloorCreator.prefab.meta b/Assets/FloorCreator/FloorCreator.prefab.meta index aead105..5bca116 100644 --- a/Assets/FloorCreator/FloorCreator.prefab.meta +++ b/Assets/FloorCreator/FloorCreator.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fe758e4b61ec0d4dbdd8b92521a6628 +guid: bd3068e9944aae447a20ec5f0a4784be timeCreated: 1477758385 licenseType: Free NativeFormatImporter: diff --git a/Assets/FloorCreator/MapCreation.cs b/Assets/FloorCreator/MapCreation.cs index dd3b139..1b5e153 100644 --- a/Assets/FloorCreator/MapCreation.cs +++ b/Assets/FloorCreator/MapCreation.cs @@ -1,5 +1,8 @@ using UnityEngine; using System.Collections; +using System.Collections.Generic; + + /** * Este generador de mapas solo funciona para rectangulos uniformes. * @@ -20,6 +23,8 @@ public class MapCreation : MonoBehaviour { public GameObject basic_floor_father; //Ancla para los suelos public GameObject nhabitable_floor; //Objecto de zona no habitable public GameObject light_form; + public GameObject delimiter; + private GameObject[] delimiter_objects; public Texture2D[] texture_floor; //Vector con las texturas del suelo public Texture2D[] texture_wall; //Vector con las texturas de las paredes @@ -36,7 +41,7 @@ public class MapCreation : MonoBehaviour { for(int i = 0; i < vs; i++){ for(int j = 0; j < hs; j++){ pos = matrix [i, j]; - if (0 <= pos && pos < 5){ + if (0 < pos && pos < 5){ basic_floor_instance = Instantiate (basic_floor, new Vector3 (i, -0.5f, j), Quaternion.identity) as GameObject; basic_floor_instance.GetComponent().material.mainTexture = texture_floor [pos]; } @@ -65,4 +70,93 @@ public class MapCreation : MonoBehaviour { vs = x; hs = z; lf = light; li = light_intensity; lc = light_color; } + public void removeZone(){ + delimiter_objects = GameObject.FindGameObjectsWithTag ("Delimiter"); + foreach (GameObject g in delimiter_objects) { + g.GetComponent ().Die (); + } + } + public void markZone(int x, int z, int area, Color color){ + /** + * SE TIENE QUE MEJORAR, PERO YA, DEL ROLLO, INMEDIATLY + * */ + if (area > 1) { + markPeak (x + area, z, 0); + markPeak (x - area, z, 2); + markPeak (x, z + area, 1); + markPeak (x, z - area, 3); + for (int i = 1; i < area; i++) + markEdge (x + area - i, z + i,0); + for (int i = 1; i < area; i++) + markEdge (x - area + i, z + i,1); + for (int i = 1; i < area; i++) + markEdge (x + area - i, z - i,3); + for (int i = 1; i < area; i++) + markEdge (x - area + i, z - i,2); + } + } + //norte = 0, este = 1, sur = 2, oeste = 3 + private void markPeak(int x, int z, int cardinal){ + GameObject t; + if (cardinal == 0) { + t = Instantiate (delimiter, new Vector3 (x + 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z + 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z - 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + else if (cardinal == 1) { + t = Instantiate (delimiter, new Vector3 (x, 0, z + 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + t = Instantiate (delimiter, new Vector3 (x + 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x - 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + } + else if (cardinal == 2) { + t = Instantiate (delimiter, new Vector3 (x - 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z + 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z - 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + else if (cardinal == 3) { + t = Instantiate (delimiter, new Vector3 (x, 0, z - 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + t = Instantiate (delimiter, new Vector3 (x + 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x - 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + } + } + //noreste = 0, sureste = 1, suroeste = 2, noroeste = 3 + private void markEdge(int x, int z, int cardinal){ + GameObject t; + if (cardinal == 0) { + t = Instantiate (delimiter, new Vector3 (x + 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z + 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + else if (cardinal == 1) { + t = Instantiate (delimiter, new Vector3 (x - 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z + 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + else if (cardinal == 2) { + t = Instantiate (delimiter, new Vector3 (x - 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z - 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + else if (cardinal == 3) { + t = Instantiate (delimiter, new Vector3 (x + 0.5f, 0, z), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 0, 0); + t = Instantiate (delimiter, new Vector3 (x, 0, z - 0.5f), Quaternion.identity) as GameObject; + t.transform.Rotate (-90, 90, 0); + } + } } \ No newline at end of file diff --git a/Assets/FloorCreator/MapCreation.cs.meta b/Assets/FloorCreator/MapCreation.cs.meta index 91357aa..098ddae 100644 --- a/Assets/FloorCreator/MapCreation.cs.meta +++ b/Assets/FloorCreator/MapCreation.cs.meta @@ -1,14 +1,10 @@ fileFormatVersion: 2 guid: 2f46523907ab5e348b0cd6200ec9e6ee -timeCreated: 1477840263 +timeCreated: 1477768066 licenseType: Free MonoImporter: serializedVersion: 2 - defaultReferences: - - basic_floor: {instanceID: 0} - - basic_floor_father: {instanceID: 0} - - nhabitable_floor: {instanceID: 0} - - light_form: {instanceID: 0} + defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/FloorCreator/Remove.cs b/Assets/FloorCreator/Remove.cs new file mode 100644 index 0000000..da744b0 --- /dev/null +++ b/Assets/FloorCreator/Remove.cs @@ -0,0 +1,9 @@ +using UnityEngine; +using System.Collections; + +public class Remove : MonoBehaviour { + + public void Die(){ + Destroy (gameObject); + } +} diff --git a/Assets/FloorCreator/Remove.cs.meta b/Assets/FloorCreator/Remove.cs.meta new file mode 100644 index 0000000..5c60f6d --- /dev/null +++ b/Assets/FloorCreator/Remove.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7179722db9a0ba343b8be033da09241e +timeCreated: 1478086256 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/TestController.cs b/Assets/FloorCreator/TestController.cs index 511e2a4..1deedec 100644 --- a/Assets/FloorCreator/TestController.cs +++ b/Assets/FloorCreator/TestController.cs @@ -3,23 +3,28 @@ using System.Collections; public class TestController : MonoBehaviour { public GameObject generator; + public GameObject audiocontroler; // Use this for initialization void Start () { int[,] matrix = new int[,]{ - {3,3,3,3,3,3}, - {3,1,1,1,1,3}, - {3,1,2,2,1,3}, - {4,1,2,2,1,4}, - {5,1,1,1,1,5}, - {0,6,0,6,0,6}}; + {0,6,0,6,0,6,1}, + {5,1,1,1,1,5,1}, + {3,1,2,2,1,3,1}, + {4,1,2,2,1,4,1}, + {3,1,1,1,1,3,1}, + {3,3,3,3,3,3,1}, + {3,3,3,3,3,3,1}, + {3,1,1,1,1,3,1}, + {3,1,2,2,1,3,1}, + {4,1,2,2,1,4,1}, + {5,1,1,1,1,5,1}, + {0,6,0,6,0,6,1}}; GameObject to = Instantiate (generator); Vector3 horientacion = new Vector3 (45, -45, 0); - to.GetComponent ().setMatrix (matrix,6,6,horientacion,0.8f,Color.red); - } - - // Update is called once per frame - void Update () { - + to.GetComponent ().setMatrix (matrix,12,7,horientacion,0.8f,Color.white/1.2f); + to.GetComponent ().markZone (3, 4, 2, Color.black); + //to = Instantiate (audiocontroler); + //to.GetComponent ().setAudioManager ("background.wav","Assets/AudioManager/Sounds"); } } diff --git a/Assets/FloorCreator/TestController.prefab b/Assets/FloorCreator/TestController.prefab index 0b62a18..424deba 100644 --- a/Assets/FloorCreator/TestController.prefab +++ b/Assets/FloorCreator/TestController.prefab @@ -19,7 +19,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000012531146598} - - 114: {fileID: 114000012175193480} + - 114: {fileID: 114000011640719896} m_Layer: 0 m_Name: TestController m_TagString: Untagged @@ -40,7 +40,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!114 &114000012175193480 +--- !u!114 &114000011640719896 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -48,7 +48,9 @@ MonoBehaviour: m_GameObject: {fileID: 1000012651964030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e35c066fc067b904e9dacd1a3a71938d, type: 3} + m_Script: {fileID: 11500000, guid: b49506e118e61124ab82513ea6128fd2, type: 3} m_Name: m_EditorClassIdentifier: generator: {fileID: 1000013182272914, guid: bd3068e9944aae447a20ec5f0a4784be, type: 2} + audiocontroler: {fileID: 1000013955497836, guid: b642fc53397026446a90e99bcfcffe87, + type: 2} diff --git a/Assets/FloorCreator/VolumeLight.meta b/Assets/FloorCreator/VolumeLight.meta new file mode 100644 index 0000000..4053c65 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5a11bb5706be3094cb2ff16980a7f1ca +folderAsset: yes +timeCreated: 1478089479 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Materials.meta b/Assets/FloorCreator/VolumeLight/Materials.meta new file mode 100644 index 0000000..c2c3c86 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d5e58ce5b4f599c40affa7022b760121 +folderAsset: yes +timeCreated: 1478089480 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Materials/Glow.mat b/Assets/FloorCreator/VolumeLight/Materials/Glow.mat new file mode 100644 index 0000000..7d34a0d --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/Glow.mat @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Glow + m_Shader: {fileID: 4800000, guid: 80979ccfe64a90c49b9fd932c1acb075, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 2800000, guid: 2561b5b6d6e031d43bdb331d6b38c5ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _FallOff + second: + m_Texture: {fileID: 8900000, guid: 6c11c6ccbb93b4147b3ada5d2bd70f18, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 4b522db782223404094aced960740d95, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: -0} + - first: + name: _Mask + second: + m_Texture: {fileID: 2800000, guid: defa5ad709775b64285f14a542b75920, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _Noise + second: + m_Texture: {fileID: 2800000, guid: 23a02ac18d11c9ffa0009c58a8ad6659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RampTex + second: + m_Texture: {fileID: 2800000, guid: e146959306087aa4da2ce68867968f7c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectionTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RefractTex + second: + m_Texture: {fileID: 2800000, guid: 4d41f735e4e2ea44e914666ea6674b70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ShoreTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpAmt + second: 10 + - first: + name: _Cutoff + second: 0.29074627 + - first: + name: _FadeDistance + second: 67.86 + - first: + name: _FresnelScale + second: 0.75 + - first: + name: _GerstnerIntensity + second: 1 + - first: + name: _Glossiness + second: 0.4300518 + - first: + name: _InvFade + second: 1 + - first: + name: _Outline + second: 0.006153846 + - first: + name: _Parallax + second: 0.02 + - first: + name: _RefractTexTiling + second: 0.98 + - first: + name: _RimPower + second: 1.5779213 + - first: + name: _Shininess + second: 0.5242087 + m_Colors: + - first: + name: _AnimationDirection + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _AnimationTiling + second: {r: 2.2, g: 2.2, b: -1.1, a: -1.1} + - first: + name: _BaseColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _BumpDirection + second: {r: 1, g: 1, b: -1, a: 1} + - first: + name: _BumpTiling + second: {r: 1, g: 1, b: -2, a: 3} + - first: + name: _Color + second: {r: 1, g: 0.59999996, b: 0, a: 0.85882354} + - first: + name: _DiffuseColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _DistortParams + second: {r: 1, g: 1, b: 2, a: 1.15} + - first: + name: _EmisColor + second: {r: 0.2, g: 0.2, b: 0.2, a: 0} + - first: + name: _Emission + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _Foam + second: {r: 0.1, g: 0.375, b: 0, a: 0} + - first: + name: _GAmplitude + second: {r: 0.3, g: 0.35, b: 0.25, a: 0.25} + - first: + name: _GDirectionAB + second: {r: 0.3, g: 0.85, b: 0.85, a: 0.25} + - first: + name: _GDirectionCD + second: {r: 0.1, g: 0.9, b: 0.5, a: 0.5} + - first: + name: _GFrequency + second: {r: 1.3, g: 1.35, b: 1.25, a: 1.25} + - first: + name: _GSpeed + second: {r: 1.2, g: 1.375, b: 1.1, a: 1.5} + - first: + name: _GSteepness + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _GlowColor + second: {r: 0.59440565, g: 0, b: 1, a: 1} + - first: + name: _InvFadeParemeter + second: {r: 0.15, g: 0.15, b: 0.5, a: 1} + - first: + name: _OutlineColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _ReflectionColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _RimColor + second: {r: 0, g: 0.1188812, b: 1, a: 1} + - first: + name: _SpecColor + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _SpecularColor + second: {r: 0.3006994, g: 1, b: 0, a: 1} + - first: + name: _SpeedStrength + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _TintColor + second: {r: 0, g: 0.32867146, b: 1, a: 0.9843137} + - first: + name: _WorldLightDir + second: {r: 0, g: 0.1, b: -0.5, a: 0} + - first: + name: _params + second: {r: 0.2, g: 0.9, b: 0.5, a: 0.9} + - first: + name: _sunpos + second: {r: 0.5, g: 0.5, b: 0, a: 0} diff --git a/Assets/FloorCreator/VolumeLight/Materials/Glow.mat.meta b/Assets/FloorCreator/VolumeLight/Materials/Glow.mat.meta new file mode 100644 index 0000000..f99b66d --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/Glow.mat.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: bcbd6ecb98d148b4aaa11ed58a4e236f +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Materials/Jet.mat b/Assets/FloorCreator/VolumeLight/Materials/Jet.mat new file mode 100644 index 0000000..b85dcb8 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/Jet.mat @@ -0,0 +1,214 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Jet + m_Shader: {fileID: 4800000, guid: 80979ccfe64a90c49b9fd932c1acb075, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 2800000, guid: 2561b5b6d6e031d43bdb331d6b38c5ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _FallOff + second: + m_Texture: {fileID: 8900000, guid: 6c11c6ccbb93b4147b3ada5d2bd70f18, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: baa8f45b15940ae4aa17522af01bd8a9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: -0} + - first: + name: _MainTex2 + second: + m_Texture: {fileID: 2800000, guid: 4b522db782223404094aced960740d95, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _Mask + second: + m_Texture: {fileID: 2800000, guid: c2a9ef63c14f0484fb69a1cfef470eed, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _Noise + second: + m_Texture: {fileID: 2800000, guid: 23a02ac18d11c9ffa0009c58a8ad6659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RampTex + second: + m_Texture: {fileID: 2800000, guid: e146959306087aa4da2ce68867968f7c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectionTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RefractTex + second: + m_Texture: {fileID: 2800000, guid: 4d41f735e4e2ea44e914666ea6674b70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ShoreTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpAmt + second: 10 + - first: + name: _Cutoff + second: 0.01 + - first: + name: _FadeDistance + second: 67.86 + - first: + name: _FresnelScale + second: 0.75 + - first: + name: _GerstnerIntensity + second: 1 + - first: + name: _Glossiness + second: 0.4300518 + - first: + name: _InvFade + second: 1 + - first: + name: _Outline + second: 0.006153846 + - first: + name: _Parallax + second: 0.02 + - first: + name: _RefractTexTiling + second: 0.98 + - first: + name: _RimPower + second: 1.5779213 + - first: + name: _Shininess + second: 0.5242087 + m_Colors: + - first: + name: _AnimationDirection + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _AnimationTiling + second: {r: 2.2, g: 2.2, b: -1.1, a: -1.1} + - first: + name: _BaseColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _BumpDirection + second: {r: 1, g: 1, b: -1, a: 1} + - first: + name: _BumpTiling + second: {r: 1, g: 1, b: -2, a: 3} + - first: + name: _Color + second: {r: 0, g: 0.8741257, b: 1, a: 0.7254902} + - first: + name: _DiffuseColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _DistortParams + second: {r: 1, g: 1, b: 2, a: 1.15} + - first: + name: _EmisColor + second: {r: 0.2, g: 0.2, b: 0.2, a: 0} + - first: + name: _Emission + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _Foam + second: {r: 0.1, g: 0.375, b: 0, a: 0} + - first: + name: _GAmplitude + second: {r: 0.3, g: 0.35, b: 0.25, a: 0.25} + - first: + name: _GDirectionAB + second: {r: 0.3, g: 0.85, b: 0.85, a: 0.25} + - first: + name: _GDirectionCD + second: {r: 0.1, g: 0.9, b: 0.5, a: 0.5} + - first: + name: _GFrequency + second: {r: 1.3, g: 1.35, b: 1.25, a: 1.25} + - first: + name: _GSpeed + second: {r: 1.2, g: 1.375, b: 1.1, a: 1.5} + - first: + name: _GSteepness + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _GlowColor + second: {r: 0.59440565, g: 0, b: 1, a: 1} + - first: + name: _InvFadeParemeter + second: {r: 0.15, g: 0.15, b: 0.5, a: 1} + - first: + name: _OutlineColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _ReflectionColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _RimColor + second: {r: 0, g: 0.1188812, b: 1, a: 1} + - first: + name: _SpecColor + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _SpecularColor + second: {r: 0.3006994, g: 1, b: 0, a: 1} + - first: + name: _SpeedStrength + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _TintColor + second: {r: 0, g: 0.32867146, b: 1, a: 0.9843137} + - first: + name: _WorldLightDir + second: {r: 0, g: 0.1, b: -0.5, a: 0} + - first: + name: _params + second: {r: 0.2, g: 0.9, b: 0.5, a: 0.9} + - first: + name: _sunpos + second: {r: 0.5, g: 0.5, b: 0, a: 0} diff --git a/Assets/FloorCreator/VolumeLight/Materials/Jet.mat.meta b/Assets/FloorCreator/VolumeLight/Materials/Jet.mat.meta new file mode 100644 index 0000000..ad9638a --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/Jet.mat.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 2ce1ad742aae3554997292eed468d59f +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat b/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat new file mode 100644 index 0000000..b33b86b --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SunLight + m_Shader: {fileID: 4800000, guid: 80979ccfe64a90c49b9fd932c1acb075, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 2800000, guid: 2561b5b6d6e031d43bdb331d6b38c5ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _FallOff + second: + m_Texture: {fileID: 8900000, guid: 6c11c6ccbb93b4147b3ada5d2bd70f18, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 4b522db782223404094aced960740d95, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: -0, y: 0} + - first: + name: _Mask + second: + m_Texture: {fileID: 2800000, guid: a97b98ea677a1f34ca3380b8277a23ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _Noise + second: + m_Texture: {fileID: 2800000, guid: 23a02ac18d11c9ffa0009c58a8ad6659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RampTex + second: + m_Texture: {fileID: 2800000, guid: e146959306087aa4da2ce68867968f7c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ReflectionTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _RefractTex + second: + m_Texture: {fileID: 2800000, guid: 4d41f735e4e2ea44e914666ea6674b70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ShoreTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpAmt + second: 10 + - first: + name: _Cutoff + second: 0.14298509 + - first: + name: _FadeDistance + second: 67.86 + - first: + name: _FresnelScale + second: 0.75 + - first: + name: _GerstnerIntensity + second: 1 + - first: + name: _Glossiness + second: 0.4300518 + - first: + name: _InvFade + second: 1 + - first: + name: _Outline + second: 0.006153846 + - first: + name: _Parallax + second: 0.02 + - first: + name: _RefractTexTiling + second: 0.98 + - first: + name: _RimPower + second: 1.5779213 + - first: + name: _Shininess + second: 0.5242087 + m_Colors: + - first: + name: _AnimationDirection + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _AnimationTiling + second: {r: 2.2, g: 2.2, b: -1.1, a: -1.1} + - first: + name: _BaseColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _BumpDirection + second: {r: 1, g: 1, b: -1, a: 1} + - first: + name: _BumpTiling + second: {r: 1, g: 1, b: -2, a: 3} + - first: + name: _Color + second: {r: 0.846154, g: 1, b: 0, a: 0.54509807} + - first: + name: _DiffuseColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _DistortParams + second: {r: 1, g: 1, b: 2, a: 1.15} + - first: + name: _EmisColor + second: {r: 0.2, g: 0.2, b: 0.2, a: 0} + - first: + name: _Emission + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _Foam + second: {r: 0.1, g: 0.375, b: 0, a: 0} + - first: + name: _GAmplitude + second: {r: 0.3, g: 0.35, b: 0.25, a: 0.25} + - first: + name: _GDirectionAB + second: {r: 0.3, g: 0.85, b: 0.85, a: 0.25} + - first: + name: _GDirectionCD + second: {r: 0.1, g: 0.9, b: 0.5, a: 0.5} + - first: + name: _GFrequency + second: {r: 1.3, g: 1.35, b: 1.25, a: 1.25} + - first: + name: _GSpeed + second: {r: 1.2, g: 1.375, b: 1.1, a: 1.5} + - first: + name: _GSteepness + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _GlowColor + second: {r: 0.59440565, g: 0, b: 1, a: 1} + - first: + name: _InvFadeParemeter + second: {r: 0.15, g: 0.15, b: 0.5, a: 1} + - first: + name: _OutlineColor + second: {r: 1, g: 0, b: 0, a: 1} + - first: + name: _ReflectionColor + second: {r: 0.54, g: 0.95, b: 0.99, a: 0.5} + - first: + name: _RimColor + second: {r: 0, g: 0.1188812, b: 1, a: 1} + - first: + name: _SpecColor + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _SpecularColor + second: {r: 0.3006994, g: 1, b: 0, a: 1} + - first: + name: _SpeedStrength + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _TintColor + second: {r: 0, g: 0.32867146, b: 1, a: 0.9843137} + - first: + name: _WorldLightDir + second: {r: 0, g: 0.1, b: -0.5, a: 0} + - first: + name: _params + second: {r: 0.2, g: 0.9, b: 0.5, a: 0.9} + - first: + name: _sunpos + second: {r: 0.5, g: 0.5, b: 0, a: 0} diff --git a/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat.meta b/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat.meta new file mode 100644 index 0000000..89511f7 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Materials/SunLight.mat.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 553dc1370e05a3d45b361fe9c550db19 +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Model.meta b/Assets/FloorCreator/VolumeLight/Model.meta new file mode 100644 index 0000000..e6fbb7e --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8a10f42cb5eeb4a49959a3fcb3e09b72 +folderAsset: yes +timeCreated: 1478089479 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Model/Materials.meta b/Assets/FloorCreator/VolumeLight/Model/Materials.meta new file mode 100644 index 0000000..a18dc0c --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e94578fa54db9e64796355f3bffa12c3 +folderAsset: yes +timeCreated: 1478089483 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat b/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat new file mode 100644 index 0000000..a11df4d --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 02 - Default + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0.5 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Metallic + second: 0 + - first: + name: _Mode + second: 0 + - first: + name: _OcclusionStrength + second: 1 + - first: + name: _Parallax + second: 0.02 + - first: + name: _SmoothnessTextureChannel + second: 0 + - first: + name: _SpecularHighlights + second: 1 + - first: + name: _SrcBlend + second: 1 + - first: + name: _UVSec + second: 0 + - first: + name: _ZWrite + second: 1 + m_Colors: + - first: + name: _Color + second: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat.meta b/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat.meta new file mode 100644 index 0000000..025f980 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Materials/02 - Default.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e157779cd729da94e8d85146e726ff07 +timeCreated: 1478089483 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat b/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat new file mode 100644 index 0000000..85e69a7 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: No Name + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0.5 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Metallic + second: 0 + - first: + name: _Mode + second: 0 + - first: + name: _OcclusionStrength + second: 1 + - first: + name: _Parallax + second: 0.02 + - first: + name: _SmoothnessTextureChannel + second: 0 + - first: + name: _SpecularHighlights + second: 1 + - first: + name: _SrcBlend + second: 1 + - first: + name: _UVSec + second: 0 + - first: + name: _ZWrite + second: 1 + m_Colors: + - first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat.meta b/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat.meta new file mode 100644 index 0000000..309193a --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Materials/No Name.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff9fb4f7dbbf4804391e8fcc1d24ea2d +timeCreated: 1478089483 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Model/Objects.FBX b/Assets/FloorCreator/VolumeLight/Model/Objects.FBX new file mode 100644 index 0000000..e56442c Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Model/Objects.FBX differ diff --git a/Assets/FloorCreator/VolumeLight/Model/Objects.FBX.meta b/Assets/FloorCreator/VolumeLight/Model/Objects.FBX.meta new file mode 100644 index 0000000..f58494b --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Model/Objects.FBX.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 6022821a30f1a3c44a65bbe690dff0db +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 100002: ChamferBox01 + 100004: Cone + 100006: Cylinder01 + 100008: Cylinder02 + 400000: //RootNode + 400002: ChamferBox01 + 400004: Cone + 400006: Cylinder01 + 400008: Cylinder02 + 2300000: //RootNode + 2300002: ChamferBox01 + 2300004: Cone + 2300006: Cylinder01 + 2300008: Cylinder02 + 3300000: //RootNode + 3300002: ChamferBox01 + 3300004: Cone + 3300006: Cylinder01 + 3300008: Cylinder02 + 4300000: ChamferBox01 + 4300002: Cylinder01 + 4300004: Cone + 4300006: Cylinder02 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 0.01 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Read Me.meta b/Assets/FloorCreator/VolumeLight/Read Me.meta new file mode 100644 index 0000000..94521c6 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Read Me.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2c6a2cc49a2b0274aba9a02bd4ef69ea +folderAsset: yes +timeCreated: 1478089479 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt b/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt new file mode 100644 index 0000000..56572a5 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt @@ -0,0 +1,19 @@ +Volume Particle Light + +This asset is a high performance, transparent additive shader that applies a custom volume light or simple light particles material, to any geometric shape along the UV mapping. This asset comes with three custom blur and noise textures and four custom ramp fade textures in PSD and PNG format. Each texture has one to two customizable layers to edit and create any type of unique noise or ramp fade map. + + +These primitive objects are set up with a custom shader. + +Main Color – Main Color + +Base (RGB) – Main light texture (texture alpha channel controls material cutoff) + +Culling Mask –Texture alpha controls the overall texture alpha fade masking + +Alpha Cutoff – Controls the amount of alpha cutoff + + + +Nikolaus Kraus + diff --git a/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt.meta b/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt.meta new file mode 100644 index 0000000..2594b44 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Read Me/Read Me.txt.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 600ffbc7ab8f1b847ae81c31e118c7c4 +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Read Me/VL.doc b/Assets/FloorCreator/VolumeLight/Read Me/VL.doc new file mode 100644 index 0000000..79514ba Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Read Me/VL.doc differ diff --git a/Assets/FloorCreator/VolumeLight/Read Me/VL.doc.meta b/Assets/FloorCreator/VolumeLight/Read Me/VL.doc.meta new file mode 100644 index 0000000..772f845 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Read Me/VL.doc.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 8965ef12e65427341869017c344f8587 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Scripts.meta b/Assets/FloorCreator/VolumeLight/Scripts.meta new file mode 100644 index 0000000..65f9f94 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Scripts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 927b1d224bee7f64ba577fd00f93b97a +folderAsset: yes +timeCreated: 1478089480 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js b/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js new file mode 100644 index 0000000..b735323 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js @@ -0,0 +1,21 @@ +@script ExecuteInEditMode() +// Scroll main texture based on time + +var scrollSpeed : float = 1.0; +var MainoffsetX : float = 0.0; +var MainoffsetY : float = 0.0; + +var UseCustomTex : boolean = false; +var CustomTexName : String = ""; +public var rend : Renderer; + +function Start(){ + rend = GetComponent.(); +} +function Update () { + var offset = Time.time * scrollSpeed; + if(UseCustomTex) + rend.sharedMaterial.SetTextureOffset (CustomTexName, Vector2(MainoffsetX*offset, MainoffsetY*offset)); + else + rend.sharedMaterial.SetTextureOffset ("_MainTex", Vector2(MainoffsetX*offset, MainoffsetY*offset)); +} \ No newline at end of file diff --git a/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js.meta b/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js.meta new file mode 100644 index 0000000..a6d663b --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Scripts/UVScroller.js.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 192a83352fa6e9941a037d820058e12c +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js b/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js new file mode 100644 index 0000000..0c5b934 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js @@ -0,0 +1,49 @@ +var target : Transform; +var distance : float = 10.0; +var targetOffset : Vector3; +var xSpeed :float = 250.0; +var ySpeed :float = 120.0; + +var yMinLimit : float = -20; +var yMaxLimit : float = 80; + +private var x :float = 0.0; +private var y : float = 0.0; + +private var rb : Rigidbody; + +@script AddComponentMenu("Camera-Control/Mouse Orbit") + +function Start () { + var angles = transform.eulerAngles; + x = angles.y; + y = angles.x; + + rb = GetComponent.(); + // Make the rigid body not change rotation + if (rb) + rb.freezeRotation = true; +} + +function LateUpdate () { + if (target) { + x += Input.GetAxis("Mouse X") * xSpeed * 0.02; + y -= Input.GetAxis("Mouse Y") * ySpeed * 0.02; + + y = ClampAngle(y, yMinLimit, yMaxLimit); + + var rotation = Quaternion.Euler(y, x, 0); + var position = rotation * Vector3(0.0, 0.0, -distance) + target.position+targetOffset; + + transform.rotation = Quaternion.Slerp(transform.rotation, rotation, Time.deltaTime*2); + transform.position = Vector3.Slerp(transform.position, position, Time.deltaTime*2); + } +} + +static function ClampAngle (angle : float, min : float, max : float) { + if (angle < -360) + angle += 360; + if (angle > 360) + angle -= 360; + return Mathf.Clamp (angle, min, max); +} \ No newline at end of file diff --git a/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js.meta b/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js.meta new file mode 100644 index 0000000..b54a80c --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Scripts/VLMouseOrbit.js.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d47995718871f6408a7b9dd93399cee +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Shader.meta b/Assets/FloorCreator/VolumeLight/Shader.meta new file mode 100644 index 0000000..d1f113b --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: dc035ab0811d51944902ccbeeb82fd8d +folderAsset: yes +timeCreated: 1478089480 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader b/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader new file mode 100644 index 0000000..644db64 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader @@ -0,0 +1,37 @@ +Shader "Custom/AdditiveMask" +{ +Properties +{ +_Color ("Main Color", Color) = (1,1,1,1) +_MainTex ("Base (RGB)", 2D) = "white" {} +_Mask ("Culling Mask", 2D) = "white" {} +_Cutoff ("Alpha cutoff", Range (.01,1)) = 0.1 +} +SubShader +{ + +//Alphatest Greater 0 +Tags {"Queue"="Transparent"} +Lighting off +Blend SrcAlpha OneMinusSrcAlpha +AlphaTest GEqual [_Cutoff] +Color [_Color] +Cull off +ZWrite off + + +Pass +{ +SetTexture [_Mask] { +constantColor [_Color] +combine texture * constant +} +SetTexture [_MainTex] { +combine texture * previous DOUBLE +} + + } + } + + FallBack "VertexLit" +} \ No newline at end of file diff --git a/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader.meta b/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader.meta new file mode 100644 index 0000000..300ed16 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Shader/AdditiveMask.shader.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80979ccfe64a90c49b9fd932c1acb075 +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture.meta b/Assets/FloorCreator/VolumeLight/Texture.meta new file mode 100644 index 0000000..e7202bb --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0eb3a2581e91d4a40a9bb1dd7b8acfd3 +folderAsset: yes +timeCreated: 1478089479 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png new file mode 100644 index 0000000..202a472 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png.meta b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png.meta new file mode 100644 index 0000000..cd90b5a --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PNG.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: c8bee52e0dd3ef34f8f3f3d8f1d7c93a +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd new file mode 100644 index 0000000..b5e3885 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd.meta new file mode 100644 index 0000000..c384ebb --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Blur1_PSD.psd.meta @@ -0,0 +1,62 @@ +fileFormatVersion: 2 +guid: baa8f45b15940ae4aa17522af01bd8a9 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png new file mode 100644 index 0000000..c2e1811 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png.meta b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png.meta new file mode 100644 index 0000000..fb7c00f --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PNG.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: c41620a1eef17af4594e38b8b4424cf1 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd new file mode 100644 index 0000000..91b1bda Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd.meta new file mode 100644 index 0000000..74ecdf6 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Blur2_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: a5e18d0db79bbd842b21dd85e8b80027 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Standalone + maxTextureSize: 256 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png new file mode 100644 index 0000000..44e6ae8 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png.meta b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png.meta new file mode 100644 index 0000000..999f33e --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PNG.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 2c98589f135bf784697918f128900785 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd new file mode 100644 index 0000000..f12f5fd Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd.meta new file mode 100644 index 0000000..2fbe4dc --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/Noise1_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: 4b522db782223404094aced960740d95 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Web + maxTextureSize: 256 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 256 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd new file mode 100644 index 0000000..5009f80 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd.meta new file mode 100644 index 0000000..dd2d0b0 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/RampBlackFade_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: 05ed36d38726f1544b6a271416b37315 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Web + maxTextureSize: 256 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd new file mode 100644 index 0000000..5cb3a91 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd.meta new file mode 100644 index 0000000..e3b06ae --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeH_PSD.psd.meta @@ -0,0 +1,72 @@ +fileFormatVersion: 2 +guid: 1b908c043a674a24f996a83f8597d87a +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 128 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Standalone + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Web + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd new file mode 100644 index 0000000..eb6be1c Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd.meta new file mode 100644 index 0000000..6c6056a --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFadeWidth_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: 6080232c6cd8bdf46aa33bd56d923702 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Standalone + maxTextureSize: 256 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd new file mode 100644 index 0000000..cf454ad Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd.meta new file mode 100644 index 0000000..ddb0080 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFade_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: defa5ad709775b64285f14a542b75920 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Standalone + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd new file mode 100644 index 0000000..a03a2b8 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd.meta new file mode 100644 index 0000000..0fd4184 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/RampWhiteFlame_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: c2a9ef63c14f0484fb69a1cfef470eed +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Standalone + maxTextureSize: 512 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png new file mode 100644 index 0000000..8cc055e Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png.meta b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png.meta new file mode 100644 index 0000000..bcedc6f --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PNG.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: aa42d27308379d143855c94624b90a80 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd new file mode 100644 index 0000000..2002e69 Binary files /dev/null and b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd differ diff --git a/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd.meta b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd.meta new file mode 100644 index 0000000..b98a5d4 --- /dev/null +++ b/Assets/FloorCreator/VolumeLight/Texture/SpotFadeWhite_PSD.psd.meta @@ -0,0 +1,67 @@ +fileFormatVersion: 2 +guid: a97b98ea677a1f34ca3380b8277a23ee +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: + - buildTarget: Standalone + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + - buildTarget: Android + maxTextureSize: 128 + textureFormat: -3 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Generator.cs b/Assets/Generator.cs index 522cd9b..82ac53a 100644 --- a/Assets/Generator.cs +++ b/Assets/Generator.cs @@ -34,9 +34,9 @@ public class Generator : MonoBehaviour { for (int i = 0; i < x; ++i) { for (int j = 0; j < y; ++j) { if (i == 0 || i == x - 1 || j == 0 || j == y - 1) - map [i, j] = -1; - else map [i, j] = 0; + else + map [i, j] = Random.Range(1,4); } } //just to test diff --git a/Assets/Generator.cs.meta b/Assets/Generator.cs.meta index 285c8ac..1eb60e9 100644 --- a/Assets/Generator.cs.meta +++ b/Assets/Generator.cs.meta @@ -1,14 +1,15 @@ fileFormatVersion: 2 guid: 4828dbfa7343efb49b36490a44cb05d7 -timeCreated: 1477842453 +timeCreated: 1478085476 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: - tmanager: {fileID: 1000011212613648, guid: 0193d92a24b3bc94aad43f1f8c93643b, type: 2} - - mcreator: {fileID: 1000013182272914, guid: 9fe758e4b61ec0d4dbdd8b92521a6628, type: 2} + - mcreator: {fileID: 1000013182272914, guid: bd3068e9944aae447a20ec5f0a4784be, type: 2} - ucreator: {fileID: 1000012081215776, guid: afbffbb7b9d986345b62d4e4b7969551, type: 2} - imanager: {fileID: 1000013024682154, guid: 85681a523e843e54895aa694f42139a4, type: 2} + - amanager: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/InputManagerScript.cs b/Assets/InputManagerScript.cs index 02a1077..a843cb8 100644 --- a/Assets/InputManagerScript.cs +++ b/Assets/InputManagerScript.cs @@ -55,11 +55,10 @@ public class InputManagerScript : MonoBehaviour { // Update is called once per frame void Update () { - if (!openMenu) - moveCursor (); - - else if (openMenu) + if (openMenu) moveMenuCursor (); + else + moveCursor (); } void moveMenuCursor() { @@ -136,8 +135,9 @@ public class InputManagerScript : MonoBehaviour { if (Input.GetKeyDown (KeyCode.Escape)) { if (unitActionSelected) { unitActionSelected = false; - changeCursorColor (MyColor.cyan); } + openMenu = false; + changeCursorColor (MyColor.cyan); } if (Input.GetKeyDown (KeyCode.Space)) { @@ -207,6 +207,7 @@ public class InputManagerScript : MonoBehaviour { if (selectedGO != null) { UnitBehaviour ub = selectedGO.GetComponent (); UnitBehaviour.Team myTeam = (UnitBehaviour.Team) tms.currentPlayer; + if (ub.teamID == myTeam) { if (ub.remainingActions != 0) loadUnitMenu (); diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs index a9d0aef..0fb4dfa 100644 --- a/Assets/TurnManagerScript.cs +++ b/Assets/TurnManagerScript.cs @@ -67,7 +67,7 @@ public class TurnManagerScript : MonoBehaviour { int pj = (int)go.transform.position.x; Vector2 diff = new Vector2(Math.Abs(pi - i), Math.Abs(pj - j)); - if ((diff.x+diff.y) < ub.stepLength && ra > 0 && terrain [j, i] == 0) + if ((diff.x+diff.y) < ub.stepLength && ra > 0 && terrain [j, i] > 0) return true; else return false; @@ -78,7 +78,7 @@ public class TurnManagerScript : MonoBehaviour { ub.moveAct (); int pi = (int)go.transform.position.z; int pj = (int)go.transform.position.x; - List movement = getPathBFS (pi, pj, i, j); + //List movement = getPathBFS (pi, pj, i, j); //TODO: MOVEMENT if (ub.remainingActions == 0) @@ -98,7 +98,7 @@ public class TurnManagerScript : MonoBehaviour { int pj = (int)go.transform.position.x; Vector2 diff = new Vector2(Math.Abs(pi - i), Math.Abs(pj - j)); - if ((diff.x+diff.y) <= ub.attackRange && ra > 0 && terrain [j, i] == 0) + if ((diff.x+diff.y) <= ub.attackRange && ra > 0 && terrain [j, i] > 0) return true; else return false; @@ -178,7 +178,7 @@ public class TurnManagerScript : MonoBehaviour { }; - + /* public List getPathBFS(int x, int y, int xx, int yy) { int[,] map = new int[(int)mapSize.y, (int)mapSize.x]; int[,] road = new int[(int)mapSize.y, (int)mapSize.x*2]; @@ -232,7 +232,7 @@ public class TurnManagerScript : MonoBehaviour { } return res; - } + }*/ /*void OnGUI(){ if (showActions) { diff --git a/Assets/TurnManagerScript.cs.meta b/Assets/TurnManagerScript.cs.meta index 3907d4f..83ce715 100644 --- a/Assets/TurnManagerScript.cs.meta +++ b/Assets/TurnManagerScript.cs.meta @@ -1,15 +1,10 @@ fileFormatVersion: 2 guid: 0f6c21b5c0a62dc408e8b6d4cc0253f3 -timeCreated: 1477746487 +timeCreated: 1477852568 licenseType: Free MonoImporter: serializedVersion: 2 - defaultReferences: - - cursor: {fileID: 1000012666769054, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} - - image_move: {fileID: 114000013716489878, guid: d80ae4a7a1bea5d48b549fbf1ef3f3f5, - type: 2} - - image_attack: {fileID: 114000012902201940, guid: 8b74ce38e76531b42a1b0af65416b73a, - type: 2} + defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/scene1.unity b/Assets/scene1.unity index 77013a7..bc302b6 100644 --- a/Assets/scene1.unity +++ b/Assets/scene1.unity @@ -180,7 +180,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tmanager: {fileID: 1000011212613648, guid: 0193d92a24b3bc94aad43f1f8c93643b, type: 2} - mcreator: {fileID: 1000013182272914, guid: 9fe758e4b61ec0d4dbdd8b92521a6628, type: 2} + mcreator: {fileID: 1000013182272914, guid: bd3068e9944aae447a20ec5f0a4784be, type: 2} ucreator: {fileID: 1000012081215776, guid: afbffbb7b9d986345b62d4e4b7969551, type: 2} imanager: {fileID: 1000013024682154, guid: 85681a523e843e54895aa694f42139a4, type: 2} amanager: {fileID: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 476cc76..5816f67 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -123,7 +123,6 @@ PlayerSettings: iPhoneTargetOSVersion: 24 tvOSSdkVersion: 0 tvOSTargetOSVersion: 900 - tvOSRequireExtendedGameController: 0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -163,7 +162,6 @@ PlayerSettings: iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] iOSURLSchemes: [] - appleDeveloperTeamID: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -199,15 +197,12 @@ PlayerSettings: wiiUSystemHeapSize: 128 wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} - wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: locationUsageDescription: - microphoneUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -247,8 +242,7 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 + ps4VideoOutResolution: 4 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -277,12 +271,9 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 - ps4UseResolutionFallback: 0 - restrictedAudioUsageRights: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ae41cb6..96b25e7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.4.2f2 +m_EditorVersion: 5.4.1f1 m_StandardAssetsVersion: 0