From 46c87911062b29fab8995ac9bc483b1d8981f5b2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 18 九月 2018 10:11:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/GameActor/GActorPlayerBase.cs | 80 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index b27dfd1..be51c4d 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -84,10 +84,7 @@
}
}
- public bool IsPolyMorph { get; private set; }
- private GameObject m_SheepModel;
- private bool m_SheepIsDefaultNpc;
- public virtual void Polymorph(bool doOrNo)
+ public sealed override void Polymorph(bool doOrNo, int npcID)
{
IsPolyMorph = doOrNo;
@@ -108,7 +105,7 @@
}
m_SheepIsDefaultNpc = false;
- var _p = InstanceResourcesLoader.LoadNpc(10101001);
+ var _p = InstanceResourcesLoader.LoadNpc(npcID);
if (_p == null)
{
_p = InstanceResourcesLoader.LoadDefaultFightNPC();
@@ -162,6 +159,42 @@
m_ClothesAnimator.enabled = true;
m_ClothesAnimator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID);
m_ClothesAnimator.SetInteger(GAStaticDefine.Param_MoveState, (int)E_MovingState.Normal);
+ }
+ }
+
+ protected sealed override void ChangeBinderToRoot()
+ {
+ if (MP_Name != m_ClothesModel.transform)
+ {
+ MP_Name.SetParent(Root);
+ }
+
+ if (MP_Hit != m_ClothesModel.transform)
+ {
+ MP_Hit.SetParent(Root);
+ }
+
+ if (MP_Stun != m_ClothesModel.transform)
+ {
+ MP_Stun.SetParent(Root);
+ }
+ }
+
+ protected sealed override void ChangeBinderToClothes()
+ {
+ if (MP_Name != m_ClothesModel.transform)
+ {
+ MP_Name.SetParent(m_ClothesModel.transform);
+ }
+
+ if (MP_Hit != m_ClothesModel.transform)
+ {
+ MP_Hit.SetParent(m_ClothesModel.transform);
+ }
+
+ if (MP_Stun != m_ClothesModel.transform)
+ {
+ MP_Stun.SetParent(m_ClothesModel.transform);
}
}
@@ -2196,43 +2229,6 @@
}
}
-
- private void ChangeBinderToClothes()
- {
- if (MP_Name != m_ClothesModel.transform)
- {
- MP_Name.SetParent(m_ClothesModel.transform);
- }
-
- if (MP_Hit != m_ClothesModel.transform)
- {
- MP_Hit.SetParent(m_ClothesModel.transform);
- }
-
- if (MP_Stun != m_ClothesModel.transform)
- {
- MP_Stun.SetParent(m_ClothesModel.transform);
- }
- }
-
- private void ChangeBinderToRoot()
- {
- if (MP_Name != m_ClothesModel.transform)
- {
- MP_Name.SetParent(Root);
- }
-
- if (MP_Hit != m_ClothesModel.transform)
- {
- MP_Hit.SetParent(Root);
- }
-
- if (MP_Stun != m_ClothesModel.transform)
- {
- MP_Stun.SetParent(Root);
- }
- }
-
/// <summary>
/// 鍒ゆ柇鎶�鑳芥槸鍚﹀彲浠ヨ鎵撴柇
--
Gitblit v1.8.0