lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整连接设备样式。调整地球样式。去掉灯光。

Browse Source
This commit is contained in:
suntao committed 2021-04-29 18:10:09 +08:00
1 parent 4cb40f2c8e
commit de61fbd291
26 files changed
+1586 -677
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
+8 -3
View File
@@ -20,7 +20,7 @@ public class ConnectDeviceModal : PFUIPanel
}
set
{
Debug.Log(value);
//Debug.Log(value);
mSensorType = value;
var deviceInfoStr = Utils.deviceDict[value.ToString()];
if (deviceInfoStr != null)
@@ -66,8 +66,8 @@ public class ConnectDeviceModal : PFUIPanel
UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
{
//this.gameObject.SetActive(false);
this.Close();
//DestroyImmediate(this.gameObject);
}));
deviceItem = Resources.Load("UI/Prefab/Device/DeviceItem");
@@ -156,6 +156,7 @@ public class ConnectDeviceModal : PFUIPanel
var gameObject = (GameObject)Instantiate(deviceItem);
gameObject.transform.SetParent(content.transform);
gameObject.transform.localScale = new Vector3(1, 1, 1);
var deviceItemObj = gameObject.GetComponent<DeviceItem>();
deviceItemObj.DeviceInfo = device;
@@ -200,13 +201,17 @@ public class ConnectDeviceModal : PFUIPanel
public override void Close()
{
base.Close();
DestroyImmediate(this.gameObject);
//DestroyImmediate(this.gameObject);
Destroy(this.gameObject);
}
float time = 0;
float _x = 0;
float _y = 0;
/// <summary>
/// 做search动画
/// </summary>
void Move()
{
var hudu = (2 * Mathf.PI / 360) * 1 * time;
Assets/Scripts/UI/Prefab/Device/DeviceView.cs
+24 -19
View File
@@ -70,18 +70,19 @@ public class DeviceView : MonoBehaviour
var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
var rect = ((RectTransform)transform).rect;
material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.2f, 0));
//this.GetComponent<Image>().material = material;
this.GetComponent<Image>().material = material;
var img1 = unconnectionPanel.GetComponent<Image>();
if(img1 != null)
{
img1.material = material;
var gradient = unconnectionPanel.GetComponent<UIGradient>();
if (gradient != null)
{
gradient.color1 = Utils.HexToColor("353543");
gradient.color2 = Utils.HexToColor("23232D");
}
//var gradient = unconnectionPanel.GetComponent<UIGradient>();
//if (gradient != null)
//{
// gradient.color1 = Utils.HexToColor("353543");
// gradient.color2 = Utils.HexToColor("23232D");
//}
}
var img2 = connectionPanel.GetComponent<Image>();
@@ -89,12 +90,12 @@ public class DeviceView : MonoBehaviour
{
img2.material = material;
var gradient1 = connectionPanel.GetComponent<UIGradient>();
if (gradient1 != null)
{
gradient1.color1 = Utils.HexToColor("FF7485");
gradient1.color2 = Utils.HexToColor("F93086");
}
//var gradient1 = connectionPanel.GetComponent<UIGradient>();
//if (gradient1 != null)
//{
// gradient1.color1 = Utils.HexToColor("FF7485");
// gradient1.color2 = Utils.HexToColor("F93086");
//}
}
logo = this.transform.Find("Logo").GetComponent<Image>();
@@ -151,7 +152,7 @@ public class DeviceView : MonoBehaviour
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Power_0");
sprite1 = Resources.Load<Sprite>("Images/Devices/Power_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Power_3");
sprite3 = Resources.Load<Sprite>("Images/Devices/Power_4");
powerUnit.text = "W";
}
@@ -159,7 +160,7 @@ public class DeviceView : MonoBehaviour
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Speed_0");
sprite1 = Resources.Load<Sprite>("Images/Devices/Speed_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Speed_3");
sprite3 = Resources.Load<Sprite>("Images/Devices/Speed_4");
powerUnit.text = "KPH";
}
@@ -167,7 +168,7 @@ public class DeviceView : MonoBehaviour
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Cadence_0");
sprite1 = Resources.Load<Sprite>("Images/Devices/Cadence_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Cadence_3");
sprite3 = Resources.Load<Sprite>("Images/Devices/Cadence_4");
powerUnit.text = "RPM";
}
@@ -175,7 +176,7 @@ public class DeviceView : MonoBehaviour
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_0");
sprite1 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_3");
sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_4");
powerUnit.text = "BPM";
}
@@ -183,7 +184,7 @@ public class DeviceView : MonoBehaviour
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_0");
sprite1 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Trainer_3");
sprite3 = Resources.Load<Sprite>("Images/Devices/Trainer_4");
}
}
@@ -255,7 +256,11 @@ public class DeviceView : MonoBehaviour
var connectionCanvasGroup = connectionPanel.GetComponent<CanvasGroup>();
connectionCanvasGroup.alpha = 0;
connectionPanel.SetActive(true);
connectionCanvasGroup.DOFade(1f, .3f);
connectionCanvasGroup.DOFade(1f, .3f).OnComplete(()=> {
//if (logoSprite != null) {
// logo.sprite = logoSprite;
//}
});
}
logo.sprite = sprite3;