浏览代码

拍照多层道具层级调整

zhaoyang 3 年之前
父节点
当前提交
8b0ec5de90

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs

@@ -34,7 +34,7 @@ namespace GFGGame
         {
         {
 
 
             GameObject parentGameObj = new GameObject(string.Format("{0}_{1}", itemCfg.id, 0));
             GameObject parentGameObj = new GameObject(string.Format("{0}_{1}", itemCfg.id, 0));
-            SceneController.AddItemToScene(sceneObject, parentGameObj, itemCfg.id, 1, layer);
+            SceneController.AddItemToScene(sceneObject, parentGameObj, itemCfg.id, layer);
             PhotographDataManager.Instance.AddItemGameObject(parentGameObj, setLayer);
             PhotographDataManager.Instance.AddItemGameObject(parentGameObj, setLayer);
 
 
         }
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -15,7 +15,7 @@ namespace GFGGame
         private const string FORMAT_EFFECT_OBJ_NAME = "T{0}_eff";
         private const string FORMAT_EFFECT_OBJ_NAME = "T{0}_eff";
         private const string FORMAT_LAYER_RES_NAME_WITH_T = "{0}_t";
         private const string FORMAT_LAYER_RES_NAME_WITH_T = "{0}_t";
 
 
-        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true, GameObject parentObj = null, int layerId = int.MinValue, int resLayer = int.MinValue)
+        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true, GameObject parentObj = null, int resLayer = int.MinValue)
         {
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
             if (itemCfg != null)
             if (itemCfg != null)
@@ -34,9 +34,9 @@ namespace GFGGame
                         parentObj = role.gameObject;
                         parentObj = role.gameObject;
                     }
                     }
                 }
                 }
-                if (layerId > int.MinValue)
+                if (resLayer > int.MinValue)
                 {
                 {
-                    updateLayerRes(itemCfg, parentObj, layerId, resLayer == 2, needSetMask, showAni);
+                    updateLayerRes(itemCfg, parentObj, resLayer, resLayer == 2, needSetMask, showAni);
                 }
                 }
                 else
                 else
                 {
                 {

+ 2 - 2
GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -186,12 +186,12 @@ namespace GFGGame
 
 
         }
         }
         //拍照场景添加单个道具
         //拍照场景添加单个道具
-        public static void AddItemToScene(GameObject sceneObj, GameObject parentGameObj, int itemId, int layerId, int resLayer)
+        public static void AddItemToScene(GameObject sceneObj, GameObject parentGameObj, int itemId, int resLayer)
         {
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
 
 
             parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
             parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
-            DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, layerId, resLayer);
+            DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, resLayer);
             SceneController.SetBoxCollider2DToGameObject(parentGameObj.transform.GetChild(0).gameObject);
             SceneController.SetBoxCollider2DToGameObject(parentGameObj.transform.GetChild(0).gameObject);
         }
         }
 
 

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -192,7 +192,7 @@ namespace GFGGame
                     break;
                     break;
 
 
                 case EnumPhotographType.SCENE:
                 case EnumPhotographType.SCENE:
-                    AddSceneItem(itemCfg, false, true);
+                    AddSceneItem(itemCfg, true);
                     break;
                     break;
                 case EnumPhotographType.EFFECT:
                 case EnumPhotographType.EFFECT:
 
 
@@ -209,12 +209,12 @@ namespace GFGGame
                 {
                 {
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
 
 
-                    AddSceneItem(itemCfg, true, false);
+                    AddSceneItem(itemCfg, false);
                 }
                 }
             }
             }
         }
         }
 
 
-        private void AddSceneItem(ItemCfg itemCfg, bool isDefaultLayer, bool setLayer)
+        private void AddSceneItem(ItemCfg itemCfg, bool setLayer)
         {
         {
             if (itemCfg.resLayer2 > 0)
             if (itemCfg.resLayer2 > 0)
             {
             {