From c2d2d5d3a840bf50968b3f95e304929bc62a7b70 Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期五, 03 八月 2018 21:02:26 +0800
Subject: [PATCH] 更新代码
---
Fight/GameActor/GActorPlayerBase.cs | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index ceac212..ece4454 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -24,9 +24,11 @@
public int EquipSuitID { get; private set; }
private E_MovingState m_MovingState;
- public E_MovingState MovingState {
+ public E_MovingState MovingState
+ {
get { return m_MovingState; }
- private set {
+ private set
+ {
m_MovingState = value;
// Debug.LogFormat("璁剧疆 {0} 鐨勭Щ鍔ㄧ姸鎬佷负 {1}", ServerInstID, value);
}
@@ -40,8 +42,10 @@
public JobSetupConfig JobSetup { get; protected set; }
- public override int NextAction {
- get {
+ public override int NextAction
+ {
+ get
+ {
if (!m_ClothesAnimator)
{
return -1;
@@ -49,7 +53,8 @@
return m_ClothesAnimator.GetInteger(GAStaticDefine.Param_Action);
}
- set {
+ set
+ {
if (m_ClothesAnimator)
{
m_ClothesAnimator.SetInteger(GAStaticDefine.Param_Action, value);
@@ -1157,13 +1162,16 @@
}
private PlayerSuitModel _suitModel;
- private PlayerSuitModel SuitModel {
+ private PlayerSuitModel SuitModel
+ {
get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); }
}
private PlayerPackModel m_PlayerBackModel;
- private PlayerPackModel PlayerBackModel {
- get {
+ private PlayerPackModel PlayerBackModel
+ {
+ get
+ {
return m_PlayerBackModel ?? (m_PlayerBackModel = ModelCenter.Instance.GetModel<PlayerPackModel>());
}
}
@@ -2000,6 +2008,14 @@
}
RequestShadow();
+
+ var _equipModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip);
+ var _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal);
+
+ if (_itemModel != null)
+ {
+ SwitchGuard((uint)_itemModel.itemInfo.ItemID);
+ }
}
else
{
@@ -2040,6 +2056,8 @@
m_HeadUpName.target = MP_Name;
}
+ SwitchGuard(0);
+
ReleaseShadow();
}
@@ -2048,6 +2066,8 @@
{
_pet.ShowOrHideModel(showOrHide);
}
+
+
ShowOrHide = showOrHide;
}
@@ -2110,8 +2130,10 @@
#region 鎴樺墠鍐查攱
private bool m_IsRushing = false;
- public bool IsRushing {
- get {
+ public bool IsRushing
+ {
+ get
+ {
return m_IsRushing;
}
}
--
Gitblit v1.8.0