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

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

@@ -370,6 +370,21 @@ namespace GFGGame
             }
             var tempActionId = _dressUpData.actionId;
             _dressUpData.actionId = 0;
+            //更新非场景类型部件形态
+            foreach (int itemId in itemList)
+            {
+                if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId))
+                {
+                    //场景类型不受动作影响并且本来就有动画，对非场景类型处理
+                    bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);
+                    if (notInAction)
+                    {
+                        //更新成图片模式
+                        AddOrRemove(itemId, false, DressUpOption.Remove);
+                        AddOrRemove(itemId, false, DressUpOption.Add);
+                    }
+                }
+            }
             if (changeToStand)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(tempActionId);
@@ -390,20 +405,6 @@ namespace GFGGame
                     }
                 }
             }
-            //更新非场景类型部件形态
-            foreach (int itemId in itemList)
-            {
-                if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId))
-                {
-                    //场景类型不受动作影响并且本来就有动画，对非场景类型处理
-                    bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);
-                    if (notInAction)
-                    {
-                        //更新成图片模式
-                        AddOrRemove(itemId, false, DressUpOption.Add);
-                    }
-                }
-            }
             checkDefaultItem();
         }