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/PlayerBaseData.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index 241dc1d..56f00f0 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using Cysharp.Threading.Tasks;
public class PlayerBaseData
{
@@ -12,7 +13,28 @@
public uint ExpPoint; //鎵╁厖缁忛獙鐐规暟锛堜嚎锛�
public uint TotalExp; //鎬荤粡楠�(灏忎簬浜块儴鍒�)
public long curExp { get { return TotalExp + ExpPoint * Constants.ExpPointValue; } }
- public uint FamilyId; //瀹舵棌
+
+ uint m_FamilyId;
+ public uint FamilyId
+ {
+ get
+ {
+ return m_FamilyId;
+ }
+ set
+ {
+ var beforeFamilyId = m_FamilyId;
+ m_FamilyId = value;
+ if (beforeFamilyId == 0 && m_FamilyId != 0)
+ {
+ GuildManager.Instance.AfterEnterGuild().Forget();
+ }
+ else if (beforeFamilyId != 0 && m_FamilyId == 0)
+ {
+ GuildManager.Instance.AfterQuitGuild();
+ }
+ }
+ }
public string FamilyName; //瀹舵棌鍚嶇О
public uint diamond; //浠欑帀
public uint bindDiamond; //鐏电煶
@@ -79,7 +101,7 @@
public int BasicsDefense;//鍩虹闃插尽
public int BasicsScoreAHit;//鍩虹鍛戒腑
public int BasicsDodge;//鍩虹闂伩
- public uint equipShowSwitch;//瑁呭鏄鹃殣寮�鍏�
+ public uint equipShowSwitch;//褰撳墠閰嶇疆鐨勫潗楠戝瑙侷D瀛樺偍鍦紙鏈�澶ф敮鎸� 1~999锛�
public int mater;//鐏垫牴灞炴�р�斺�旈噾
public int wood;//鐏垫牴灞炴�р�斺�旀湪
public int water;//鐏垫牴灞炴�р�斺�旀按
@@ -113,6 +135,7 @@
public int mapRealmSelect; //鍦板浘澧冪晫闅惧害
public int leaveFamilyTime; //绂诲紑瀹舵棌鏃堕棿
+ public int leaveGuildInfo; //鍏細锛氫富鍔ㄧ寮�娆℃暟*100 + 琚涪娆℃暟*10 + 鏈�鍚庝竴娆℃槸鍚︿富鍔ㄧ寮�鐨勶紝鏆傛椂鏈�澶氱疮璁¤褰曞埌9娆�
public bool IsActive90Off = true; //浠ｈ〃榛樿婵�娲�0.1鎶�
public long treasurePotentialSp
@@ -180,6 +203,7 @@
spExtend = _serverInfo.ExAttr8;
bubbleId = _serverInfo.ExAttr10;
ExAttr11 = _serverInfo.ExAttr11;
+ leaveGuildInfo = (int)_serverInfo.ExAttr12;
ExAttr16 = _serverInfo.ExAttr16;
ServerGroupId = _serverInfo.ExAttr13;
faction = _serverInfo.Faction;
--
Gitblit v1.8.0