拍照优化

GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -15,6 +15,10 @@ namespace GFGGame
     }
     public class PhotographDataManager : SingletonBase<PhotographDataManager>
     {
+        public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
+        public Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
+
+
         public List<int> listBgData = new List<int>();
         public List<int> listNpcData = new List<int>();
         public List<int> listSceneData = new List<int>();
@@ -59,7 +63,24 @@ namespace GFGGame
             }
         }
 
-
+        //将穿戴数据分类
+        public void ClassifyEquipData()
+        {
+            _equipRoleData.Clear();
+            _equipSceneData.Clear();
+            for (int i = 0; i < EquipDataCache.cacher.equipDatas.Length; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.equipDatas[i]);
+                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
+                {
+                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
+                }
+                else
+                {
+                    _equipRoleData.Add(EquipDataCache.cacher.equipDatas[i]);
+                }
+            }
+        }
         public void AddEquipItem(Dictionary<int, List<int>> _equipSceneData, int itemID, out Dictionary<int, List<int>> equipSceneData)
         {
             if (!_equipSceneData.ContainsKey(itemID))
@@ -70,6 +91,33 @@ namespace GFGGame
             equipSceneData = _equipSceneData;
         }
 
+
+        public List<int> GetListData(EnumPhotographType index)
+        {
+            List<int> _listData = null;
+            switch (index)
+            {
+                case EnumPhotographType.BG:
+                    _listData = PhotographDataManager.Instance.listBgData;
+                    break;
+                case EnumPhotographType.NPC:
+                    _listData = PhotographDataManager.Instance.listNpcData;
+                    break;
+                case EnumPhotographType.SCENE:
+                    _listData = PhotographDataManager.Instance.listSceneData;
+                    break;
+                case EnumPhotographType.BORDER:
+                    _listData = PhotographDataManager.Instance.listBorderData;
+                    break;
+                case EnumPhotographType.EFFECT:
+                    _listData = PhotographDataManager.Instance.listEffectData;
+                    break;
+            }
+            return _listData;
+        }
+
+
+        //是否点击在UI上
         public bool IsTouchUI(GComponent viewCom)
         {
             GObject obj = GRoot.inst.touchTarget;
@@ -77,5 +125,48 @@ namespace GFGGame
             return _viewCom.m_comSelectBox.m_btnSize.GetChild("icon").asLoader == obj || _viewCom.m_comSelectBox.m_btnDelete.GetChild("icon").asLoader == obj || _viewCom.m_comSelectBox.m_btnFlip.GetChild("icon").asLoader == obj || _viewCom.m_btnBack == obj || _viewCom.m_btnChoose.GetChild("icon").asLoader == obj || _viewCom.m_btnPhotograph.GetChild("icon").asLoader == obj;
         }
 
+        //传入父物体，设置子物体层级
+        public void SetItemLayer(GameObject parentObj, int layer)
+        {
+            for (int i = 0; i < parentObj.transform.childCount; i++)
+            {
+                Transform tf = parentObj.transform.GetChild(i);
+                string[] strs = tf.name.Split('_');
+                if (strs.Length > 1 && strs[1] == "eff")//子物体是特效
+                {
+                    DressUpUtil.SetParticleSortingOrder(tf.gameObject, layer);
+                }
+                else
+                {
+                    tf.GetComponent<SpriteRenderer>().sortingOrder = layer;
+                }
+            }
+        }
+
+        public void SetBgPos(GameObject hitGameObj, Vector2 uiSize)
+        {
+            Vector2 size = hitGameObj.GetComponent<SpriteRenderer>().size;
+
+            float deviationWidth = (size.x - uiSize.x / 100) / 2;
+            float deviationHeigh = (size.y - uiSize.y / 100) / 2;
+            Vector2 pos = hitGameObj.transform.position;
+            if (pos.x <= -deviationWidth)
+            {
+                hitGameObj.transform.position = new Vector2(-deviationWidth, hitGameObj.transform.position.y);
+            }
+            if (pos.x >= deviationWidth)
+            {
+                hitGameObj.transform.position = new Vector2(deviationWidth, hitGameObj.transform.position.y);
+            }
+            if (pos.y <= -deviationHeigh)
+            {
+                hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, -deviationHeigh);
+            }
+            if (pos.y >= deviationHeigh)
+            {
+                hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, deviationHeigh);
+            }
+        }
+
     }
 }

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

