解决c2表头设定课程后抖动问题,设备断开失败问题
This commit is contained in:
1 parent
0202814f67
commit
610c98f9b8
5 files changed
+18
-10
No files matched your search
@@ -751,7 +751,7 @@ public class RowerHomeScript : PFUIPanel
|
||||
{
|
||||
var origin = RowerData.ResistanceLevel;
|
||||
var wrapped = origin< 50 ? 50 : origin;
|
||||
slider.GetComponent<PFUISlider>().SetValue((wrapped - 50) / 300f);
|
||||
slider.GetComponent<PFUISlider>().SetValue((wrapped - 50) / 300f,false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -827,7 +827,10 @@ public class RowerHomeScript : PFUIPanel
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (interruptFlag) return;
|
||||
if (interruptFlag) {
|
||||
transform.Find("Stopped").gameObject.SetActive(false);
|
||||
return;
|
||||
}
|
||||
if (RowerData == null) return;
|
||||
//#endif
|
||||
//断线重连继续
|
||||
@@ -853,9 +856,10 @@ public class RowerHomeScript : PFUIPanel
|
||||
}
|
||||
if (stopSeconds >= 2)
|
||||
{
|
||||
if (UIManager.Instance.confirm != null && UIManager.Instance.confirm.IsActive())
|
||||
if (UIManager.Instance.confirm != null && UIManager.Instance.confirm.IsActive()) {
|
||||
transform.Find("Stopped").gameObject.SetActive(false);
|
||||
return;
|
||||
|
||||
}
|
||||
transform.Find("Stopped").gameObject.SetActive(true);
|
||||
//if (stopSeconds == 6)
|
||||
//{
|
||||
@@ -1339,7 +1343,7 @@ public class RowerHomeScript : PFUIPanel
|
||||
}
|
||||
if (Rower != null)
|
||||
{
|
||||
if (C2RowerData.IsEnabled == true && !openTimer && !isPause && C2RowerData.rowerType!=null)
|
||||
if (C2RowerData.IsEnabled == true && !openTimer && !isPause && C2RowerData.rowerType!=null && rowerType!= null && !rowerType.EqualTo(C2RowerData.rowerType))
|
||||
{
|
||||
rowerType = C2RowerData.rowerType;
|
||||
HandleSelectType();
|
||||
|
||||
@@ -22,6 +22,9 @@ public class RowerTaskPanel : PFUIPanel
|
||||
/// 里程:m 时间:s
|
||||
/// </summary>
|
||||
public float value { get; set; }
|
||||
public bool EqualTo(RowerType rowerType) {
|
||||
return this.type == rowerType.type && this.value == rowerType.value;
|
||||
}
|
||||
}
|
||||
Transform selector, distance, time;
|
||||
public RowerType rowerType;
|
||||
|
||||
Reference in new issue
Block a user