From 2b783e434f8ee83cc1b5970a3be678ed8335ac55 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 05 一月 2019 14:53:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Utility/RuntimeLogUtility.cs | 3
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs | 12 ++
Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs | 12 ++
Core/SDK/SDKUtility.cs | 14 +++
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs | 6 +
Fight/Actor/AI/HeroAI_Base.cs | 2
Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs.meta | 12 +++
Core/GameEngine/Model/Player/PlayerDatas.cs | 5 -
System/CrossServerOneVsOne/FightingPKWin.cs | 14 +++
Fight/PrepareHandler.cs | 8 ++
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 24 ++++++
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs | 5 +
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 39 ++++++++-
Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs | 5 +
Fight/Actor/AI/HeroAI_Auto.cs | 18 ++++
Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs | 15 +++
16 files changed, 177 insertions(+), 17 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index c28b6e2..3cf2167 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -64,8 +64,10 @@
public int BasicsDefense;//鍩虹闃插尽
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
- public long treasurePotentialSp {
- get {
+ public long treasurePotentialSp
+ {
+ get
+ {
return ExAttr8 * (long)100000000 + ExAttr7;
}
}
@@ -91,10 +93,6 @@
ExpPoint = _serverInfo.ExpPoint;
TotalExp = _serverInfo.TotalExp;
Family = _serverInfo.Family;
- if (PlayerDatas.Instance. hero != null)
- {
- PlayerDatas.Instance.hero.ActorInfo.familyID = Family;
- }
FamilyName = _serverInfo.FamilyName.Trim().Replace(" ", "");
Gold = _serverInfo.Gold;
GoldPaper = _serverInfo.GoldPaper;
@@ -104,7 +102,6 @@
PosX = _serverInfo.PosX;
PosY = _serverInfo.PosY;
State = _serverInfo.State;
- HP = _serverInfo.HP;
XP = _serverInfo.XP;
FreePoint = _serverInfo.FreePoint;
FreeSkillPoint = _serverInfo.FreeSkillPoint;
@@ -139,6 +136,34 @@
godWeaponLV_3 = (int)_serverInfo.ExAttr17;
godWeaponLV_4 = (int)_serverInfo.ExAttr18;
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ HP = _serverInfo.HP;
+ }
+ }
+ else
+ {
+ HP = _serverInfo.HP;
+ }
+
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.familyID = Family;
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_serverInfo.HP);
+ }
+ }
+ else
+ {
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_serverInfo.HP);
+ }
+ }
+
if (_serverInfo.socketType == GameNetSystem.SocketType.Main)
{
mainServerDataBuf.PlayerName = PlayerName;
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index 822311c..b3d87ee 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -295,11 +295,6 @@
break;
case PlayerDataRefresh.HP:
baseData.HP = value;
- if (hero != null)
- {
- hero.ActorInfo.SyncServerHp = value;
- hero.ActorInfo.ResetHp((int)value);
- }
baseData.RecordMainServerData(isMainServerData, _type, value);
break;
case PlayerDataRefresh.MaxMP:
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs
new file mode 100644
index 0000000..4309d3f
--- /dev/null
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs
@@ -0,0 +1,15 @@
+锘縰sing UnityEngine;
+using System.Collections;
+
+// A8 06 鏌ヨ鍏呭�肩粨鏋� #tagCMQueryRecharge
+
+public class CA806_tagCMQueryRecharge : GameNetPackBasic {
+
+ public CA806_tagCMQueryRecharge () {
+ combineCmd = (ushort)0x03FE;
+ _cmd = (ushort)0xA806;
+ }
+
+ public override void WriteToBytes () {
+ }
+}
\ No newline at end of file
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs.meta
new file mode 100644
index 0000000..a8c3bd9
--- /dev/null
+++ b/Core/NetworkPackage/ClientPack/ClientToMapServer/CA8_VIP/CA806_tagCMQueryRecharge.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 4df34e8c1837d9446b8c6bd9cf117179
+timeCreated: 1546668972
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
index 34f9ce6..490dc4a 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -35,6 +35,30 @@
OpponentInformation.Instance.GetOpponentInformation0418(vNetData);//鐢ㄤ簬鑾峰彇鐜╁鎶ょ浘灞炴��
if (PlayerDatas.Instance.PlayerId == vNetData.ObjID)
{
+ if ((PlayerDataRefresh)vNetData.ObjType == PlayerDataRefresh.HP)
+ {
+ bool _sync = false;
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (vNetData.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ _sync = true;
+ }
+ }
+ else
+ {
+ _sync = true;
+ }
+
+ if (_sync)
+ {
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.SyncServerHp = vNetData.Value;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)vNetData.Value);
+ }
+ }
+ }
PlayerDatas.Instance.RefreshPlayerData(vNetData);
}
else
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs
index 006cfdb..eed2a22 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs
@@ -46,6 +46,11 @@
if (vNetData.ObjID == PlayerDatas.Instance.PlayerId)
{
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.SyncServerHp = vNetData.HP;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)vNetData.HP);
+ }
PlayerDatas.Instance.FightRefreshPlayerHp(vNetData.HP);
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs
index 91698c5..c45fd11 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs
@@ -56,6 +56,12 @@
PlayerDatas.Instance.hero.Behaviour.StopHandupAI();
PlayerDatas.Instance.hero.Behaviour.StopKillUntilDieAI();
}
+
+ if (_hero != null)
+ {
+ _hero.ActorInfo.SyncServerHp = 0;
+ _hero.ActorInfo.ResetHp(0);
+ }
PlayerDatas.Instance.FightRefreshPlayerHp(0);
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
index cebe348..ef7b0eb 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -306,6 +306,11 @@
{
if (_sTarget.ObjID == PlayerDatas.Instance.PlayerId)
{
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.SyncServerHp = _sTarget.CurHP;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_sTarget.CurHP);
+ }
PlayerDatas.Instance.FightRefreshPlayerHp(_sTarget.CurHP);
}
else
@@ -467,7 +472,7 @@
#endif
// 璺ㄦ湇绔炴妧鍦轰笉妫�娴嬪弽鍑婚�昏緫
- if(CrossServerRewardModel.IsCrossServerOneVsOne())
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
{
return;
}
@@ -684,6 +689,11 @@
{
if (_sTarget.ObjID == PlayerDatas.Instance.PlayerId)
{
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.SyncServerHp = _sTarget.CurHP;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_sTarget.CurHP);
+ }
PlayerDatas.Instance.FightRefreshPlayerHp(_sTarget.CurHP);
}
else
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs
index eb60d59..390b6fb 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs
@@ -27,7 +27,17 @@
if (objId == PlayerDatas.Instance.PlayerId)
{
- PlayerDatas.Instance.RefreshPlayerData(vNetDatas);
+ if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ {
+ if (vNetDatas.socketType == GameNetSystem.SocketType.CrossSever)
+ {
+ PlayerDatas.Instance.RefreshPlayerData(vNetDatas);
+ }
+ }
+ else
+ {
+ PlayerDatas.Instance.RefreshPlayerData(vNetDatas);
+ }
}
else
{
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
index b875cf77..54385bf 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
@@ -229,6 +229,11 @@
if (_sTarget.ObjID == PlayerDatas.Instance.PlayerId)
{
PlayerDatas.Instance.FightRefreshPlayerHp(_sTarget.CurHP);
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.SyncServerHp = _sTarget.CurHP;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)_sTarget.CurHP);
+ }
}
else
{
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index 8cd277a..118a972 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -29,11 +29,13 @@
public E_ChannelPlatform ChannelPlatform { get; set; }
- public static string Yj_AppID {
+ public static string Yj_AppID
+ {
get; private set;
}
- public static string Yj_SpID {
+ public static string Yj_SpID
+ {
get; private set;
}
@@ -496,6 +498,7 @@
{
onFreePlatformPayOk();
}
+ SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
break;
case CodeA2U.FreePlatformPayFail:
if (onFreePlatformPayFail != null)
@@ -756,6 +759,13 @@
private Dictionary<string, string> m_PaymentTable = new Dictionary<string, string>();
private string m_EncodeKey = "03sujm7gerywdvyd5vkkk772rs4by230";
+ private IEnumerator DelayQueryRecharge()
+ {
+ yield return WaitingForSecondConst.WaitMS60000;
+ var _package = new CA806_tagCMQueryRecharge();
+ GameNetSystem.Instance.SendInfo(_package);
+ }
+
/// <summary>
/// 鑷敱SDK鏀粯 fixed sdk 鏀粯閫昏緫淇敼
/// </summary>
diff --git a/Fight/Actor/AI/HeroAI_Auto.cs b/Fight/Actor/AI/HeroAI_Auto.cs
index 6ffcfc7..84e9360 100644
--- a/Fight/Actor/AI/HeroAI_Auto.cs
+++ b/Fight/Actor/AI/HeroAI_Auto.cs
@@ -119,6 +119,7 @@
if (!DTC0403_tagPlayerLoginLoadOK.finishedLogin)
{
Debug.LogWarning("鐧婚檰娴佺▼灏氭湭瀹屾垚");
+ stopReason = 1;
return;
}
@@ -126,6 +127,7 @@
if (_hero.IsPolyMorph)
{
+ stopReason = 2;
return;
}
@@ -141,6 +143,7 @@
if (_hero == null || _hero.ActorInfo.serverDie)
{
+ stopReason = 3;
return;
}
@@ -149,12 +152,14 @@
{
if (_hero.heavenBattleModel.IsBattlePrepare)
{
+ stopReason = 4;
return;
}
}
if (_hero.IsCollect() && m_UserClickSkillID <= 0)
{
+ stopReason = 5;
return;
}
@@ -172,6 +177,7 @@
_hero.SkillMgr.DoingPrepareSkill = false;
}
}
+ stopReason = 6;
return;
}
}
@@ -179,6 +185,7 @@
// 閲婃斁澶勪簬閲婃斁闇�瑕侀澶囩殑鎶�鑳界姸鎬佷笅
if (_hero.SkillMgr.DoingPrepareSkill)
{
+ stopReason = 7;
return;
}
@@ -191,6 +198,7 @@
// 鎸傛満鐘舵�佷笅绛夊緟鎷惧彇瑁呭
if (WaitForPickup())
{
+ stopReason = 8;
return;
}
@@ -202,6 +210,7 @@
// 瀛愮被鏈夎嚜宸遍渶瑕佸湪鎶�鑳介噴鏀惧墠澶勭悊鐨勯�昏緫
if (OnUpdate())
{
+ stopReason = 9;
return;
}
}
@@ -211,6 +220,7 @@
// 瀛愮被鏈夎嚜宸遍渶瑕佸湪鎶�鑳介噴鏀惧墠澶勭悊鐨勯�昏緫
if (OnUpdate())
{
+ stopReason = 10;
return;
}
}
@@ -225,6 +235,7 @@
if (MathUtility.DistanceSqrtXZ(_hero.Pos, m_TargetPos) > 0.25f)
{
_hero.MoveToPosition(m_TargetPos);
+ stopReason = 11;
return;
}
}
@@ -242,6 +253,7 @@
// 鏄惁澶勪簬鏀诲嚮闂撮殧
if (Time.realtimeSinceStartup - m_LastUseSkillTime < (1f / _hero.ActorInfo.atkSpeed))
{
+ stopReason = 12;
return;
}
@@ -263,6 +275,7 @@
if (_skill == null)
{
+ stopReason = 13;
return;
}
@@ -303,12 +316,14 @@
_hero.Behaviour.DoAttack(_skill);
m_DecideSkill = null;
m_UserClickSkillID = -1;
+ stopReason = 14;
return;
}
if (_atkTarget == null || !_atkTarget.CanAtked())
{
_hero.StopRush();
+ stopReason = 15;
return;
}
@@ -326,6 +341,7 @@
if ((StatusMgr.IsValid()
&& !StatusMgr.Instance.CanMove(_hero.ServerInstID)))
{
+ stopReason = 16;
return;
}
@@ -338,6 +354,7 @@
_hero.StartRush();
}
+ stopReason = 17;
return;
}
@@ -376,6 +393,7 @@
}
}
+ stopReason = 255;
m_LastUseSkillTime = Time.realtimeSinceStartup;
}
diff --git a/Fight/Actor/AI/HeroAI_Base.cs b/Fight/Actor/AI/HeroAI_Base.cs
index dad7b0c..d08328a 100644
--- a/Fight/Actor/AI/HeroAI_Base.cs
+++ b/Fight/Actor/AI/HeroAI_Base.cs
@@ -8,6 +8,8 @@
public abstract class HeroAI_Base
{
+ public static byte stopReason = 0;
+
private SkillModel m_SkillModel;
private SkillModel skillModel
{
diff --git a/Fight/PrepareHandler.cs b/Fight/PrepareHandler.cs
index c41e97c..ac0683b 100644
--- a/Fight/PrepareHandler.cs
+++ b/Fight/PrepareHandler.cs
@@ -118,6 +118,14 @@
_player.Collect();
}
}
+
+ if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
+ {
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
+ }
+ }
break;
case E_PrepareType.pstCatchPet:
diff --git a/System/CrossServerOneVsOne/FightingPKWin.cs b/System/CrossServerOneVsOne/FightingPKWin.cs
index 20e3f98..0b1d1c3 100644
--- a/System/CrossServerOneVsOne/FightingPKWin.cs
+++ b/System/CrossServerOneVsOne/FightingPKWin.cs
@@ -67,6 +67,10 @@
CrossServerRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
GA_Player.s_OnRefreshLife += OnRefreshPlayerLifeBar;
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.OnHpChange += OnHeroHpChanged;
+ }
_MyBuffSortList.Clear();
_OpponentBuffSortList.Clear();
SetScoreText();
@@ -108,6 +112,10 @@
{
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
GA_Player.s_OnRefreshLife -= OnRefreshPlayerLifeBar;
+ if (PlayerDatas.Instance.hero != null)
+ {
+ PlayerDatas.Instance.hero.ActorInfo.OnHpChange -= OnHeroHpChanged;
+ }
HeroBehaviour.OnStopHandupAI -= OnHeroHandupAIStopPassive;
HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;
dungeonModel.dungeonCoolDownEvent -= DungeonCoolDownEvent;
@@ -149,6 +157,12 @@
}
#endregion
+
+ private void OnHeroHpChanged(ulong hp)
+ {
+ PlaceOfBirthUpdate(positionType);
+ }
+
private void DelBuff()
{
BuffScheduling();
diff --git a/Utility/RuntimeLogUtility.cs b/Utility/RuntimeLogUtility.cs
index 9da43cc..51b1406 100644
--- a/Utility/RuntimeLogUtility.cs
+++ b/Utility/RuntimeLogUtility.cs
@@ -220,7 +220,7 @@
Vector3 _position = Vector3.zero;
if (GActor.TryGetValidPos(_navChkPos, ref _position))
{
- Debug.Log("姝ｅ父鐐�........");
+ Debug.Log("姝ｅ父鐐�........: " + _position);
}
else
{
@@ -327,6 +327,7 @@
EditorGUILayout.LabelField("鎶�鑳戒俊鎭�", _content);
}
+ EditorGUILayout.IntField("褰撳墠涓昏AI鎵ц鐘舵�佸��: ", HeroAI_Base.stopReason);
EditorGUILayout.TextField("闃熶紞ID", _hero.ActorInfo.teamID.ToString());
EditorGUILayout.TextField("鏄惁澶勪簬鍦板浘鍒囨崲", GA_Hero.s_MapSwitching.ToString());
EditorGUILayout.TextField("褰撳墠韬綋鐘舵��", _hero.MovingState.ToString());
--
Gitblit v1.8.0