@@ -155,7 +155,9 @@ namespace GFGGame
             }
         }
 
-        public static void UpdatePhotographBody(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null)
+
+        //拍照角色
+        public static void UpdatePhotographBody(int[] equipDatas, GameObject sceneObj, GameObject parentObj)
         {
             SceneController.UpdateRole(equipDatas, sceneObj, false, null, false, parentObj);
             if (EquipDataCache.cacher.IsSuitPic && EquipDataCache.cacher.suitId > 0)
@@ -163,13 +165,23 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(EquipDataCache.cacher.suitId);
                 DressUpUtil.UpdateBody(suitCfg.picRes, sceneObj, false, null, false, parentObj);
             }
-            GameObject gameObject = sceneObj.transform.Find("Scene/Role/Body").gameObject;
+            GameObject gameObject = parentObj.transform.Find("Body").gameObject;
+
+            SceneController.SetBoxCollider2DToGameObject(gameObject);
 
-            SceneController.PhotographAddCollider(gameObject);
+        }
+        //拍照场景添加单个道具
+        public static void AddItemToScene(GameObject sceneObj, GameObject parentGameObj, int itemId, int layerId)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
 
+            parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
+            DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, layerId);
+            SceneController.SetBoxCollider2DToGameObject(parentGameObj.transform.GetChild(0).gameObject);
         }
 
-        public static void UpdatePhotographBgOrNpcOrBorder(GameObject sceneObj, int itemId, Transform tf, string resPath)
+        //向Transform添加SpriteRenderer并设置资源
+        public static void SetSpriteRendererToTransform(Transform tf, string resPath)
         {
             tf.position = Vector3.zero;
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
@@ -186,8 +198,8 @@ namespace GFGGame
 
         }
 
-        //添加碰撞盒
-        public static void PhotographAddCollider(GameObject gameObject)
+        //向GameObject添加BoxCollider2D
+        public static void SetBoxCollider2DToGameObject(GameObject gameObject)
         {
             BoxCollider2D polygonCollider2D = gameObject.GetComponent<BoxCollider2D>();
             if (polygonCollider2D != null)
@@ -201,16 +213,8 @@ namespace GFGGame
         }
 
 
-        //场景添加单个道具
-        public static void AddItemToScene(GameObject sceneObj, GameObject parentGameObj, int itemId, int layerId)
-        {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
 
-            parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
-            DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, layerId);
-            SceneController.PhotographAddCollider(parentGameObj.transform.GetChild(0).gameObject);
-        }
-        //传入父物体，根据所有子物体大小计算父物体边框大小
+        //传入父物体，返回体碰撞盒大小
         public static Vector2 GetGameObjectSize(GameObject parentObj)
         {
             Vector2 size = Vector2.one;
@@ -269,14 +273,6 @@ namespace GFGGame
 
         }
 
