From dbf79099f47d5f06223edfd5b8dc06c51b1830aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:39 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Entity/Function/Light.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Light.cs b/HDL_ON/Entity/Function/Light.cs
index 5c89126..48453e6 100644
--- a/HDL_ON/Entity/Function/Light.cs
+++ b/HDL_ON/Entity/Function/Light.cs
@@ -42,9 +42,11 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0,
};
}
- trait_brightness.curValue = trait_brightness.min;
+ if (trait_brightness.curValue.ToString() == "{}")
+ trait_brightness.curValue = 0;
}
return Convert.ToInt32(trait_brightness.curValue);
}
@@ -64,12 +66,11 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
}
- trait_brightness.curValue = trait_brightness.min;
}
trait_brightness.curValue = value;
- MainPage.Log($"brightness 鏁版嵁鍒锋柊{value}.");
}
catch
{
@@ -100,9 +101,8 @@
value = new List<string> { "up", "down" },
max = 10,
min = 0,
+ curValue = 0
};
- trait_fadeTime.curValue = 0;
- attributes.Add(trait_fadeTime);
}
}
int result = 0;
@@ -125,9 +125,8 @@
value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
- trait_fadeTime.curValue = 0;
- attributes.Add(trait_fadeTime);
}
}
trait_fadeTime.curValue = value;
@@ -161,9 +160,11 @@
value = new List<string> { "FFFFFF" },
max = 0xFFFFFF,
min = 0x00000F,
+ curValue = 0x00000F
};
}
- trait_color.curValue = trait_color.min;
+ if (trait_color.curValue.ToString() == "{}")
+ trait_color.curValue = 0x00000F;
}
return Convert.ToInt32(trait_color.curValue);
}
--
Gitblit v1.8.0