|
@@ -360,8 +360,7 @@ namespace GFGGame
|
|
|
{
|
|
|
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;
|
|
|
+
|
|
|
maxLayer = PhotographDataManager.Instance.GetMaxLayer(bodyParent, maxLayer) + 1;
|
|
|
}
|
|
|
//添加初始场景道具
|
|
@@ -416,14 +415,14 @@ namespace GFGGame
|
|
|
}
|
|
|
index = _equipSceneData[itemCfg.id].Count - 1;
|
|
|
parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, index, 1));
|
|
|
- SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, itemCfg.resLayer2);
|
|
|
- SpriteRenderer spr = parentGameObj.transform.GetChild(0).GetComponent<SpriteRenderer>();
|
|
|
- maxLayer = PhotographDataManager.Instance.GetMaxLayer(parentGameObj, maxLayer) + 1;
|
|
|
+ SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, 2, itemCfg.resLayer2);
|
|
|
|
|
|
- if (isDefaultLayer) return;
|
|
|
- // maxLayer = maxLayer + 1;
|
|
|
+ maxLayer = PhotographDataManager.Instance.GetMaxLayer(parentGameObj, maxLayer) + 1;
|
|
|
|
|
|
- PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
|
|
|
+ if (!isDefaultLayer)
|
|
|
+ {
|
|
|
+ PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
if (itemCfg.resLayer1 > 0)
|
|
@@ -435,22 +434,14 @@ namespace GFGGame
|
|
|
index = _equipSceneData[itemCfg.id].Count - 1;
|
|
|
|
|
|
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);
|
|
|
- // maxLayer = isDefaultLayer && maxLayer < itemTypeCfg.defaultLayer ? itemTypeCfg.defaultLayer : maxLayer + 1;
|
|
|
- // if (!isDefaultLayer)
|
|
|
- // {
|
|
|
- // // maxLayer = maxLayer + 1;
|
|
|
- // PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
|
|
|
- // }
|
|
|
+ SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, 1, itemCfg.resLayer1);
|
|
|
+
|
|
|
maxLayer = PhotographDataManager.Instance.GetMaxLayer(parentGameObj, maxLayer) + 1;
|
|
|
|
|
|
- if (isDefaultLayer) return;
|
|
|
- // maxLayer = PhotographDataManager.Instance.GetLayer(parentGameObj) + maxLayer + 1;
|
|
|
- // maxLayer = maxLayer + 1;
|
|
|
- PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
|
|
|
+ if (!isDefaultLayer)
|
|
|
+ {
|
|
|
+ PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|