Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -265,7 +265,7 @@ namespace GFGGame
         {
             if (_dressUpData.actionId > 0)
             {
-                bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
+                bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableOnAction(itemId, _dressUpData.actionId);
                 if (!replaceableByAction)
                 {
                     CancelAction();
@@ -314,8 +314,8 @@ namespace GFGGame
                 if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemId))
                 {
                     subType = ItemUtilCS.GetItemSubType(itemId);
-                    bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, suitId);
-                    if (!IsAction || replaceableByAction)
+                    bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);
+                    if (!IsAction || notInAction)
                     {
                         if (excludeType == null || Array.IndexOf(excludeType, subType) < 0)
                         {
@@ -336,8 +336,8 @@ namespace GFGGame
             {
                 foreach (int itemId in itemList)
                 {
-                    bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
-                    if (!replaceableByAction)
+                    bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);
+                    if (!notInAction)
                     {
                         AddOrRemove(itemId, false, false, true);
                     }
@@ -371,8 +371,8 @@ namespace GFGGame
                 {
                     if (DressUpMenuItemDataManager.CheckHasItem(itemId))
                     {
-                        bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, tempActionId);
-                        if (!replaceableByAction)
+                        bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);
+                        if (!notInAction)
                         {
                             AddOrRemove(itemId, false, true);
                         }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -316,25 +316,7 @@ namespace GFGGame
             }
             else
             {
-                if (MyDressUpHelper.dressUpObj.IsAction)
-                {
-                    if (SuitCfgArray.Instance.CheckItemReaplaceableByAction(id, MyDressUpHelper.dressUpObj.actionId))
-                    {
-                        MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
-                    }
-                    else
-                    {
-                        if (!SuitCfgArray.Instance.CheckActionContainsItem(id, MyDressUpHelper.dressUpObj.actionId))
-                        {
-                            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
-                        }
-                        MyDressUpHelper.dressUpObj.CancelAction();
-                    }
-                }
-                else
-                {
-                    MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
-                }
+                MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             }
             if (isDress)
             {