-        //输入变换前后的向量，返回旋转角度
-        public static float GetRotationAngle(Vector3 lastRotation, Vector3 curRotation)
-        {
-            float angle = Vector3.Angle(lastRotation, curRotation); //求出两向量之间的夹角 
-            Vector3 normal = Vector3.Cross(lastRotation, curRotation);//叉乘求出法线向量 
-            angle *= Mathf.Sign(Vector3.Dot(normal, Vector3.forward));  //Mathf.Sign()求符号，Vector3.Dot()求方向，求法线向量与物体上方向向量点乘，结果为1或-1，修正旋转方向 
-            return angle;
-        }
 
         public static GameObject GetFirstHitObj(RaycastHit2D[] hit2Ds)
         {

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

@@ -13,23 +13,30 @@ namespace GFGGame
         private UI_PhotographUI _ui;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
-        private DressUpObjDataCache equipDataCache;
+        // private DressUpObjDataCache equipDataCache;
 
-        private const string MOVE = "MOVE";
-        private const string SCALE = "SCALE";
-        private const string ROTATION = "ROTATION";
+        // private const string MOVE = "MOVE";
+        // private const string SCALE = "SCALE";
+        // private const string ROTATION = "ROTATION";
         private const float MaxScale = 2;
         private const float MinScale = 0.1f;
-
-        private GameObject bodyParent;
-        private GameObject bgParent;
-        private GameObject npcParent;
-        private GameObject borderParent;
-        private GameObject sceneParent;
+        private const string BgResPath = "Bg/BgRes";
+        private const string BorderResPath = "Border/BorderRes";
+        private const string NpcResPath = "Scene/Npc/NpcRes";
+        private const string RolePath = "Scene/Role";
+        private const string NpcPath = "Scene/Npc";
+        private const string BgResName = "BgRes";
+        // private const string BorderResName = "BorderRes";
+
+        // private GameObject bodyParent;
+        // private GameObject bgParent;
+        // private GameObject npcParent;
+        // private GameObject borderParent;
+        // private GameObject sceneParent;
 
         private List<int> _listData = null;//当前选择的资源数据
-        private List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
-        private Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
+        public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
+        public Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
         private Dictionary<GameObject, float> _equipDistance = new Dictionary<GameObject, float>();
 
         private GameObject hitGameObj;//当前选中的物体（单指拖动，双指缩放旋转）
@@ -58,7 +65,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
-            _ui.m_btnChoose.onClick.Add(OnClickBtnChoose);
+            _ui.m_btnChoose.onClick.Add(SetUIView);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
 
@@ -88,32 +95,26 @@ namespace GFGGame
         {
             base.OnShown();
             Input.multiTouchEnabled = true;
-            equipDataCache = EquipDataCache.cacher;
+            // equipDataCache = EquipDataCache.cacher;
+            PhotographDataManager.Instance.ClassifyEquipData();
+            _equipRoleData = PhotographDataManager.Instance._equipRoleData;
+            _equipSceneData = PhotographDataManager.Instance._equipSceneData;
 
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 EquipDataCache.cacher.setSceneObj(_sceneObject);
-                bgParent = _sceneObject.transform.Find("Bg").gameObject;
-                bodyParent = _sceneObject.transform.Find("Scene/Role").gameObject;
-                sceneParent = _sceneObject.transform.Find("Scene").gameObject;
-                npcParent = _sceneObject.transform.Find("Scene/Npc").gameObject;
-                borderParent = _sceneObject.transform.Find("Border").gameObject;
             }
-
             pinchGesture = new PinchGesture(_ui.target);
             pinchGesture.onAction.Add(OnPinch);
             rotationGesture = new RotationGesture(_ui.target);
             rotationGesture.onAction.Add(OnRotate);
 
             _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex = 0;
-            OnClickBtnChoose();
-            RefreshList(EnumPhotographType.BG);
-            DisposeEquipData();
 
-            // SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, EnumPhotographType.BG, equipDataCache.bgId);
-
-            UpdateBg(ItemCfgArray.Instance.GetCfg(equipDataCache.bgId));
+            RefreshList(EnumPhotographType.BG);
+            SetUIView();
+            UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             UpdateBody();
             UpdateScene();
 
@@ -128,24 +129,7 @@ namespace GFGGame
         {
             _ui.m_ComSelectRes.m_list.numItems = 0;
 
-            switch (index)
-            {
-                case EnumPhotographType.BG:
-                    _listData = PhotographDataManager.Instance.listBgData;
-                    break;
-                case EnumPhotographType.NPC:
-                    _listData = PhotographDataManager.Instance.listNpcData;
-                    break;
-                case EnumPhotographType.SCENE:
-                    _listData = PhotographDataManager.Instance.listSceneData;
-                    break;
-                case EnumPhotographType.BORDER:
-                    _listData = PhotographDataManager.Instance.listBorderData;
-                    break;
-                case EnumPhotographType.EFFECT:
-                    _listData = PhotographDataManager.Instance.listEffectData;
-                    break;
-            }
+            _listData = PhotographDataManager.Instance.GetListData(index);
             _ui.m_ComSelectRes.m_list.numItems = _listData.Count;
         }
         private void RenderListItem(int index, GObject obj)
@@ -164,7 +148,6 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
 
             EnumPhotographType type = (EnumPhotographType)_ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex;
-
             switch (type)
             {
                 case EnumPhotographType.BG:
@@ -174,7 +157,7 @@ namespace GFGGame
                 case EnumPhotographType.BORDER:
                     if (_listData.IndexOf(itemID) == 0)
                     {
-                        Transform tf = _sceneObject.transform.Find("Border/BorderRes");
+                        Transform tf = _sceneObject.transform.Find(BorderResPath);
                         SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
                         if (spr != null)
                         {
@@ -213,6 +196,8 @@ namespace GFGGame
             if (hit2Ds.Length > 0)
             {
                 maxLayer++;
+                lastPos = Vector2.zero;
+
                 hitGameObj = SceneController.GetFirstHitObj(hit2Ds);
 
                 _ui.m_comSelectBox.m_btnDelete.visible = true;
@@ -221,37 +206,21 @@ namespace GFGGame
                     _ui.m_comSelectBox.m_btnDelete.visible = false;
                 }
                 _ui.m_comSelectBox.target.visible = false;
-                if (hitGameObj.name != "BgRes")//背景不可改动层级
+                if (hitGameObj.name != BgResName)//背景不可改动层级
                 {
                     hitGameObj = hitGameObj.transform.parent.gameObject;
 
-                    for (int i = 0; i < hitGameObj.transform.childCount; i++)
-                    {
-                        Transform obj = hitGameObj.transform.GetChild(i);
-                        string[] strs = obj.name.Split('_');
-                        if (strs.Length > 1 && strs[1] == "eff")
-                        {
-                            DressUpUtil.SetParticleSortingOrder(obj.gameObject, maxLayer);
-                        }
-                        else
-                        {
-                            obj.GetComponent<SpriteRenderer>().sortingOrder = maxLayer;
-                        }
-                    }
-                    // maxLayer = layer;
+                    PhotographDataManager.Instance.SetItemLayer(hitGameObj, maxLayer);
                     _ui.m_comSelectBox.target.visible = true;
 
                 }
                 SceneController.SetGameObjectCenter(hitGameObj);
+                memoryHitGameObj = hitGameObj;
 
                 distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitGameObj.transform.position);
 
-                lastPos = Vector2.zero;
                 _ui.m_comSelectBox.target.rotation = -hitGameObj.transform.eulerAngles.z;
                 _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitGameObj);
-
-                memoryHitGameObj = hitGameObj;
-
                 ControllerSelectBoxPos();
             }
         }
