Эх сурвалжийг харах

拍照新添加道具居中

zhaoyang 3 жил өмнө
parent
commit
02e64b5cd6

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs

@@ -1,3 +1,4 @@
+using FairyGUI;
 using UnityEngine;
 using UnityEngine;
 
 
 namespace GFGGame
 namespace GFGGame
@@ -30,10 +31,10 @@ namespace GFGGame
             spr.sortingOrder = 10000;//边框在所有道具的上边
             spr.sortingOrder = 10000;//边框在所有道具的上边
 
 
         }
         }
-        public void AddSceneItem(ItemCfg itemCfg, int layer, bool setLayer)
+        public void AddSceneItem(GameObject parentGameObj, ItemCfg itemCfg, int layer, bool setLayer)
         {
         {
 
 
-            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, layer);
             SceneController.AddItemToScene(sceneObject, parentGameObj, itemCfg.id, layer);
             PhotographDataManager.Instance.AddItemGameObject(parentGameObj, setLayer);
             PhotographDataManager.Instance.AddItemGameObject(parentGameObj, setLayer);
 
 

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

@@ -239,7 +239,7 @@ namespace GFGGame
                 BoxCollider2D boxCollider2D = childGameObj.GetComponent<BoxCollider2D>();
                 BoxCollider2D boxCollider2D = childGameObj.GetComponent<BoxCollider2D>();
                 if (boxCollider2D != null)
                 if (boxCollider2D != null)
                 {
                 {
-                    size = GetGameObjectSize1(parentObj);
+                    size = GetGameObjectBoundsSize(parentObj);
                     if (parentObj.name == "Role") boxCollider2D.size = size;
                     if (parentObj.name == "Role") boxCollider2D.size = size;
                     boxCollider2D.offset = -childGameObj.transform.localPosition;
                     boxCollider2D.offset = -childGameObj.transform.localPosition;
                     //* childGameObj.transform.localScale
                     //* childGameObj.transform.localScale
@@ -249,7 +249,7 @@ namespace GFGGame
             }
             }
             return Vector2.zero;
             return Vector2.zero;
         }
         }
-        private static Vector2 GetGameObjectSize1(GameObject parentObj)
+        private static Vector2 GetGameObjectBoundsSize(GameObject parentObj)
         {
         {
             float right = int.MinValue;
             float right = int.MinValue;
             float left = int.MaxValue;
             float left = int.MaxValue;

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

@@ -16,7 +16,7 @@ namespace GFGGame
         private GameObject _scenePrefab;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
         private GameObject _sceneObject;
 
 
-        private const int MAX_COUNT = 20;
+        private const int MAX_COUNT = 8;
         private const float MaxScale = 2;
         private const float MaxScale = 2;
         private const float MinScale = 0.1f;
         private const float MinScale = 0.1f;
         private const string BgResPath = "Bg/BgRes";
         private const string BgResPath = "Bg/BgRes";
@@ -116,16 +116,9 @@ namespace GFGGame
 
 
             RefreshList(EnumPhotographType.BG);
             RefreshList(EnumPhotographType.BG);
             SetUIView();
             SetUIView();
-            // UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             PhotographSceneManager.Instance.AddBgItem(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
-
-            // UpdateBody();
             PhotographSceneManager.Instance.AddBodyItem();
             PhotographSceneManager.Instance.AddBodyItem();
             UpdateScene();
             UpdateScene();
-            // for (int i = 0; i < _itemGameObjs.Count; i++)
-            // {
-            //     PhotographDataManager.Instance.ChangeLayer(_itemGameObjs[i], i * 100, "up");
-            // }
             PhotographDataManager.Instance.SetLayer(null, "refresh");
             PhotographDataManager.Instance.SetLayer(null, "refresh");
 
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
             if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
@@ -216,15 +209,38 @@ namespace GFGGame
 
 
         private void AddSceneItem(ItemCfg itemCfg, bool setLayer)
         private void AddSceneItem(ItemCfg itemCfg, bool setLayer)
         {
         {
+            Vector2 pos = Vector2.zero;
             if (itemCfg.resLayer2 > 0)
             if (itemCfg.resLayer2 > 0)
             {
             {
-                PhotographSceneManager.Instance.AddSceneItem(itemCfg, itemCfg.resLayer2, setLayer);
+                GameObject parentGameObj2 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 2));
+                PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, itemCfg.resLayer2, setLayer);
+                if (setLayer)
+                {
+                    parentGameObj2.transform.localPosition = -parentGameObj2.transform.GetChild(0).localPosition;
+                    pos = parentGameObj2.transform.localPosition;
+                }
             }
             }
-
             if (itemCfg.resLayer1 > 0)
             if (itemCfg.resLayer1 > 0)
             {
             {
-                PhotographSceneManager.Instance.AddSceneItem(itemCfg, itemCfg.resLayer1, setLayer);
+                GameObject parentGameObj1 = new GameObject(string.Format("{0}_{1}", itemCfg.id, 1));
+                PhotographSceneManager.Instance.AddSceneItem(parentGameObj1, itemCfg, itemCfg.resLayer1, setLayer);
+
+                if (setLayer)
+                {
+                    if (itemCfg.resLayer2 > 0)
+                    {
+                        parentGameObj1.transform.localPosition = pos;
+                    }
+                    else
+                    {
+                        parentGameObj1.transform.localPosition = -parentGameObj1.transform.GetChild(0).localPosition;
+                    }
+                }
             }
             }
+
+            // GameObject parentGameObj2;
+
+
         }
         }
         /************************************************************场景*********************************************************/
         /************************************************************场景*********************************************************/