From 693dd6230f1ea7532d73d9ab643ce3be13eef95f Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 13 十二月 2018 16:29:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Mount/MountPanelAssignment.cs | 23 +++++++++++++++++++----
System/Pet/PetAttributeMethods.cs | 22 +++++++++++++++++-----
2 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/System/Mount/MountPanelAssignment.cs b/System/Mount/MountPanelAssignment.cs
index 8d228b1..3fffaa8 100644
--- a/System/Mount/MountPanelAssignment.cs
+++ b/System/Mount/MountPanelAssignment.cs
@@ -58,6 +58,10 @@
GameObject Skillimage2;
[SerializeField]
GameObject Skillimage3;
+ [SerializeField]
+ GameObject Skillimage4;
+ [SerializeField]
+ GameObject Skillimage5;
private float timePlay = 0;//鍧愰獞鍔ㄤ綔鎾斁鏃堕棿
List<GameObject> Skillimage = new List<GameObject>();
@@ -77,10 +81,7 @@
private int pitchOnHorseID = 0;
private void Start()
{
- Skillimage.Clear();
- Skillimage.Add(Skillimage1);
- Skillimage.Add(Skillimage2);
- Skillimage.Add(Skillimage3);
+
m_NotUnlockButton.AddListener(OnClickNotUnlockButton);
}
private void OnEnable()
@@ -175,6 +176,7 @@
}
public void PanelAssignment(int mountID)
{
+ SetSkillimage();
pitchOnHorseID = mountID;
MountAttribute(mountID);
PanelClassify(mountID);
@@ -595,6 +597,19 @@
}
return fightNum;
}
+
+ private void SetSkillimage()
+ {
+ if (Skillimage.Count <= 0)
+ {
+ Skillimage.Clear();
+ Skillimage.Add(Skillimage1);
+ Skillimage.Add(Skillimage2);
+ Skillimage.Add(Skillimage3);
+ Skillimage.Add(Skillimage4);
+ Skillimage.Add(Skillimage5);
+ }
+ }
}
}
diff --git a/System/Pet/PetAttributeMethods.cs b/System/Pet/PetAttributeMethods.cs
index ca23f74..87de244 100644
--- a/System/Pet/PetAttributeMethods.cs
+++ b/System/Pet/PetAttributeMethods.cs
@@ -72,7 +72,10 @@
GameObject Skillimage2;
[SerializeField]
GameObject Skillimage3;
-
+ [SerializeField]
+ GameObject Skillimage4;
+ [SerializeField]
+ GameObject Skillimage5;
[SerializeField] UIEffect m_UIeffect2;//缁忛獙鏉＄壒鏁�
private int typePetID = 0;
private float timePlay = 0;//鐏靛疇鍔ㄤ綔鎾斁鏃堕棿
@@ -88,10 +91,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);
@@ -603,6 +603,7 @@
public void ModelShow(int PetID)
{
+ SetSkillimage();
petmodel.curPetId = PetID;
isAutoTrain = false;
petInfoConfig = Config.Instance.Get<PetInfoConfig>(PetID);
@@ -716,6 +717,17 @@
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);
+ }
+ }
}
}
--
Gitblit v1.8.0