From 8ba22521fa3deb48e9f018ff10b16b7cdcd90368 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 15 一月 2019 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 75a2223..4c7e79d 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -43,7 +43,7 @@
public uint ExAttr2; //鎵╁睍灞炴��2锛屽悇椤圭洰涓撶敤
public int dungeonLineId; // 鍓湰绾胯矾id
public uint ExAttr4; //鎵╁睍灞炴��4锛屽悇椤圭洰涓撶敤
- public uint ExAttr5; //鎵╁睍灞炴��5锛屽悇椤圭洰涓撶敤
+ public uint CrossServerFlag; //璺ㄦ湇鏍囪瘑锛屽ぇ浜�2鏍囪瘑鍦ㄨ法鏈嶇姸鎬侊紝鍊兼槸璺ㄦ湇鍦板浘鐨刣atamapid
public uint ExAttr6; //鎵╁睍灞炴��6锛屽悇椤圭洰涓撶敤
public uint ExAttr7; //鎵╁睍灞炴��7锛屽悇椤圭洰涓撶敤
public uint ExAttr8; //鎵╁睍灞炴��8锛屽悇椤圭洰涓撶敤
@@ -51,7 +51,7 @@
public uint bubbleId; //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
public uint ExAttr11; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
public uint ExAttr12; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
- public uint ExAttr13; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
+ public uint ServerGroupId; //鏈嶅姟鍣ㄧ粍ID
public uint ExAttr14; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
public uint HappyPoint;//鐜颁负鑴辨満鎸傚墿浣欐椂闂� 23
public uint faction; //闃佃惀 107
@@ -117,7 +117,7 @@
ExAttr2 = _serverInfo.ExAttr2;
dungeonLineId = (int)_serverInfo.ExAttr3;
ExAttr4 = _serverInfo.ExAttr4;
- ExAttr5 = _serverInfo.ExAttr5;
+ CrossServerFlag = _serverInfo.ExAttr5;
realmLevel = _serverInfo.OfficialRank;
VIPLv = _serverInfo.VIPLv;
ExAttr6 = _serverInfo.ExAttr6;
@@ -127,7 +127,7 @@
bubbleId = _serverInfo.ExAttr10;
ExAttr11 = _serverInfo.ExAttr11;
ExAttr12 = _serverInfo.ExAttr12;
- ExAttr13 = _serverInfo.ExAttr13;
+ ServerGroupId = _serverInfo.ExAttr13;
ExAttr14 = _serverInfo.ExAttr14;
HappyPoint = _serverInfo.HappyPoint;
faction = _serverInfo.Faction;
@@ -219,7 +219,7 @@
ExAttr2 = serverInfo.ExAttr2;
dungeonLineId = (int)serverInfo.ExAttr3;
ExAttr4 = serverInfo.ExAttr4;
- ExAttr5 = serverInfo.ExAttr5;
+ CrossServerFlag = serverInfo.ExAttr5;
realmLevel = serverInfo.OfficialRank;
VIPLv = serverInfo.VIPLv;
ExAttr6 = serverInfo.ExAttr6;
@@ -229,7 +229,7 @@
bubbleId = serverInfo.ExAttr10;
ExAttr11 = serverInfo.ExAttr11;
ExAttr12 = serverInfo.ExAttr12;
- ExAttr13 = serverInfo.ExAttr13;
+ ServerGroupId = serverInfo.ExAttr13;
ExAttr14 = serverInfo.ExAttr14;
HappyPoint = serverInfo.HappyPoint;
faction = serverInfo.Faction;
--
Gitblit v1.8.0