From e74178266e50d14b11ba40ad6d9c25bb3ae02173 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 16 四月 2019 21:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/GameActor/GA_Hero.cs | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index 3847181..2b29ea3 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -65,9 +65,11 @@
/// 鐢ㄦ埛鐐瑰嚮閿佸畾, 琚敾鍑婚攣瀹氭敾鍑昏��...
/// </summary>
private GActor m_LockTarget;
- public GActor LockTarget {
+ public GActor LockTarget
+ {
get { return m_LockTarget; }
- set {
+ set
+ {
if (m_LockTarget == value)
{
return;
@@ -89,11 +91,14 @@
public MapArea currentBossArea;
private uint _atkBossID;
- public uint atkBossID {
- get {
+ public uint atkBossID
+ {
+ get
+ {
return _atkBossID;
}
- set {
+ set
+ {
if (_atkBossID != value)
{
_atkBossID = value;
@@ -109,22 +114,28 @@
}
}
- public sealed override int NextAction {
- get {
+ public sealed override int NextAction
+ {
+ get
+ {
return base.NextAction;
}
- set {
+ set
+ {
base.NextAction = value;
}
}
- public sealed override GActor SelectTarget {
- get {
+ public sealed override GActor SelectTarget
+ {
+ get
+ {
return base.SelectTarget;
}
- set {
+ set
+ {
if (base.SelectTarget == value)
{
return;
@@ -144,6 +155,30 @@
}
base.SelectTarget = value;
+
+ if (PlayerDatas.Instance.baseData.AttackMode == (byte)E_AttackMode.Contest)
+ {
+ var _pkg = new CA202_tagCMSelectObj();
+ if (value == null)
+ {
+ _pkg.isSelect = 0;
+ }
+ else
+ {
+ _pkg.isSelect = 1;
+ _pkg.ID = value.ServerInstID;
+ _pkg.Type = (byte)value.ActorType;
+ }
+
+ if (CrossServerUtility.IsCrossServer())
+ {
+ GameNetSystem.Instance.SendToCrossServer(_pkg);
+ }
+ else
+ {
+ GameNetSystem.Instance.SendInfo(_pkg);
+ }
+ }
}
}
@@ -659,8 +694,10 @@
}
private HeavenBattleModel m_HeavenBattleModel = null;
- public HeavenBattleModel heavenBattleModel {
- get {
+ public HeavenBattleModel heavenBattleModel
+ {
+ get
+ {
return m_HeavenBattleModel ?? (m_HeavenBattleModel = ModelCenter.Instance.GetModel<HeavenBattleModel>());
}
}
@@ -753,11 +790,14 @@
#region 鍦板浘鍖哄煙鐩稿叧澶勭悊
private int m_CurMapArea = 1 << (int)MapArea.E_Type.Normal;
- public int CurMapArea {
- get {
+ public int CurMapArea
+ {
+ get
+ {
return m_CurMapArea;
}
- set {
+ set
+ {
m_CurMapArea = value;
}
}
--
Gitblit v1.8.0