@@ -264,7 +233,6 @@ namespace GFGGame
             Debug.Log("拖动");
             ControllerObjectPos();
             ControllerSelectBoxPos();
-
         }
         private void OnTouchUIEnd(EventContext context)
         {
@@ -277,30 +245,9 @@ namespace GFGGame
         private void ControllerObjectPos()
         {
             hitGameObj.transform.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - distance);
-            if (hitGameObj.name == "BgRes")
+            if (hitGameObj.name == BgResName)
             {
-                Vector2 size = hitGameObj.GetComponent<SpriteRenderer>().size;
-                Vector2 uiSize = _ui.target.size;
-                float deviationWidth = (size.x - uiSize.x / 100) / 2;
-                float deviationHeigh = (size.y - uiSize.y / 100) / 2;
-                Vector2 pos = hitGameObj.transform.position;
-                if (pos.x <= -deviationWidth)
-                {
-                    hitGameObj.transform.position = new Vector2(-deviationWidth, hitGameObj.transform.position.y);
-                }
-                if (pos.x >= deviationWidth)
-                {
-                    hitGameObj.transform.position = new Vector2(deviationWidth, hitGameObj.transform.position.y);
-                }
-                if (pos.y <= -deviationHeigh)
-                {
-                    hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, -deviationHeigh);
-                }
-                if (pos.y >= deviationHeigh)
-                {
-                    hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, deviationHeigh);
-                }
-
+                PhotographDataManager.Instance.SetBgPos(hitGameObj, _ui.target.size);
             }
         }
         //选中框的位置
