From ed98029a88cd89702980ac7c40b711afddc5aeb2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十一月 2025 14:44:59 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/Core/GameEngine/Player/PlayerDatas.cs | 78 ++++++++++++++------------------------
1 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/Main/Core/GameEngine/Player/PlayerDatas.cs b/Main/Core/GameEngine/Player/PlayerDatas.cs
index f20f80e..beb8f19 100644
--- a/Main/Core/GameEngine/Player/PlayerDatas.cs
+++ b/Main/Core/GameEngine/Player/PlayerDatas.cs
@@ -38,7 +38,7 @@
public event Action<long> spNewGetEvent;
- private Dictionary<PlayerDataType, ulong> PlayerDataDict = new Dictionary<PlayerDataType, ulong>();
+ private Dictionary<PlayerDataType, long> PlayerDataDict = new Dictionary<PlayerDataType, long>();
public void InitPlayerData(H0102_tagCDBPlayer data)
{
@@ -49,44 +49,11 @@
}
}
- public void UpdatePlayerData(/*HA112_tagMCDBPlayer data*/)
- {
- // baseData.UpdateData(data);
- // if (hero != null)
- // {
- // hero.InitBornPos(baseData.PosX, baseData.PosY);
- // CameraController.Instance.Apply();
- // }
-
- // if (playerDataUpdateEvent != null)
- // {
- // playerDataUpdateEvent();
- // }
- }
-
- public void FightRefreshPlayerHp(ulong hp)
- {
- RefreshProperty(PlayerDataType.HP, (uint)(hp % Constants.ExpPointValue), (uint)(hp/Constants.ExpPointValue));
-
- if (playerDataUpdateEvent != null)
- {
- playerDataUpdateEvent();
- }
-
- if (playerDataRefreshEvent != null)
- {
- playerDataRefreshEvent(PlayerDataType.HP);
- }
- }
-
public void RefreshPlayerData(H0418_tagObjInfoRefresh vNetData)
{
UpdatePlayerData(vNetData);
//StoreModel.RefreshTCBPlayerData(vNetData);
- if (playerDataUpdateEvent != null)
- {
- playerDataUpdateEvent();
- }
+
}
@@ -138,11 +105,12 @@
break;
case PlayerDataType.Family:
baseData.FamilyId = value;
- if (LocalSave.GetInt("FimilyReport" + PlayerDatas.Instance.baseData.PlayerID) == 0)
- {
- SDKUtils.Instance.TraceEvent("joinalliance", "", false);
- LocalSave.SetInt("FimilyReport" + PlayerDatas.Instance.baseData.PlayerID, 1);
- }
+
+ // if (LocalSave.GetInt("FimilyReport" + PlayerDatas.Instance.baseData.PlayerID) == 0)
+ // {
+ // SDKUtils.Instance.TraceEvent("joinalliance", "", false);
+ // LocalSave.SetInt("FimilyReport" + PlayerDatas.Instance.baseData.PlayerID, 1);
+ // }
break;
case PlayerDataType.Gold:
baseData.diamond = value;
@@ -233,10 +201,13 @@
break;
case PlayerDataType.TeamLV:
break;
+ case PlayerDataType.UseHarmerCount:
+ baseData.UseHarmerCount = value;
+ break;
case PlayerDataType.FightPower:
- baseData.FightPoint = value + valueEx * Constants.ExpPointValue;
- // TODO YYL
- // ModelCenter.Instance.GetModel<PlayerMainDate>().PowerAdd(baseData.FightPoint);
+ PlayerMainDate.Instance.prowNum = baseData.FightPower;
+ baseData.FightPower = value + valueEx * Constants.ExpPointValue;
+ PlayerMainDate.Instance.PowerAdd(baseData.FightPower);
break;
case PlayerDataType.Tick:
#if UNITY_EDITOR
@@ -264,10 +235,10 @@
extersion.luckValue = (int)value;
break;
case PlayerDataType.ExAttr1:
- baseData.ExAttr1 = value;
+ baseData.ExAttr1 = Math.Max((int)value, 10100); //鏂板彿鍒濆澶勭悊
break;
case PlayerDataType.ExAttr2:
- baseData.teamAutoOperateFlag = value;
+ baseData.ExAttr2 = Math.Max((int)value, 10101); //鏂板彿鍒濆澶勭悊
break;
case PlayerDataType.ExAttr3:
baseData.dungeonLineId = (int)value % 1000;
@@ -276,7 +247,7 @@
case PlayerDataType.ExAttr4:
baseData.shield = value;
break;
-
+
case PlayerDataType.Faction:
baseData.faction = value;
break;
@@ -450,7 +421,7 @@
case PlayerDataType.CDBPlayerRefresh_TalentPoint:
extersion.talentPoint = (int)value;
break;
-
+
case PlayerDataType.CDBPlayerRefresh_SoulDust:
extersion.soulDust = value;
break;
@@ -544,19 +515,28 @@
case PlayerDataType.CDBPlayerRefresh_SkillReducePerG:
baseData.skillReducePerG = (int)value;
break;
+ case PlayerDataType.ExAttr12:
+ baseData.leaveGuildInfo = (int)value;
+ break;
case PlayerDataType.default9:
baseData.mapRealmSelect = (int)value;
break;
case PlayerDataType.default10:
baseData.leaveFamilyTime = (int)value;
break;
+ case PlayerDataType.Face:
+ baseData.face = (int)value;
+ break;
+ case PlayerDataType.FacePic:
+ baseData.facePic = (int)value;
+ break;
}
}
- public ulong GetPlayerDataByType(PlayerDataType type)
+ public long GetPlayerDataByType(PlayerDataType type)
{
- ulong value = 0;
+ long value = 0;
PlayerDataDict.TryGetValue(type, out value);
return value;
}
--
Gitblit v1.8.0