From 28808bd44254c38499da4e1e47be222aa0451acc Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 13 十二月 2018 15:53:32 +0800
Subject: [PATCH] 5439 子 【优化】【1.3】【1.3.100】坐骑、灵宠界面修改：支持1-5个技能 / 【前端】【1.3】【1.3.100】坐骑、灵宠界面修改：支持1-5个技能
---
System/Pet/PetAttributeMethods.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/System/Pet/PetAttributeMethods.cs b/System/Pet/PetAttributeMethods.cs
index ca23f74..e201bd4 100644
--- a/System/Pet/PetAttributeMethods.cs
+++ b/System/Pet/PetAttributeMethods.cs
@@ -72,7 +72,13 @@
GameObject Skillimage2;
[SerializeField]
GameObject Skillimage3;
-
+ [SerializeField]
+ GameObject Skillimage4;
+ [SerializeField]
+ GameObject Skillimage5;
+ [SerializeField] Transform m_Obj1;
+ [SerializeField] Transform m_Obj2;
+ [SerializeField] Transform m_PropertyPanel;
[SerializeField] UIEffect m_UIeffect2;//缁忛獙鏉＄壒鏁�
private int typePetID = 0;
private float timePlay = 0;//鐏靛疇鍔ㄤ綔鎾斁鏃堕棿
@@ -88,10 +94,7 @@
private void OnEnable()
{
timePlay = 0;
- Skillimage.Clear();
- Skillimage.Add(Skillimage1);
- Skillimage.Add(Skillimage2);
- Skillimage.Add(Skillimage3);
+
isAutoTrain = false;
breakLockBtn.AddListener(ClickBreakBtn);
petAutoTrainBtn.AddListener(ClickPetAutoTrainBtn);
@@ -172,6 +175,7 @@
{
Skillimage[i].SetActive(false);
}
+ SetPos(curPetSkillIds.Length);
for (int i = 0; i < curPetSkillIds.Length; i++)
{
if (i < Skillimage.Count)
@@ -603,6 +607,7 @@
public void ModelShow(int PetID)
{
+ SetSkillimage();
petmodel.curPetId = PetID;
isAutoTrain = false;
petInfoConfig = Config.Instance.Get<PetInfoConfig>(PetID);
@@ -716,6 +721,28 @@
FragmentUnlockTip.SetActive(false);
FullAttTip.SetActive(true);
}
+ private void SetSkillimage()
+ {
+ if (Skillimage.Count <= 0)
+ {
+ Skillimage.Add(Skillimage1);
+ Skillimage.Add(Skillimage2);
+ Skillimage.Add(Skillimage3);
+ Skillimage.Add(Skillimage4);
+ Skillimage.Add(Skillimage5);
+ }
+ }
+ private void SetPos(int count)
+ {
+ if (count > 4)
+ {
+ m_PropertyPanel.localPosition = m_Obj2.localPosition;
+ }
+ else
+ {
+ m_PropertyPanel.localPosition = m_Obj1.localPosition;
+ }
+ }
}
}
--
Gitblit v1.8.0