diff --git a/Assets/StreamingAssets/Captures.meta b/Assets/StreamingAssets/Captures.meta index 15f455c3..6567b05e 100644 --- a/Assets/StreamingAssets/Captures.meta +++ b/Assets/StreamingAssets/Captures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb3508ab85cb65446a7389d2f85a93d0 +guid: 976612a26e59a5f4f88974baedd9bab9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 42e0acfd..b99c1719 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -182,7 +182,7 @@ public class EquipmentCommon : MonoBehaviour UploadLog(deviceID); })); } - if (data.my_rate != "") + if (data.my_rate!=null&&data.my_rate != "") { weaponitemone = Weaponitemone(data); }