From 4fde46699701b1a8b74b4dab516624852b24a86d Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 23 六月 2025 14:24:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Core/GameEngine/Player/PlayerDatas.cs |   85 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/Main/Core/GameEngine/Player/PlayerDatas.cs b/Main/Core/GameEngine/Player/PlayerDatas.cs
index 34bb5ac..f20f80e 100644
--- a/Main/Core/GameEngine/Player/PlayerDatas.cs
+++ b/Main/Core/GameEngine/Player/PlayerDatas.cs
@@ -14,7 +14,8 @@
     PlayerExtersionData m_Extersion = new PlayerExtersionData();
     public PlayerExtersionData extersion { get { return m_Extersion; } }
 
-    // public PlayerFairyData fairyData = new PlayerFairyData();
+    //浠欑洘
+    public PlayerFairyData fairyData = new PlayerFairyData();
 
     // PlayerSkillDatas m_Skill = new PlayerSkillDatas();
     // public PlayerSkillDatas skill { get { return m_Skill; } }
@@ -40,11 +41,11 @@
     private Dictionary<PlayerDataType, ulong> PlayerDataDict = new Dictionary<PlayerDataType, ulong>();
 
     public void InitPlayerData(H0102_tagCDBPlayer data)
-    {
-        baseData.UpdateData(data);
-        if (playerDataUpdateEvent != null)
-        {
-            playerDataUpdateEvent();
+    {
+        baseData.UpdateData(data);
+        if (playerDataUpdateEvent != null)
+        {
+            playerDataUpdateEvent();
         }
     }
 
@@ -79,35 +80,35 @@
     }
 
     public void RefreshPlayerData(H0418_tagObjInfoRefresh vNetData)
-    {
-        UpdatePlayerData(vNetData);
-        //StoreModel.RefreshTCBPlayerData(vNetData);
-        if (playerDataUpdateEvent != null)
-        {
-            playerDataUpdateEvent();
+    {
+        UpdatePlayerData(vNetData);
+        //StoreModel.RefreshTCBPlayerData(vNetData);
+        if (playerDataUpdateEvent != null)
+        {
+            playerDataUpdateEvent();
         }
     }
 
 
     private void UpdatePlayerData(H0418_tagObjInfoRefresh vNetData)
-    {
-        if (baseData != null && vNetData.ObjID == baseData.PlayerID)
-        {
-            RefreshProperty((PlayerDataType)vNetData.RefreshType, vNetData.Value, vNetData.ValueEx);
-
-            if (PlayerDataDict.ContainsKey((PlayerDataType)vNetData.RefreshType))
-            {
-                PlayerDataDict[(PlayerDataType)vNetData.RefreshType] = vNetData.Value + vNetData.ValueEx * Constants.ExpPointValue;
-            }
-            else
-            {
-                PlayerDataDict.Add((PlayerDataType)vNetData.RefreshType, vNetData.Value + vNetData.ValueEx * Constants.ExpPointValue);
-            }
-
-            if (playerDataRefreshEvent != null)
-            {
-                playerDataRefreshEvent((PlayerDataType)vNetData.RefreshType);
-            }
+    {
+        if (baseData != null && vNetData.ObjID == baseData.PlayerID)
+        {
+            RefreshProperty((PlayerDataType)vNetData.RefreshType, vNetData.Value, vNetData.ValueEx);
+
+            if (PlayerDataDict.ContainsKey((PlayerDataType)vNetData.RefreshType))
+            {
+                PlayerDataDict[(PlayerDataType)vNetData.RefreshType] = vNetData.Value + vNetData.ValueEx * Constants.ExpPointValue;
+            }
+            else
+            {
+                PlayerDataDict.Add((PlayerDataType)vNetData.RefreshType, vNetData.Value + vNetData.ValueEx * Constants.ExpPointValue);
+            }
+
+            if (playerDataRefreshEvent != null)
+            {
+                playerDataRefreshEvent((PlayerDataType)vNetData.RefreshType);
+            }
         }
     }
 
@@ -239,16 +240,16 @@
                 break;
             case PlayerDataType.Tick:
 #if UNITY_EDITOR
-                Debug.LogFormat("---- 鏀跺埌鏈嶅姟绔疶ick: {0}", value);
-                if (extersion.Tick != 0)
-                {
-                    uint _curWorldTick = GetWorldTick();
-                    uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;
-                    Debug.LogFormat(" |-------- 褰撳墠瀹㈡埛绔疶ick: {0}, 宸紓: {1}", _curWorldTick, _diffValue);
-                    if (_diffValue > 5000)
-                    {
-                        Debug.LogFormat(" |-------- <color=red>鏀跺埌鏈嶅姟绔疻orldTick涓庡綋鍓嶇殑瀹㈡埛绔疶ick宸紓瓒呰繃5绉�</color>");
-                    }
+                Debug.LogFormat("---- 鏀跺埌鏈嶅姟绔疶ick: {0}", value);
+                if (extersion.Tick != 0)
+                {
+                    uint _curWorldTick = GetWorldTick();
+                    uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;
+                    Debug.LogFormat(" |-------- 褰撳墠瀹㈡埛绔疶ick: {0}, 宸紓: {1}", _curWorldTick, _diffValue);
+                    if (_diffValue > 5000)
+                    {
+                        Debug.LogFormat(" |-------- <color=red>鏀跺埌鏈嶅姟绔疻orldTick涓庡綋鍓嶇殑瀹㈡埛绔疶ick宸紓瓒呰繃5绉�</color>");
+                    }
                 }
 #endif
                 extersion.Tick = value;
@@ -637,8 +638,8 @@
     }
 
     public void RequestWorldTick()
-    {
-        CA102_tagCMWorldTick _proto = new CA102_tagCMWorldTick();
+    {
+        CA102_tagCMWorldTick _proto = new CA102_tagCMWorldTick();
         GameNetSystem.Instance.SendInfo(_proto);
     }
 

--
Gitblit v1.8.0