From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Entity/Function/AC.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index a24c624..e21a0b1 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -194,9 +194,9 @@
min = 0,
};
}
- if (_trait_mode.curValue.ToString() == "{}")
- _trait_mode.curValue = "cool";
}
+ if (_trait_mode.curValue.ToString() == "{}")
+ _trait_mode.curValue = "cool";
return _trait_mode;
}
}
@@ -222,9 +222,9 @@
curValue = "high"
};
}
- if (_trait_fan.curValue.ToString() == "{}")
- _trait_fan.curValue = "high";
}
+ if (_trait_fan.curValue.ToString() == "{}")
+ _trait_fan.curValue = "high";
return _trait_fan;
}
}
@@ -257,7 +257,8 @@
}
//if (_trait_temp.curValue.ToString().Length > 3)
{
- var vv = Convert.ToDouble(_trait_temp.curValue);
+ double vv = 16;
+ Double.TryParse(_trait_temp.curValue.ToString(),out vv);
_trait_temp.curValue = Convert.ToInt32(vv);
}
return _trait_temp;
--
Gitblit v1.8.0