From f5dfc8135aa8b217985ab38a65a2f7e7eee2c38d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 09 四月 2019 18:02:56 +0800
Subject: [PATCH] 3335 整理代码
---
System/MainInterfacePanel/HeadPortraitTip.cs | 230 +++++++++++++++++++--------------------------------------
1 files changed, 78 insertions(+), 152 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 6593336..e638f0e 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -14,7 +14,6 @@
public class HeadPortraitTip : MonoBehaviour
{
-
[SerializeField] Image _Head;//浜虹墿澶村儚
[SerializeField] Text _BuffNumber;//Buff鏁伴噺
[SerializeField] Text _VipNumber;//Vip绛夌骇
@@ -37,32 +36,20 @@
[SerializeField] UIEffect m_UieffectEmperor;//濞茬殗Buff
[SerializeField] Image m_Shield;//鎶ょ浘鏄剧ず
- private int _hp = 0;//鑾峰彇褰撳墠鐨勮閲�
- private int _maxHp = 0;//鑾峰彇鏈�澶ц閲�
- private int _fighting = 0;//鑾峰彇鎴樻枟锛�
- private int _ReincarnationLv = 0;//鑾峰彇杞敓绛夌骇
- private int _jobType = 0;//鑾峰彇椤界柧鑱屼笟
[SerializeField] Text _TimeTxt;//鏃堕棿
[SerializeField] Slider _BatterySlider;//鐢甸噺
[SerializeField] Image m_WifiImg;//Wife
[SerializeField] GameObject m_BatteryChong;//鍏呯數
- public float loadingTime = 1f;//鏃堕棿鍒锋柊
private float loadingtime = 0f;//榛樿鏃堕棿
- VipModel m_VipModel;
- VipModel vipModel { get { return m_VipModel ?? (m_VipModel = ModelCenter.Instance.GetModel<VipModel>()); } }
- BuffModel m_BuffModel;
- BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }
- PKModel m_PKModel;
- PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }
- PlayerMainDate m_MainModel;
- PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
- RolePromoteModel m_PromoteModel;
- RolePromoteModel promoteModel { get { return m_PromoteModel ?? (m_PromoteModel = ModelCenter.Instance.GetModel<RolePromoteModel>()); } }
- CapacityDelayModel m_CapacityDelayModel;
- CapacityDelayModel capacityDelayModel { get { return m_CapacityDelayModel ?? (m_CapacityDelayModel = ModelCenter.Instance.GetModel<CapacityDelayModel>()); } }
+
+ VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
+ BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
+ PKModel pKModel { get { return ModelCenter.Instance.GetModel<PKModel>(); } }
+ PlayerMainDate onMainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
+
private int vipExperienceSurplusTime = 0;
private int GetLv = 0;//鑾峰彇浜虹墿绛夌骇
public void Init()
@@ -73,31 +60,33 @@
TextSwitch(Buffmodel.PkType);
OnElectricQuantity();
OnNetworkState();
- RefreshVipActive();
SetShieldNumber();//璁剧疆鎶ょ浘鍊�
m_VipExperienceTween.Init();
_TimeTxt.text = DateTime.Now.ToString("HH:mm");
+ OnNetworkState();
+ onBatteryStateChanged(SDKUtility.Instance.ChargingType);
+ RefreshVipData();
+ EmperorBuffEvent();
+
+ _PatternBtn.SetListener(PatternButton);
+ _BuffBtn.SetListener(BuffButton);
+ _VIPBtn.onClick.AddListener(VIPButton);
+ _HeadBtn.onClick.AddListener(HeadButton);
+ _PromoteBtn.onClick.AddListener(OnPromoteBtn);
+
PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
PlayerDatas.Instance.OnSwitchAttackMode += OnSwitchAttackMode;
BuffModel.Even_ObjAddBuf += BuffGameObject;
BuffModel.Even_ObjDelBuff += BuffGameObject;
PlayerMainDate.ElectricQuantityEvent += OnElectricQuantity;
- OnNetworkState();
PlayerMainDate.NetworkStateEvent += OnNetworkState;
- UIEventTrigger.Get(_PatternBtn.gameObject).OnUp = PatternButton;
- UIEventTrigger.Get(_BuffBtn.gameObject).OnUp = BuffButton;
TimeMgr.Instance.OnSyntonyEvent += OnSyntonyEvent;
- onBatteryStateChanged(SDKUtility.Instance.ChargingType);
SDKUtility.Instance.OnChargingTypeChanged += onBatteryStateChanged;
vipModel.OnVipTimeEvent += RefreshVipData;
PlayerMainDate.EmperorBuffEvent += EmperorBuffEvent;
- _VIPBtn.onClick.AddListener(VIPButton);
- _HeadBtn.onClick.AddListener(HeadButton);
- _PromoteBtn.onClick.AddListener(OnPromoteBtn);
- RefreshVipData();
- EmperorBuffEvent();
- bool IsBossBool = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
- if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool)//鍏充簬閫嶉仴鍩庣姸鎬佺殑鐗规畩澶勭悊
+
+ var inBossArea = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && !inBossArea)//鍏充簬閫嶉仴鍩庣姸鎬佺殑鐗规畩澶勭悊
{
if (Buffmodel.PkType != onMainModel.AreaState)
{
@@ -119,9 +108,10 @@
SDKUtility.Instance.OnChargingTypeChanged -= onBatteryStateChanged;
vipModel.OnVipTimeEvent -= RefreshVipData;
PlayerMainDate.EmperorBuffEvent -= EmperorBuffEvent;
- _VIPBtn.onClick.RemoveAllListeners();
- _HeadBtn.onClick.RemoveAllListeners();
- _PromoteBtn.onClick.RemoveAllListeners();
+
+ _VIPBtn.RemoveAllListeners();
+ _HeadBtn.RemoveAllListeners();
+ _PromoteBtn.RemoveAllListeners();
m_VipExperienceTween.UnInit();
}
@@ -134,7 +124,6 @@
m_UieffectEmperor.Play();
}
}
-
}
private void CloseEmperorBufEffect()
@@ -151,20 +140,8 @@
private void onBatteryStateChanged(SDKUtility.E_ChargingType arg0)
{
- switch ((int)arg0)
- {
- case 0:
- case 1:
- m_BatteryChong.SetActive(false);
- break;
- case 2:
- case 3:
- m_BatteryChong.SetActive(true);
- break;
- default:
- m_BatteryChong.SetActive(false);
- break;
- }
+ m_BatteryChong.gameObject.SetActive(arg0 == SDKUtility.E_ChargingType.ChargingFull
+ || arg0 == SDKUtility.E_ChargingType.Charging);
}
private void OnNetworkState()
@@ -179,11 +156,11 @@
{
m_WifiImg.SetSprite("MainInterfaceWifiIcon3");
}
- else if (onMainModel.WifiSignal > 1 && onMainModel.WifiSignal <= 3)
+ else if (onMainModel.WifiSignal <= 3)
{
m_WifiImg.SetSprite("MainInterfaceWifiIcon2");
}
- else if (onMainModel.WifiSignal > 3)
+ else
{
m_WifiImg.SetSprite("MainInterfaceWifiIcon");
}
@@ -202,9 +179,9 @@
private void OnSwitchAttackMode(E_AttackMode obj)//PK鐘舵�佸垏鎹�
{
TextSwitch((int)obj);
-
}
- void PatternButton(GameObject obj)
+
+ void PatternButton()
{
int mapID = PlayerDatas.Instance.baseData.MapID;
var config = MapConfig.Get(mapID);
@@ -229,12 +206,12 @@
return;
}
-
if (onMainModel.ShieldedArea.Contains(mapID))//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
return;
}
+
if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
@@ -252,32 +229,28 @@
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
}
}
+
void TextSwitch(int _EnumType)
{
- Image _PkImage = _PatternBtn.GetComponent<Image>();
+ var _PkImage = _PatternBtn.GetComponent<Image>();
switch (_EnumType)
{
case 0:
Buffmodel.PkType = 0;
_PkImage.SetSprite("Atk_Peace");//鍜屽钩
-
break;
case 1:
Buffmodel.PkType = 1;
_PkImage.SetSprite("Atk_All");//鍏ㄤ綋
-
break;
case 2:
Buffmodel.PkType = 2;
-
break;
case 3:
Buffmodel.PkType = 3;
-
break;
case 4:
Buffmodel.PkType = 4;
-
break;
case 5:
Buffmodel.PkType = 5;
@@ -299,7 +272,7 @@
}
}
- void BuffButton(GameObject obj)
+ void BuffButton()
{
CloseEmperorBufEffect();
WindowCenter.Instance.Open<BuffListWin>();
@@ -315,14 +288,6 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<VipRechargeWin>(false, 1);
}
-
- void CombatButton()
- {
- // DesignDebug.Log("鎴樻枟鍔涙彁鍗�");
-
- SysNotifyMgr.Instance.ShowTip("UnopenedFunction");
- }
-
void HeadButton()
{
@@ -346,45 +311,25 @@
_BuffBtn.gameObject.SetActive(true);
_BuffNumber.text = Count.ToString();
}
-
}
void Initialize()//鍏充簬鏁版嵁鐨勫垵濮嬪寲
{
GetLv = PlayerDatas.Instance.baseData.LV;
_LVText.text = PlayerDatas.Instance.baseData.LV.ToString();//绛夌骇鐨勫垵濮嬪寲
- _Hp_number.text = PlayerDatas.Instance.baseData.HP.ToString() + "/" + PlayerDatas.Instance.extersion.MaxHP.ToString();//浜虹墿琛�閲忕殑鍒濆鍖�
- _hp = (int)PlayerDatas.Instance.baseData.HP;
- _maxHp = (int)PlayerDatas.Instance.extersion.MaxHP;
- if (_maxHp > 0)
- {
- _HPSlider.value = (float)Math.Round((float)_hp / _maxHp, 2, MidpointRounding.AwayFromZero);//琛�鏉＄殑鍒濆鍖�
- }
- else
- {
- _HPSlider.value = 1f;
- }
- _fighting = (int)PlayerDatas.Instance.baseData.FightPoint;
+
+ DisplayHp();
_PowerNumbern.text = PlayerDatas.Instance.baseData.FightPoint.ToString();
- _jobType = (int)PlayerDatas.Instance.baseData.Job;
- HeadImage(PlayerDatas.Instance.baseData.Job, 0);//瑙掕壊澶村儚鍒濆鍖�
- JobTitle(PlayerDatas.Instance.baseData.Job, 1);
- VipImage(PlayerDatas.Instance.baseData.VIPLv);//鑾峰彇Vip绛夌骇涓旇祴鍊�
+ DisplayHead(PlayerDatas.Instance.baseData.Job, 0);//瑙掕壊澶村儚鍒濆鍖�
+ DisplayVip(PlayerDatas.Instance.baseData.VIPLv);//鑾峰彇Vip绛夌骇涓旇祴鍊�
}
- void OnFightHpChange(uint hp)
- {
- _hp = (int)hp;
- _Hp_number.text = _hp.ToString() + "/" + _maxHp.ToString();
- _HPSlider.value = (float)Math.Round((float)_hp / _maxHp, 2, MidpointRounding.AwayFromZero);//琛�閲忔潯
- }
- void Updatefighting(PlayerDataType _tCDBPlayerRefresh)//鏁版嵁鐨勫埛鏂�
+ void Updatefighting(PlayerDataType type)//鏁版嵁鐨勫埛鏂�
{
- switch (_tCDBPlayerRefresh)
+ switch (type)
{
case PlayerDataType.FightPower://鎴樻枟鍔涚殑鍒锋柊83
- _fighting = (int)PlayerDatas.Instance.baseData.FightPoint;
_PowerNumbern.text = PlayerDatas.Instance.baseData.FightPoint.ToString();
break;
case PlayerDataType.LV://绛夌骇鐨勫埛鏂�8
@@ -396,25 +341,11 @@
}
break;
case PlayerDataType.MaxHP://鏈�澶ц閲忕殑鍒锋柊28
- _maxHp = (int)PlayerDatas.Instance.extersion.MaxHP;
- _Hp_number.text = _hp.ToString() + "/" + _maxHp.ToString();
- _HPSlider.value = (float)Math.Round((float)_hp / _maxHp, 2, MidpointRounding.AwayFromZero);//琛�閲忔潯
- break;
case PlayerDataType.HP://褰撳墠琛�閲�29
- _hp = (int)PlayerDatas.Instance.baseData.HP;
- _Hp_number.text = _hp.ToString() + "/" + _maxHp.ToString();
- _HPSlider.value = (float)Math.Round((float)_hp / _maxHp, 2, MidpointRounding.AwayFromZero);//琛�閲忔潯
+ DisplayHp();
break;
case PlayerDataType.VIPLv://鍏充簬VIP绛夌骇鐨勫埛鏂�
- RefreshVipActive();
- VipImage((int)PlayerDatas.Instance.baseData.VIPLv);
- break;
- case PlayerDataType.Job://鐜╁鑱屼笟
- _jobType = (int)PlayerDatas.Instance.baseData.Job;
- JobTitle(_jobType, _ReincarnationLv);
- break;
- case PlayerDataType.ExAttr1://鑾峰彇杞敓绛夌骇
- JobTitle(_jobType, 1);
+ DisplayVip((int)PlayerDatas.Instance.baseData.VIPLv);
break;
case PlayerDataType.ExAttr4://褰撳墠鎶ょ浘鍊�
SetShieldNumber();
@@ -427,41 +358,43 @@
}
}
-
- void HeadImage(int _jobID, int _ReincarnationLv)//鍏充簬浜虹墿澶村儚鐨勮祴鍊�
+ void DisplayHead(int _jobID, int _ReincarnationLv)//鍏充簬浜虹墿澶村儚鐨勮祴鍊�
{
-
_Head.SetSprite(GeneralDefine.GetJobHeadPortrait(_jobID, _ReincarnationLv));
-
}
- void VipImage(int _vipID)//鑾峰彇Vip绛夌骇涓旇祴鍊�
+ void DisplayVip(int _vipID)//鑾峰彇Vip绛夌骇涓旇祴鍊�
{
_VipNumber.text = vipModel.IsVipExperience() ? "1" : _vipID.ToString();
}
- void JobTitle(int _Job, int _ReincarnationLv)//鑱屼笟鍚嶇О
+ private void DisplayHp()
{
- string str = _Job + "0" + _ReincarnationLv;
- int JobName = int.Parse(str);
- string Name = "";
- if (JobNameConfig.Get(JobName) != null)
+ var hp = (int)PlayerDatas.Instance.baseData.HP;
+ var maxHp = (int)PlayerDatas.Instance.extersion.MaxHP;
+ _Hp_number.text = StringUtility.Contact(hp, "/", maxHp);
+
+ if (maxHp > 0)
{
- Name = JobNameConfig.Get(JobName).name;
+ _HPSlider.value = (float)hp / maxHp;//琛�鏉＄殑鍒濆鍖�
+ }
+ else
+ {
+ _HPSlider.value = 1f;
}
}
private void RefreshVipData()
{
- RefreshVipActive();
- var _hero = PlayerDatas.Instance.hero;
- bool _lifeBarShow = false;
- VipImage(PlayerDatas.Instance.baseData.VIPLv);
- if (_hero != null && _hero.SelectTarget != null)
+ var hero = PlayerDatas.Instance.hero;
+ var lifeBarShow = false;
+ DisplayVip(PlayerDatas.Instance.baseData.VIPLv);
+ if (hero != null && hero.SelectTarget != null)
{
- _lifeBarShow = (_hero.SelectTarget is GA_NpcFightBoss) || (_hero.SelectTarget is GA_NpcClientFightBoss);
+ lifeBarShow = (hero.SelectTarget is GA_NpcFightBoss) || (hero.SelectTarget is GA_NpcClientFightBoss);
}
- vipExperienceImg.gameObject.SetActive(vipModel.IsVipExperience() && !_lifeBarShow);
+
+ vipExperienceImg.gameObject.SetActive(vipModel.IsVipExperience() && !lifeBarShow);
vipExperienceSurplusTime = Mathf.Max(0, (int)(vipModel.vipExperienceOverdue - TimeUtility.ServerNow).TotalSeconds);
if (vipExperienceSurplusTime > 0)
{
@@ -479,60 +412,53 @@
{
if (_type == TimeMgr.SyntonyType.VipExperirnceOverdue)
{
- RefreshVipActive();
- VipImage(PlayerDatas.Instance.baseData.VIPLv);
+ DisplayVip(PlayerDatas.Instance.baseData.VIPLv);
}
- }
-
- private void RefreshVipActive()
- {
- // _VipNumber.material = (vipModel.IsVipActive() || vipModel.IsVipExperience()) ?
- // MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
- // _VIPBtn.image.material = (vipModel.IsVipActive() || vipModel.IsVipExperience()) ?
- // MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
}
private void LateUpdate()
{
loadingtime += Time.deltaTime;
- if (loadingtime >= loadingTime)
+ if (loadingtime >= 1f)
{
_TimeTxt.text = DateTime.Now.ToString("HH:mm");
loadingtime = 0f;
}
+
if (vipExperienceSurplusTime <= 0)
- return;
- var _surplusTime = Mathf.Max(0, (int)(vipModel.vipExperienceOverdue - TimeUtility.ServerNow).TotalSeconds);
- if (vipExperienceSurplusTime != _surplusTime)
{
- vipExperienceSurplusTime = _surplusTime;
+ return;
+ }
+
+ var surplusTime = Mathf.Max(0, (int)(vipModel.vipExperienceOverdue - TimeUtility.ServerNow).TotalSeconds);
+ if (vipExperienceSurplusTime != surplusTime)
+ {
+ vipExperienceSurplusTime = surplusTime;
RefreshVipExperienceTime();
}
+
if (vipExperienceSurplusTime == 0)
{
RefreshVipData();
}
-
}
+
private void SetShieldNumber()//鎶ょ浘鍊艰缃�
{
if (PlayerDatas.Instance.extersion.MaxProDef != 0)
{
- int MaxProDef = PlayerDatas.Instance.extersion.MaxProDef;//鏈�澶у��
- int ExAttr4 = (int)PlayerDatas.Instance.baseData.shield;//褰撳墠鍊�
- float fillAmount = (float)Math.Round((double)ExAttr4 / MaxProDef, 2, MidpointRounding.AwayFromZero);
+ var MaxProDef = PlayerDatas.Instance.extersion.MaxProDef;//鏈�澶у��
+ var ExAttr4 = (int)PlayerDatas.Instance.baseData.shield;//褰撳墠鍊�
+ var fillAmount = (float)ExAttr4 / MaxProDef;
m_Shield.fillAmount = fillAmount;
}
else
{
m_Shield.fillAmount = 0f;
}
-
}
+
}
-
-
-
}
--
Gitblit v1.8.0