diff --git a/Assets/Resources/Games/builtToScaleDS.prefab b/Assets/Resources/Games/builtToScaleDS.prefab index e13574611..b7d2a7324 100644 --- a/Assets/Resources/Games/builtToScaleDS.prefab +++ b/Assets/Resources/Games/builtToScaleDS.prefab @@ -1574,6 +1574,15 @@ MonoBehaviour: shooterMaterial: {fileID: 2100000, guid: 97aebf98db2a0bb4a974fbbbbf03fda8, type: 2} objectMaterial: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} gridPlaneMaterial: {fileID: 2100000, guid: 3df450e97190f504d9ac4f14283b2e0a, type: 2} + elevatorMaterial: {fileID: 2100000, guid: f8523e095c9f2194d8ae47687a42305a, type: 2} + beltMaterial: {fileID: 2100000, guid: eafa15cb3393da547b21d564d4e71546, type: 2} + firstPatternLights: + - {fileID: 2100000, guid: da6d7e38b05966f40b51e566d6b339a8, type: 2} + - {fileID: 2100000, guid: 19e1f16b6cfe97b44abbebd8638abba7, type: 2} + - {fileID: 2100000, guid: 9dd5968860c25854c81d2bab1f5413d6, type: 2} + secondPatternLights: + - {fileID: 2100000, guid: 30ee7eac2a3457f469ba20a22c6dede1, type: 2} + - {fileID: 2100000, guid: bb162603bc9317b4c99d15b50be9b8ff, type: 2} beltSpeed: 4.33 --- !u!1 &8451088964468361308 GameObject: diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index fa502a5ab..09fcdd71b 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -97,16 +97,14 @@ namespace HeavenStudio.Games [SerializeField] private Material shooterMaterial; [SerializeField] private Material objectMaterial; [SerializeField] private Material gridPlaneMaterial; - private Material elevatorMaterial; - private Material[] gridMaterials; - private Material[] firstPatternLights; - private Material[] secondPatternLights; - private Material[] elevatorObjectMats; + [SerializeField] private Material elevatorMaterial; + [SerializeField] private Material beltMaterial; + [SerializeField] private Material[] firstPatternLights; + [SerializeField] private Material[] secondPatternLights; [Header("Properties")] [SerializeField] float beltSpeed = 1f; - private Material beltMaterial; private Material[] environmentMaterials; private Material[] elevatorMaterials; private float currentBeltOffset; @@ -132,52 +130,52 @@ namespace HeavenStudio.Games GameCamera.AdditionalRotEuler = camPos.eulerAngles; GameCamera.AdditionalFoV = cameraFoV; - environmentMaterials = environmentRenderer.materials; - elevatorMaterials = elevatorRenderer.materials; - beltMaterial = Instantiate(environmentMaterials[8]); - environmentMaterials[8] = beltMaterial; - elevatorObjectMats = new Material[] - { - Instantiate(elevatorMaterials[0]), - Instantiate(elevatorMaterials[1]), - Instantiate(elevatorMaterials[2]), - }; - elevatorMaterials[0] = elevatorObjectMats[0]; - elevatorMaterials[1] = elevatorObjectMats[1]; - elevatorMaterials[2] = elevatorObjectMats[2]; - elevatorMaterial = Instantiate(elevatorMaterials[3]); - elevatorMaterials[3] = elevatorMaterial; - gridMaterials = new Material[] - { - Instantiate(environmentMaterials[9]), - Instantiate(environmentMaterials[11]), - Instantiate(environmentMaterials[12]), - Instantiate(environmentMaterials[13]), - Instantiate(environmentMaterials[14]), - }; - environmentMaterials[9] = gridMaterials[0]; - environmentMaterials[11] = gridMaterials[1]; - environmentMaterials[12] = gridMaterials[2]; - environmentMaterials[13] = gridMaterials[3]; - environmentMaterials[14] = gridMaterials[4]; + // environmentMaterials = environmentRenderer.materials; + // elevatorMaterials = elevatorRenderer.materials; + // beltMaterial = Instantiate(environmentMaterials[8]); + // environmentMaterials[8] = beltMaterial; + // elevatorObjectMats = new Material[] + // { + // Instantiate(elevatorMaterials[0]), + // Instantiate(elevatorMaterials[1]), + // Instantiate(elevatorMaterials[2]), + // }; + // elevatorMaterials[0] = elevatorObjectMats[0]; + // elevatorMaterials[1] = elevatorObjectMats[1]; + // elevatorMaterials[2] = elevatorObjectMats[2]; + // elevatorMaterial = Instantiate(elevatorMaterials[3]); + // elevatorMaterials[3] = elevatorMaterial; + // gridMaterials = new Material[] + // { + // Instantiate(environmentMaterials[9]), + // Instantiate(environmentMaterials[11]), + // Instantiate(environmentMaterials[12]), + // Instantiate(environmentMaterials[13]), + // Instantiate(environmentMaterials[14]), + // }; + // environmentMaterials[9] = gridMaterials[0]; + // environmentMaterials[11] = gridMaterials[1]; + // environmentMaterials[12] = gridMaterials[2]; + // environmentMaterials[13] = gridMaterials[3]; + // environmentMaterials[14] = gridMaterials[4]; - firstPatternLights = new Material[] - { - Instantiate(environmentMaterials[1]), - Instantiate(environmentMaterials[2]), - Instantiate(environmentMaterials[4]), - }; - environmentMaterials[1] = firstPatternLights[0]; - environmentMaterials[2] = firstPatternLights[1]; - environmentMaterials[4] = firstPatternLights[2]; + // firstPatternLights = new Material[] + // { + // Instantiate(environmentMaterials[1]), + // Instantiate(environmentMaterials[2]), + // Instantiate(environmentMaterials[4]), + // }; + // environmentMaterials[1] = firstPatternLights[0]; + // environmentMaterials[2] = firstPatternLights[1]; + // environmentMaterials[4] = firstPatternLights[2]; - secondPatternLights = new Material[] - { - Instantiate(environmentMaterials[0]), - Instantiate(environmentMaterials[3]) - }; - environmentMaterials[0] = secondPatternLights[0]; - environmentMaterials[3] = secondPatternLights[1]; + // secondPatternLights = new Material[] + // { + // Instantiate(environmentMaterials[0]), + // Instantiate(environmentMaterials[3]) + // }; + // environmentMaterials[0] = secondPatternLights[0]; + // environmentMaterials[3] = secondPatternLights[1]; elevatorAnim.Play("MakeRod", 0, 1f); UpdateColors(); @@ -231,14 +229,6 @@ namespace HeavenStudio.Games beltMaterial.SetColor("_Color", currentEnvironmentColor); gridPlaneMaterial.SetColor("_Color", currentEnvironmentColor); elevatorMaterial.SetColor("_Color", currentEnvironmentColor); - foreach (var mat in gridMaterials) - { - mat.SetColor("_Color", currentEnvironmentColor); - } - foreach (var mat in elevatorObjectMats) - { - mat.SetColor("_Color", currentObjectColor); - } if (!lighting) { foreach (var mat in firstPatternLights) @@ -298,8 +288,8 @@ namespace HeavenStudio.Games currentBeltOffset = (currentBeltOffset + Time.deltaTime * -beltSpeed) % 1f; beltMaterial.mainTextureOffset = new Vector2(0f, currentBeltOffset); - environmentRenderer.materials = environmentMaterials; - elevatorRenderer.materials = elevatorMaterials; + // environmentRenderer.materials = environmentMaterials; + // elevatorRenderer.materials = elevatorMaterials; if (PlayerInput.PlayerHasControl() && PlayerInput.CurrentControlStyle is InputSystem.InputController.ControlStyles.Touch) {