diff --git a/Assets/Scenes/DisasterLibraryManage.unity b/Assets/Scenes/DisasterLibraryManage.unity index 4a6b99f..9207588 100644 --- a/Assets/Scenes/DisasterLibraryManage.unity +++ b/Assets/Scenes/DisasterLibraryManage.unity @@ -1599,7 +1599,22 @@ PrefabInstance: - target: {fileID: 224885700138999974, guid: 9c85ddbcfc2c9924a8b9a9595c016377, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00002113227 + value: -0.000017399974 + objectReference: {fileID: 0} + - target: {fileID: 224904859664833784, guid: 9c85ddbcfc2c9924a8b9a9595c016377, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00000000814177 + objectReference: {fileID: 0} + - target: {fileID: 114379362504804110, guid: 9c85ddbcfc2c9924a8b9a9595c016377, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 114191464068583674, guid: 9c85ddbcfc2c9924a8b9a9595c016377, + type: 3} + propertyPath: m_Text + value: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c85ddbcfc2c9924a8b9a9595c016377, type: 3} diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs index 2a11824..bf7e4bd 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs @@ -1794,16 +1794,22 @@ public class TruckBindWaterSource : MonoBehaviour { for (int j = 0; j < watersouce[i].Count; j++) { - WaterSource ws = EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent(); - if (ws.TotalWater != -100) + + if(EntitiesManager.Instance.GetEntityByID(watersouce[i][j]) + && EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent()) { - allremain += (ws.TotalWater - ws.AllUserWater); - } - else - { - allremain = -100; - break; + WaterSource ws = EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent(); + if (ws.TotalWater != -100) + { + allremain += (ws.TotalWater - ws.AllUserWater); + } + else + { + allremain = -100; + break; + } } + } } return allremain; diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC.cs index 691af6c..0733988 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC.cs @@ -37,8 +37,16 @@ public class NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC : NetworkMessageBehaviour { if (GetComponent().gameObjID==info.gameObjID) { - emissionModule1.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime1); - emissionModule2.rateOverTime = new ParticleSystem.MinMaxCurve(info. Rateovertime2); + + try + { + emissionModule1.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime1); + emissionModule2.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime2); + } + catch + { + + } if (info.Rateovertime1 < 0 && info.Rateovertime2 < 0) {