From a4214da5a91598c9e423d446f741a7221ffdfd4c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 02 四月 2019 19:23:43 +0800
Subject: [PATCH] 3151 【2.0】穿戴时装后,主场景没有显示时装外观
---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs | 9 ---------
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs | 2 --
System/Equip/EquipModel.cs | 5 +++--
Fight/GameActor/GActorPlayerBase.cs | 2 --
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
index dd16fc2..f667c73 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
@@ -30,15 +30,6 @@
_equipInfo.itemID = vNetData.EquipID;
var _config = ItemConfig.Get((int)_equipInfo.itemID);
_equipInfo.place = _config.EquipPlace;
- if (vNetData.UserDataLen > 2)
- {
- Dictionary<int, List<int>> _userDataDict = ConfigParse.Analysis(vNetData.UserData);
- if (_userDataDict.ContainsKey(25))
- {
- _equipInfo.suitLV_1 = (byte)_userDataDict[25][0];
- _equipInfo.suitLV_2 = (byte)_userDataDict[25][1];
- }
- }
if (_equipInfo.place == (int)RoleEquipType.Clothes
|| _equipInfo.place == (int)RoleEquipType.Hat
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
index 8b1217b..9ef3b2c 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
@@ -37,8 +37,6 @@
{
place = _index,
itemID = 0,
- suitLV_1 = 0,
- suitLV_2 = 0
};
// 锟斤拷锟斤拷锟铰凤拷
_player.ChangeEquip(_equipInfo);
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index 9130ae6..60e1c03 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -36,8 +36,6 @@
{
public int place;
public uint itemID;
- public int suitLV_1;
- public int suitLV_2;
}
protected bool m_SuitEffectShow;
diff --git a/System/Equip/EquipModel.cs b/System/Equip/EquipModel.cs
index 32fa936..8a4d11f 100644
--- a/System/Equip/EquipModel.cs
+++ b/System/Equip/EquipModel.cs
@@ -11,7 +11,8 @@
{
public static readonly List<int> realmEquipTypes = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
- public int showedUnLockLevel {
+ public int showedUnLockLevel
+ {
get { return LocalSave.GetInt(StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "EquipSetUnLockHasShowed"), 1); }
set { LocalSave.SetInt(StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "EquipSetUnLockHasShowed"), value); }
}
@@ -472,7 +473,7 @@
equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.FashionWeapon));
var fashWeapon = packModel.GetItemByIndex(PackType.Equip, equipIndex);
- appearance.mount = fashWeapon == null ? 0 : fashWeapon.itemId;
+ appearance.fashionWeapon = fashWeapon == null ? 0 : fashWeapon.itemId;
equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.FashionWeapon2));
var fashionSecondary = packModel.GetItemByIndex(PackType.Equip, equipIndex);
--
Gitblit v1.8.0