@@ -315,7 +262,6 @@ namespace GFGGame
 
         private void OnTouchBtnSizeBegin(EventContext context)
         {
-
             InputEvent inputEvent = (InputEvent)context.data;
             Vector2 screenPos = this.viewCom.GlobalToLocal(_ui.m_comSelectBox.m_btnSize.LocalToGlobal(Vector2.zero));
             Vector2 pt = new Vector2(screenPos.x, screenPos.y);
@@ -326,7 +272,6 @@ namespace GFGGame
                 float distance = Vector2.Distance(pt, pt2) / memoryHitGameObj.transform.localScale.x;
                 _equipDistance.Add(memoryHitGameObj, distance);
             }
-
         }
         private void OnTouchBtnSizeMove(EventContext context)
         {
@@ -348,8 +293,6 @@ namespace GFGGame
             float newValue = Mathf.Clamp(ss, 0.1f, 2);
             ControllerScale(newValue, memoryHitGameObj);
 
-            // Vector2 center = SceneController.SetGameObjectCenter(hitGameObj);
-            // memoryHitGameObj.transform.position = Camera.main.ScreenToWorldPoint(center); //center;
         }
         private void OnTouchBtnSizeEnd(EventContext context)
         {
@@ -363,7 +306,7 @@ namespace GFGGame
         {
 
             if (hitGameObj == null) return;
-            if (hitGameObj.name == "BgRes") return;//背景不可以缩放、旋转
+            if (hitGameObj.name == BgResName) return;//背景不可以缩放、旋转
 
             GTween.Kill(hitGameObj);
             PinchGesture gesture = (PinchGesture)context.sender;
@@ -372,12 +315,13 @@ namespace GFGGame
 
             ControllerScale(newValue, hitGameObj);
         }
+        //双指旋转
         private void OnRotate(EventContext context)
         {
             Debug.Log("双指旋转hitGameObj:" + hitGameObj);
             if (hitGameObj == null) return;
             Debug.Log("双指旋转name:" + hitGameObj.name);
-            if (hitGameObj.name == "BgRes") return;//背景不可以缩放、旋转
+            if (hitGameObj.name == BgResName) return;//背景不可以缩放、旋转
             // isTwoTouchPoint = true;
 
             GTween.Kill(hitGameObj.transform);
@@ -403,18 +347,19 @@ namespace GFGGame
 
         private void UpdateBg(ItemCfg itemCfg)
         {
-            Transform tf = _sceneObject.transform.Find("Bg/BgRes");
+            Transform tf = _sceneObject.transform.Find(BgResPath);
             string resPath = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
-            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, itemCfg == null ? equipDataCache.bgId : itemCfg.id, tf, resPath);
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             spr.sortingOrder = ItemTypeCfgArray.Instance.GetCfg(ConstDressUpItemType.BEI_JING).defaultLayer;
-            SceneController.PhotographAddCollider(tf.gameObject);
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
         }
         //主角
         private void UpdateBody()
         {
-            SceneController.UpdatePhotographBody(_equipRoleData.ToArray(), _sceneObject, false, null, false, bodyParent);
-            int layer = _sceneObject.transform.Find("Scene/Role/Body").GetComponent<SpriteRenderer>().sortingOrder;
+            GameObject bodyParent = _sceneObject.transform.Find(RolePath).gameObject;
+            SceneController.UpdatePhotographBody(_equipRoleData.ToArray(), _sceneObject, bodyParent);
+            int layer = bodyParent.transform.Find("Body").GetComponent<SpriteRenderer>().sortingOrder;
             maxLayer = layer < maxLayer ? maxLayer : layer;
         }
         //添加初始场景道具
@@ -434,21 +379,21 @@ namespace GFGGame
         private void UpdateNpc(ItemCfg itemCfg)
         {
             maxLayer++;
-            Transform tf = _sceneObject.transform.Find("Scene/Npc/NpcRes");
+            Transform tf = _sceneObject.transform.Find(NpcResPath);
             string resPath = ResPathUtil.GetNpcPicFPath(itemCfg.res);
-            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, itemCfg.id, tf, resPath);
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             spr.sortingOrder = maxLayer;
             tf.localPosition = new Vector2(-spr.bounds.center.x, -spr.bounds.center.y);
-            SceneController.PhotographAddCollider(tf.gameObject);
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
         }
         private void UpdateBorder(ItemCfg itemCfg)
         {
-            Transform tf = _sceneObject.transform.Find("Border/BorderRes");
+            Transform tf = _sceneObject.transform.Find(BorderResPath);
             string resPath = ResPathUtil.GetPhotographFPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
-            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, itemCfg.id, tf, resPath);
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            spr.sortingOrder = 1000;
+            spr.sortingOrder = 10000;//边框在所有道具的上边
         }
         private void UpdateEffect()
         {
@@ -473,24 +418,8 @@ namespace GFGGame
                 SpriteRenderer spr = parentGameObj.transform.GetChild(0).GetComponent<SpriteRenderer>();
 
                 ItemTypeCfg itemTypeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
-                // spr.sortingOrder = isDefaultLayer ? itemTypeCfg.specialLayer : maxLayer + 1;
-
-
                 int layer = isDefaultLayer ? itemTypeCfg.specialLayer : maxLayer + 1;
-                for (int i = 0; i < parentGameObj.transform.childCount; i++)
-                {
-                    Transform obj = parentGameObj.transform.GetChild(i);
-                    string[] strs = obj.name.Split('_');
-                    if (strs.Length > 1 && strs[1] == "eff")
-                    {
-                        DressUpUtil.SetParticleSortingOrder(obj.gameObject, layer);
-                    }
-                    else
-                    {
-                        obj.GetComponent<SpriteRenderer>().sortingOrder = layer;
-
-                    }
-                }
+                PhotographDataManager.Instance.SetItemLayer(parentGameObj, layer);
                 maxLayer = layer;
 
             }
