From 34248111d4b60659ccbe10f0ecbfceef52ea35a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 02 四月 2019 16:57:50 +0800
Subject: [PATCH] 3151 【2.0】穿戴时装后，主场景没有显示时装外观
---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs | 56 ++++++++++++++--------------
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs | 57 +++++++++++++++-------------
2 files changed, 58 insertions(+), 55 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
index 7dd1e17..dd16fc2 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-//04 13 玩家换装#tagPlayerChangeEquip
+//04 13 锟斤拷一锟阶�#tagPlayerChangeEquip
@@ -27,9 +27,9 @@
if (_player != null)
{
var _equipInfo = new GActorPlayerBase.EquipInfo();
- _equipInfo.place = vNetData.EquipIndex;
_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);
@@ -40,28 +40,28 @@
}
}
- if (vNetData.EquipIndex == (int)RoleEquipType.Clothes
- || vNetData.EquipIndex == (int)RoleEquipType.Hat
- || vNetData.EquipIndex == (int)RoleEquipType.Shoes
- || vNetData.EquipIndex == (int)RoleEquipType.Trousers
- || vNetData.EquipIndex == (int)RoleEquipType.Belt)
+ if (_equipInfo.place == (int)RoleEquipType.Clothes
+ || _equipInfo.place == (int)RoleEquipType.Hat
+ || _equipInfo.place == (int)RoleEquipType.Shoes
+ || _equipInfo.place == (int)RoleEquipType.Trousers
+ || _equipInfo.place == (int)RoleEquipType.Belt)
{
_player.ChangeEquip(_equipInfo);
}
- if (vNetData.EquipIndex == (int)RoleEquipType.Weapon)
+ if (_equipInfo.place == (int)RoleEquipType.Weapon)
{
- _player.SwitchWeapon(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchWeapon(vNetData.EquipID, _equipInfo.place);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Clothes)
+ else if (_equipInfo.place == (int)RoleEquipType.Clothes)
{
- _player.SwitchClothes(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchClothes(vNetData.EquipID, _equipInfo.place);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Wing)
+ else if (_equipInfo.place == (int)RoleEquipType.Wing)
{
_player.SwitchWing(vNetData.EquipID);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Guard1)
+ else if (_equipInfo.place == (int)RoleEquipType.Guard1)
{
_player.SwitchGuard(vNetData.EquipID);
var _p = _player as GA_Player;
@@ -70,11 +70,11 @@
_p.serverGuardId = (int)vNetData.EquipID;
}
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Weapon2)
+ else if (_equipInfo.place == (int)RoleEquipType.Weapon2)
{
- _player.SwitchSecondary(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchSecondary(vNetData.EquipID, _equipInfo.place);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Mount)
+ else if (_equipInfo.place == (int)RoleEquipType.Mount)
{
_player.ActorInfo.horseItemID = vNetData.EquipID;
if (_player.MovingState == E_MovingState.Ride)
@@ -82,24 +82,24 @@
_player.OnHorse(1);
}
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionClothes)
+ else if (_equipInfo.place == (int)RoleEquipType.FashionClothes)
{
- _player.SwitchClothes(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchClothes(vNetData.EquipID, _equipInfo.place);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionWeapon)
+ else if (_equipInfo.place == (int)RoleEquipType.FashionWeapon)
{
- _player.SwitchWeapon(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchWeapon(vNetData.EquipID, _equipInfo.place);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionWeapon2)
+ else if (_equipInfo.place == (int)RoleEquipType.FashionWeapon2)
{
- _player.SwitchSecondary(vNetData.EquipID, vNetData.EquipIndex);
+ _player.SwitchSecondary(vNetData.EquipID, _equipInfo.place);
}
- if (vNetData.EquipIndex == (int)RoleEquipType.Clothes
- || vNetData.EquipIndex == (int)RoleEquipType.Hat
- || vNetData.EquipIndex == (int)RoleEquipType.Shoes
- || vNetData.EquipIndex == (int)RoleEquipType.Trousers
- || vNetData.EquipIndex == (int)RoleEquipType.Belt)
+ if (_equipInfo.place == (int)RoleEquipType.Clothes
+ || _equipInfo.place == (int)RoleEquipType.Hat
+ || _equipInfo.place == (int)RoleEquipType.Shoes
+ || _equipInfo.place == (int)RoleEquipType.Trousers
+ || _equipInfo.place == (int)RoleEquipType.Belt)
{
_player.SyncSuitEffect();
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
index bd655c0..8b1217b 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0415_tagPlayerUnEquipItem.cs
@@ -1,6 +1,6 @@
using UnityEngine;
using System.Collections;
-//04 15 玩家卸下装备#tagPlayerUnEquipItem
+//04 15 锟斤拷锟叫讹拷锟阶帮拷锟�#tagPlayerUnEquipItem
@@ -24,40 +24,43 @@
if (_player != null)
{
- if (vNetData.EquipIndex == (int)RoleEquipType.Clothes
- || vNetData.EquipIndex == (int)RoleEquipType.Hat
- || vNetData.EquipIndex == (int)RoleEquipType.Shoes
- || vNetData.EquipIndex == (int)RoleEquipType.Trousers
- || vNetData.EquipIndex == (int)RoleEquipType.Belt)
+ var _config = ItemConfig.Get((int)vNetData.EquipID);
+ var _index = _config.EquipPlace;
+
+ if (_index == (int)RoleEquipType.Clothes
+ || _index == (int)RoleEquipType.Hat
+ || _index == (int)RoleEquipType.Shoes
+ || _index == (int)RoleEquipType.Trousers
+ || _index == (int)RoleEquipType.Belt)
{
var _equipInfo = new GActorPlayerBase.EquipInfo
{
- place = vNetData.EquipIndex,
+ place = _index,
itemID = 0,
suitLV_1 = 0,
suitLV_2 = 0
};
- // 脱下衣服
+ // 锟斤拷锟斤拷锟铰凤拷
_player.ChangeEquip(_equipInfo);
}
- if (vNetData.EquipIndex == (int)RoleEquipType.Weapon)
+ if (_index == (int)RoleEquipType.Weapon)
{
- _player.SwitchWeapon(0, vNetData.EquipIndex);
+ _player.SwitchWeapon(0, _index);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Clothes)
+ else if (_index == (int)RoleEquipType.Clothes)
{
- _player.SwitchClothes(0, vNetData.EquipIndex);
+ _player.SwitchClothes(0, _index);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Wing)
+ else if (_index == (int)RoleEquipType.Wing)
{
_player.SwitchWing(0);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Weapon2)
+ else if (_index == (int)RoleEquipType.Weapon2)
{
- _player.SwitchSecondary(0, vNetData.EquipIndex);
+ _player.SwitchSecondary(0, _index);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.Guard1)
+ else if (_index == (int)RoleEquipType.Guard1)
{
_player.SwitchGuard(0);
var _p = _player as GA_Player;
@@ -66,24 +69,24 @@
_p.serverGuardId = 0;
}
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionClothes)
+ else if (_index == (int)RoleEquipType.FashionClothes)
{
- _player.SwitchClothes(0, vNetData.EquipIndex);
+ _player.SwitchClothes(0, _index);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionWeapon)
+ else if (_index == (int)RoleEquipType.FashionWeapon)
{
- _player.SwitchWeapon(0, vNetData.EquipIndex);
+ _player.SwitchWeapon(0, _index);
}
- else if (vNetData.EquipIndex == (int)RoleEquipType.FashionWeapon2)
+ else if (_index == (int)RoleEquipType.FashionWeapon2)
{
- _player.SwitchSecondary(0, vNetData.EquipIndex);
+ _player.SwitchSecondary(0, _index);
}
- if (vNetData.EquipIndex == (int)RoleEquipType.Clothes
- || vNetData.EquipIndex == (int)RoleEquipType.Hat
- || vNetData.EquipIndex == (int)RoleEquipType.Shoes
- || vNetData.EquipIndex == (int)RoleEquipType.Trousers
- || vNetData.EquipIndex == (int)RoleEquipType.Belt)
+ if (_index == (int)RoleEquipType.Clothes
+ || _index == (int)RoleEquipType.Hat
+ || _index == (int)RoleEquipType.Shoes
+ || _index == (int)RoleEquipType.Trousers
+ || _index == (int)RoleEquipType.Belt)
{
_player.SyncSuitEffect();
}
--
Gitblit v1.8.0