From 9376527317473e3df3d306457fa4a18cc836e911 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 05 十一月 2018 11:04:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index eaffadd..cba6049 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -47,7 +47,7 @@
public uint ExAttr7; //鎵╁睍灞炴��7锛屽悇椤圭洰涓撶敤
public uint ExAttr8; //鎵╁睍灞炴��8锛屽悇椤圭洰涓撶敤
public uint ExAttr9; //鎵╁睍灞炴��9锛屽悇椤圭洰涓撶敤
- public uint ExAttr10; //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
+ public uint bubbleId; //鎵╁睍灞炴��10锛屽悇椤圭洰涓撶敤
public uint ExAttr11; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
public uint ExAttr12; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
public uint ExAttr13; //棰勭暀鐨勬墿灞曞睘鎬у瓧娈碉紝鐢ㄦ潵瀛樻斁椤圭洰鐗瑰畾鐨勫睘鎬�
@@ -117,7 +117,7 @@
ExAttr7 = _serverInfo.ExAttr7;
ExAttr8 = _serverInfo.ExAttr8;
ExAttr9 = _serverInfo.ExAttr9;
- ExAttr10 = _serverInfo.ExAttr10;
+ bubbleId = _serverInfo.ExAttr10;
ExAttr11 = _serverInfo.ExAttr11;
ExAttr12 = _serverInfo.ExAttr12;
ExAttr13 = _serverInfo.ExAttr13;
--
Gitblit v1.8.0