From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 266 ++++++++++++++++++++++++++--------------------------
1 files changed, 134 insertions(+), 132 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 3cf2167..3cf024d 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -1,7 +1,6 @@
锘縫ublic class PlayerBaseData
{
-
- PartDataBuf mainServerDataBuf = new PartDataBuf();//
+ public ushort mainServerMapIdRecord = 0;
public string AccID; //_KEY_i_甯愬彿鍚�, 璇ヨ鑹叉墍鍦ㄧ殑甯愬彿鐨勭敤鎴峰悕
public uint PlayerID; //_IDT_
@@ -64,10 +63,8 @@
public int BasicsDefense;//鍩虹闃插尽
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
- public long treasurePotentialSp
- {
- get
- {
+ public long treasurePotentialSp {
+ get {
return ExAttr8 * (long)100000000 + ExAttr7;
}
}
@@ -80,63 +77,76 @@
public void UpdateData(H0102_tagCDBPlayer _serverInfo)
{
- AccID = _serverInfo.AccID;
- PlayerID = _serverInfo.PlayerID;
- PlayerName = _serverInfo.PlayerName.Trim().Replace(" ", "");
- AccState = _serverInfo.AccState;
- GMLevel = _serverInfo.GMLevel;
- Sex = _serverInfo.Sex;
- Job = _serverInfo.Job;
- LV = _serverInfo.LV;
- LVEx = _serverInfo.LVEx;
- LV2 = _serverInfo.LV2;
- ExpPoint = _serverInfo.ExpPoint;
- TotalExp = _serverInfo.TotalExp;
- Family = _serverInfo.Family;
- FamilyName = _serverInfo.FamilyName.Trim().Replace(" ", "");
- Gold = _serverInfo.Gold;
- GoldPaper = _serverInfo.GoldPaper;
- Silver = _serverInfo.Silver;
- SilverPaper = _serverInfo.SilverPaper;
- MapID = _serverInfo.MapID;
- PosX = _serverInfo.PosX;
- PosY = _serverInfo.PosY;
- State = _serverInfo.State;
- XP = _serverInfo.XP;
- FreePoint = _serverInfo.FreePoint;
- FreeSkillPoint = _serverInfo.FreeSkillPoint;
- STR = _serverInfo.STR;
- PNE = _serverInfo.PNE;
- PHY = _serverInfo.PHY;
- CON = _serverInfo.CON;
- Setting = _serverInfo.Setting;
- AttackMode = _serverInfo.AttackMode;
- FBID = _serverInfo.FBID;
- ExAttr1 = _serverInfo.ExAttr1;
- ExAttr2 = _serverInfo.ExAttr2;
- dungeonLineId = (int)_serverInfo.ExAttr3;
- ExAttr4 = _serverInfo.ExAttr4;
- ExAttr5 = _serverInfo.ExAttr5;
- realmLevel = _serverInfo.OfficialRank;
- VIPLv = _serverInfo.VIPLv;
- ExAttr6 = _serverInfo.ExAttr6;
- ExAttr7 = _serverInfo.ExAttr7;
- ExAttr8 = _serverInfo.ExAttr8;
- ExAttr9 = _serverInfo.ExAttr9;
- bubbleId = _serverInfo.ExAttr10;
- ExAttr11 = _serverInfo.ExAttr11;
- ExAttr12 = _serverInfo.ExAttr12;
- ExAttr13 = _serverInfo.ExAttr13;
- ExAttr14 = _serverInfo.ExAttr14;
- HappyPoint = _serverInfo.HappyPoint;
- faction = _serverInfo.Faction;
- coinPointTotal = _serverInfo.ChangeCoinPointTotal;
- godWeaponLV_1 = (int)_serverInfo.ExAttr15;
- godWeaponLV_2 = (int)_serverInfo.ExAttr16;
- godWeaponLV_3 = (int)_serverInfo.ExAttr17;
- godWeaponLV_4 = (int)_serverInfo.ExAttr18;
+ if (_serverInfo.socketType == GameNetSystem.SocketType.Main)
+ {
+ AccID = _serverInfo.AccID;
+ PlayerID = _serverInfo.PlayerID;
+ PlayerName = _serverInfo.PlayerName.Trim().Replace(" ", "");
+ AccState = _serverInfo.AccState;
+ GMLevel = _serverInfo.GMLevel;
+ Sex = _serverInfo.Sex;
+ Job = _serverInfo.Job;
+ LV = _serverInfo.LV;
+ LVEx = _serverInfo.LVEx;
+ LV2 = _serverInfo.LV2;
+ ExpPoint = _serverInfo.ExpPoint;
+ TotalExp = _serverInfo.TotalExp;
+ Family = _serverInfo.Family;
+ FamilyName = _serverInfo.FamilyName.Trim().Replace(" ", "");
+ Gold = _serverInfo.Gold;
+ GoldPaper = _serverInfo.GoldPaper;
+ Silver = _serverInfo.Silver;
+ SilverPaper = _serverInfo.SilverPaper;
+ MapID = _serverInfo.MapID;
+ mainServerMapIdRecord = MapID;
+ PosX = _serverInfo.PosX;
+ PosY = _serverInfo.PosY;
+ State = _serverInfo.State;
+ XP = _serverInfo.XP;
+ FreePoint = _serverInfo.FreePoint;
+ FreeSkillPoint = _serverInfo.FreeSkillPoint;
+ STR = _serverInfo.STR;
+ PNE = _serverInfo.PNE;
+ PHY = _serverInfo.PHY;
+ CON = _serverInfo.CON;
+ Setting = _serverInfo.Setting;
+ AttackMode = _serverInfo.AttackMode;
+ FBID = _serverInfo.FBID;
+ ExAttr1 = _serverInfo.ExAttr1;
+ ExAttr2 = _serverInfo.ExAttr2;
+ dungeonLineId = (int)_serverInfo.ExAttr3;
+ ExAttr4 = _serverInfo.ExAttr4;
+ ExAttr5 = _serverInfo.ExAttr5;
+ realmLevel = _serverInfo.OfficialRank;
+ VIPLv = _serverInfo.VIPLv;
+ ExAttr6 = _serverInfo.ExAttr6;
+ ExAttr7 = _serverInfo.ExAttr7;
+ ExAttr8 = _serverInfo.ExAttr8;
+ ExAttr9 = _serverInfo.ExAttr9;
+ bubbleId = _serverInfo.ExAttr10;
+ ExAttr11 = _serverInfo.ExAttr11;
+ ExAttr12 = _serverInfo.ExAttr12;
+ ExAttr13 = _serverInfo.ExAttr13;
+ ExAttr14 = _serverInfo.ExAttr14;
+ HappyPoint = _serverInfo.HappyPoint;
+ faction = _serverInfo.Faction;
+ coinPointTotal = _serverInfo.ChangeCoinPointTotal;
+ godWeaponLV_1 = (int)_serverInfo.ExAttr15;
+ godWeaponLV_2 = (int)_serverInfo.ExAttr16;
+ godWeaponLV_3 = (int)_serverInfo.ExAttr17;
+ godWeaponLV_4 = (int)_serverInfo.ExAttr18;
+ }
+ else
+ {
+ PlayerName = _serverInfo.PlayerName.Trim().Replace(" ", "");
+ MapID = _serverInfo.MapID;
+ dungeonLineId = (int)_serverInfo.ExAttr3;
+ FBID = _serverInfo.FBID;
+ PosX = _serverInfo.PosX;
+ PosY = _serverInfo.PosY;
+ }
- if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ if (CrossServerUtility.IsCrossServer())
{
if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
{
@@ -151,7 +161,7 @@
if (PlayerDatas.Instance.hero != null)
{
PlayerDatas.Instance.hero.ActorInfo.familyID = Family;
- if (CrossServerRewardModel.IsCrossServerOneVsOne())
+ if (CrossServerUtility.IsCrossServer())
{
if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)
{
@@ -164,82 +174,74 @@
}
}
- if (_serverInfo.socketType == GameNetSystem.SocketType.Main)
- {
- mainServerDataBuf.PlayerName = PlayerName;
- mainServerDataBuf.MapID = MapID;
- mainServerDataBuf.FBID = FBID;
- mainServerDataBuf.dungeonLineId = dungeonLineId;
- mainServerDataBuf.PosX = PosX;
- mainServerDataBuf.PosY = PosY;
- mainServerDataBuf.HP = HP;
- }
}
- public void ApplyMainServerDataBuf()
+ public void UpdateData(HA112_tagMCDBPlayer serverInfo)
{
- PlayerName = mainServerDataBuf.PlayerName;
- MapID = mainServerDataBuf.MapID;
- FBID = mainServerDataBuf.FBID;
- dungeonLineId = mainServerDataBuf.dungeonLineId;
- PosX = mainServerDataBuf.PosX;
- PosY = mainServerDataBuf.PosY;
- HP = mainServerDataBuf.HP;
+ AccID = serverInfo.AccID;
+ PlayerID = serverInfo.PlayerID;
+ PlayerName = serverInfo.PlayerName.Trim().Replace(" ", "");
+ AccState = serverInfo.AccState;
+ GMLevel = serverInfo.GMLevel;
+ Sex = serverInfo.Sex;
+ Job = serverInfo.Job;
+ LV = serverInfo.LV;
+ LVEx = serverInfo.LVEx;
+ LV2 = serverInfo.LV2;
+ ExpPoint = serverInfo.ExpPoint;
+ TotalExp = serverInfo.TotalExp;
+ Family = serverInfo.Family;
+ FamilyName = serverInfo.FamilyName.Trim().Replace(" ", "");
+ Gold = serverInfo.Gold;
+ GoldPaper = serverInfo.GoldPaper;
+ Silver = serverInfo.Silver;
+ SilverPaper = serverInfo.SilverPaper;
+ MapID = serverInfo.MapID;
+ if (serverInfo.socketType == GameNetSystem.SocketType.Main)
+ {
+ mainServerMapIdRecord = MapID;
+ }
+ PosX = serverInfo.PosX;
+ PosY = serverInfo.PosY;
+ State = serverInfo.State;
+ XP = serverInfo.XP;
+ FreePoint = serverInfo.FreePoint;
+ FreeSkillPoint = serverInfo.FreeSkillPoint;
+ STR = serverInfo.STR;
+ PNE = serverInfo.PNE;
+ PHY = serverInfo.PHY;
+ CON = serverInfo.CON;
+ AttackMode = serverInfo.AttackMode;
+ FBID = serverInfo.FBID;
+ ExAttr1 = serverInfo.ExAttr1;
+ ExAttr2 = serverInfo.ExAttr2;
+ dungeonLineId = (int)serverInfo.ExAttr3;
+ ExAttr4 = serverInfo.ExAttr4;
+ ExAttr5 = serverInfo.ExAttr5;
+ realmLevel = serverInfo.OfficialRank;
+ VIPLv = serverInfo.VIPLv;
+ ExAttr6 = serverInfo.ExAttr6;
+ ExAttr7 = serverInfo.ExAttr7;
+ ExAttr8 = serverInfo.ExAttr8;
+ ExAttr9 = serverInfo.ExAttr9;
+ bubbleId = serverInfo.ExAttr10;
+ ExAttr11 = serverInfo.ExAttr11;
+ ExAttr12 = serverInfo.ExAttr12;
+ ExAttr13 = serverInfo.ExAttr13;
+ ExAttr14 = serverInfo.ExAttr14;
+ HappyPoint = serverInfo.HappyPoint;
+ faction = serverInfo.Faction;
+ coinPointTotal = serverInfo.ChangeCoinPointTotal;
+ godWeaponLV_1 = (int)serverInfo.ExAttr15;
+ godWeaponLV_2 = (int)serverInfo.ExAttr16;
+ godWeaponLV_3 = (int)serverInfo.ExAttr17;
+ godWeaponLV_4 = (int)serverInfo.ExAttr18;
+ HP = serverInfo.HP;
if (PlayerDatas.Instance.hero != null)
{
- PlayerDatas.Instance.hero.ActorInfo.serverDie = mainServerDataBuf.heroServerDie;
+ PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)serverInfo.HP);
}
}
- public void RecordMainServerData(bool isMainServerData, PlayerDataRefresh playerDataType, uint value)
- {
- if (!isMainServerData)
- {
- return;
- }
-
- switch (playerDataType)
- {
- case PlayerDataRefresh.PlayerName:
- break;
- case PlayerDataRefresh.MapID:
- mainServerDataBuf.MapID = (ushort)value;
- break;
- case PlayerDataRefresh.FBID:
- mainServerDataBuf.FBID = (byte)value;
- break;
- case PlayerDataRefresh.ExAttr3:
- mainServerDataBuf.dungeonLineId = (byte)value;
- break;
- case PlayerDataRefresh.PosX:
- mainServerDataBuf.PosX = (ushort)value;
- break;
- case PlayerDataRefresh.PosY:
- mainServerDataBuf.PosY = (ushort)value;
- break;
- case PlayerDataRefresh.HP:
- mainServerDataBuf.HP = value;
- break;
- default:
- break;
- }
- }
-
- public void RecordMainServerDie(bool isMainServerData, bool serverDie)
- {
- mainServerDataBuf.heroServerDie = serverDie;
- }
-
- public class PartDataBuf
- {
- public string PlayerName;
- public ushort MapID;
- public byte FBID;
- public int dungeonLineId;
- public ushort PosX;
- public ushort PosY;
- public uint HP;
- public bool heroServerDie;
- }
}
--
Gitblit v1.8.0