@@ -505,47 +434,19 @@ namespace GFGGame
                 parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, index, 0));
                 SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, itemCfg.resLayer1);
                 SpriteRenderer spr = parentGameObj.transform.GetChild(0).GetComponent<SpriteRenderer>();
-                ItemTypeCfg itemTypeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
 
+                ItemTypeCfg itemTypeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
                 int layer = isDefaultLayer ? itemTypeCfg.defaultLayer : maxLayer + 1;
-                for (int i = 0; i < parentGameObj.transform.childCount; i++)
-                {
-                    Transform obj = parentGameObj.transform.GetChild(i);
-                    string[] strs = obj.name.Split('_');
-                    if (strs.Length > 1 && strs[1] == "eff")
-                    {
-                        DressUpUtil.SetParticleSortingOrder(obj.gameObject, layer);
-                    }
-                    else
-                    {
-                        obj.GetComponent<SpriteRenderer>().sortingOrder = layer;
-                    }
-                }
+                PhotographDataManager.Instance.SetItemLayer(parentGameObj, layer);
                 maxLayer = layer;
 
             }
-
         }
 
 
 
 
-        private void DisposeEquipData()
-        {
-            for (int i = 0; i < equipDataCache.equipDatas.Length; i++)
-            {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDataCache.equipDatas[i]);
-                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
-                {
-                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
-                }
-                else
-                {
-                    _equipRoleData.Add(equipDataCache.equipDatas[i]);
-                }
-            }
 
-        }
 
         private void OnClickBtnBg()
         {
@@ -566,11 +467,11 @@ namespace GFGGame
 
         private void OnTouchBtnDeleteBegin()//删除
         {
-            if (memoryHitGameObj.transform.gameObject == bodyParent)
+            if (memoryHitGameObj.transform.name == RolePath)
             {
                 return;
             }
-            else if (memoryHitGameObj.transform.gameObject == npcParent)
+            else if (memoryHitGameObj.transform.name == NpcPath)
             {
                 SpriteRenderer spriteRenderer = memoryHitGameObj.transform.GetChild(0).GetComponent<SpriteRenderer>();
                 if (spriteRenderer != null)
@@ -589,7 +490,7 @@ namespace GFGGame
         {
 
         }
-        private void OnClickBtnChoose()
+        private void SetUIView()
         {
             _ui.m_ComSelectRes.target.visible = true;
             _ui.m_comSelectBox.target.visible = false;
@@ -629,7 +530,7 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            equipDataCache = null;
+            // equipDataCache = null;
             _equipRoleData.Clear();
             _equipSceneData.Clear();
             hitGameObj = null;