From 77561bb15f0a5d45146fdf454726393e3987cc23 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 23:25:32 +0800
Subject: [PATCH] 3335 物品管理相关功能重构。

---
 Fight/GameActor/GActorPlayerBase.cs |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index a6add2b..57959c6 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -546,7 +546,7 @@
         m_HeadUpName.SetGrayName(on);
     }
 
-    public void SwitchWeapon(uint itemID, int index = (int)RoleEquipType.retWeapon)
+    public void SwitchWeapon(uint itemID, int index = (int)RoleEquipType.Weapon)
     {
         // 鐩稿悓鐨勮澶�, 涓嶅仛澶勭悊
         if (itemID == WeaponItemID)
@@ -559,21 +559,21 @@
         EquipInfo _equipInfo;
 
         // 濡傛灉鏄瑁呬綅缃�
-        if (index == (int)RoleEquipType.retFashionWeapon)
+        if (index == (int)RoleEquipType.FashionWeapon)
         {
             // 鑴变笅濂楄
             if (itemID == 0)
             {
                 // 瀵绘壘鍘熻韩涓婅澶�, 濡傛灉鏈夌殑璇濆氨閲嶇疆姝ゆ瑕佹崲瑁呯殑閬撳叿id
-                if (m_EquipDict.TryGetValue((int)RoleEquipType.retWeapon, out _equipInfo))
+                if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon, out _equipInfo))
                 {
                     itemID = _equipInfo.itemID;
                 }
             }
         }
-        else if (index == (int)RoleEquipType.retWeapon)
+        else if (index == (int)RoleEquipType.Weapon)
         {
-            if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon))
+            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon))
             {
                 return;
             }
@@ -664,7 +664,7 @@
         ShowWeaponEffect();
     }
 
-    public void SwitchSecondary(uint itemID, int index = (int)RoleEquipType.retWeapon2)
+    public void SwitchSecondary(uint itemID, int index = (int)RoleEquipType.Weapon2)
     {
         // 鐩稿悓鐨勮澶�, 涓嶅仛澶勭悊
         if (itemID == SecondaryID)
@@ -681,21 +681,21 @@
         EquipInfo _equipInfo;
 
         // 濡傛灉鏄瑁呬綅缃�
-        if (index == (int)RoleEquipType.retFashionWeapon2)
+        if (index == (int)RoleEquipType.FashionWeapon2)
         {
             // 鑴变笅濂楄
             if (itemID == 0)
             {
                 // 瀵绘壘鍘熻韩涓婅澶�, 濡傛灉鏈夌殑璇濆氨閲嶇疆姝ゆ瑕佹崲瑁呯殑閬撳叿id
-                if (m_EquipDict.TryGetValue((int)RoleEquipType.retWeapon2, out _equipInfo))
+                if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon2, out _equipInfo))
                 {
                     itemID = _equipInfo.itemID;
                 }
             }
         }
-        else if (index == (int)RoleEquipType.retWeapon2)
+        else if (index == (int)RoleEquipType.Weapon2)
         {
-            if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon2))
+            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))
             {
                 return;
             }
@@ -758,7 +758,7 @@
                 }
             }
 
-            if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon2))
+            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))
             {
                 SwitchHand(true);
             }
@@ -904,7 +904,7 @@
         WingItemID = itemID;
     }
 
-    public void SwitchClothes(uint itemID, int index = (int)RoleEquipType.retClothes)
+    public void SwitchClothes(uint itemID, int index = (int)RoleEquipType.Clothes)
     {
         // 鐩稿悓鐨勮澶�, 涓嶅仛澶勭悊
         if (itemID == ClothesItemID)
@@ -918,21 +918,21 @@
         int _resID = JobSetup.BaseEquip[0];
 
         // 濡傛灉鏄瑁呬綅缃�
-        if (index == (int)RoleEquipType.retFashionClothes)
+        if (index == (int)RoleEquipType.FashionClothes)
         {
             // 鑴变笅濂楄
             if (itemID == 0)
             {
                 // 瀵绘壘鍘熻韩涓婅澶�, 濡傛灉鏈夌殑璇濆氨閲嶇疆姝ゆ瑕佹崲瑁呯殑閬撳叿id
-                if (m_EquipDict.TryGetValue((int)RoleEquipType.retClothes, out _equipInfo))
+                if (m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo))
                 {
                     itemID = _equipInfo.itemID;
                 }
             }
         }
-        else if (index == (int)RoleEquipType.retClothes)
+        else if (index == (int)RoleEquipType.Clothes)
         {
-            if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionClothes))
+            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionClothes))
             {
                 return;
             }
@@ -1097,13 +1097,13 @@
         // 鍐冲畾鍓墜閫昏緫
         // 濡傛灉褰撳墠鏄椂瑁呭壇鎵�, 鍒欒澶囨椂瑁呮墜鑷�
         // 濡傛灉褰撳墠鏄櫘閫氬壇鎵�, 鍒欏嵏涓嬫墜鑷�
-        if (m_EquipDict.ContainsKey((int)RoleEquipType.retFashionWeapon2))
+        if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))
         {
             SwitchHand(true);
         }
         else
         {
-            if (!m_EquipDict.ContainsKey((int)RoleEquipType.retWeapon2))
+            if (!m_EquipDict.ContainsKey((int)RoleEquipType.Weapon2))
             {
                 SwitchHand(true);
             }
@@ -1272,9 +1272,9 @@
             EquipInfo _equipInfo;
             int _itemID = 7000;
 
-            if (!m_EquipDict.TryGetValue((int)RoleEquipType.retFashionClothes, out _equipInfo))
+            if (!m_EquipDict.TryGetValue((int)RoleEquipType.FashionClothes, out _equipInfo))
             {
-                if (!m_EquipDict.TryGetValue((int)RoleEquipType.retClothes, out _equipInfo))
+                if (!m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo))
                 {
                     _itemID = 7000;
                 }

--
Gitblit v1.8.0