diff --git a/Assets/Resources/LED/material/LED_G_On.mat b/Assets/Resources/LED/material/LED_G_On.mat index 623ffa54..bf604db7 100644 --- a/Assets/Resources/LED/material/LED_G_On.mat +++ b/Assets/Resources/LED/material/LED_G_On.mat @@ -311,7 +311,7 @@ Material: - _Color: {r: 0.20857683, g: 1, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 0.21704052, g: 1.9999999, b: 0, a: 1} + - _EmissionColor: {r: 5.202164, g: 47.937256, b: 0, a: 1} - _EmissiveColor: {r: 0.0945549, g: 4, b: 0, a: 1} - _EmissiveColorLDR: {r: 0, g: 0.88031507, b: 0.008514703, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} diff --git a/Assets/Resources/LED/material/LED_O_On.mat b/Assets/Resources/LED/material/LED_O_On.mat index 1bd4932b..b0fa3804 100644 --- a/Assets/Resources/LED/material/LED_O_On.mat +++ b/Assets/Resources/LED/material/LED_O_On.mat @@ -311,7 +311,7 @@ Material: - _Color: {r: 1, g: 0.47955847, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 8, g: 2.2161016, b: 0, a: 1} + - _EmissionColor: {r: 47.93726, g: 13.27923, b: 0, a: 1} - _EmissiveColor: {r: 4, g: 0.7012152, b: 0, a: 1} - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} diff --git a/Assets/Resources/LED/material/LED_R_On.mat b/Assets/Resources/LED/material/LED_R_On.mat index 549c81f0..298376d1 100644 --- a/Assets/Resources/LED/material/LED_R_On.mat +++ b/Assets/Resources/LED/material/LED_R_On.mat @@ -327,7 +327,7 @@ Material: - _Color: {r: 1, g: 0, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 2, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 47.93726, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 4, g: 0, b: 0, a: 1} - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} diff --git a/Assets/Scripts/ActionAnimator/StatusLED.cs b/Assets/Scripts/ActionAnimator/StatusLED.cs index ccd88dfd..fd05bc87 100644 --- a/Assets/Scripts/ActionAnimator/StatusLED.cs +++ b/Assets/Scripts/ActionAnimator/StatusLED.cs @@ -17,7 +17,7 @@ public class StatusLED : ActionAnimator Material currentOnMaterial; - + private string prevStatus; public override void AnimationEnd() { SetColor("End"); @@ -84,11 +84,6 @@ public class StatusLED : ActionAnimator currentOnMaterial = LED_O.sharedMaterial; break; } - } - - // Update is called once per frame - void Update() - { - + //prevStatus = progStatus; } } diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs index 1475efe1..11b33fd5 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelMove.cs @@ -487,7 +487,7 @@ public class SimulationModelMove : SimulationModel } else if (wrapclass._event.Contains("unloading_store")) { - Debug.Log(wrapclass.data.ToString()); + //Debug.Log(wrapclass.data.ToString()); var moveData_unLoading = JsonConvert.DeserializeObject(wrapclass.data.ToString()); targetID = moveData_unLoading.store_name; }