diff --git a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab index e0119532..b2f136e8 100644 --- a/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab +++ b/FuZhou_FirstPage/Assets/Resources/prefeb/modelItem.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2485691483878867194 RectTransform: m_ObjectHideFlags: 0 @@ -162,7 +162,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2485691485171461978 RectTransform: m_ObjectHideFlags: 0 @@ -322,7 +322,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7767037248709318626 RectTransform: m_ObjectHideFlags: 0 diff --git a/FuZhou_FirstPage/Assets/Scripts/CityPanel.cs b/FuZhou_FirstPage/Assets/Scripts/CityPanel.cs index 75f1c987..5b702df9 100644 --- a/FuZhou_FirstPage/Assets/Scripts/CityPanel.cs +++ b/FuZhou_FirstPage/Assets/Scripts/CityPanel.cs @@ -26,23 +26,27 @@ public class CityPanel : MonoBehaviour { if (isok) { - Application.ExternalCall("ClickCustom",result); - Debug.Log("调前端进入关区"+ custCodes); - //生成企业模型 - //JsonData data = JsonMapper.ToObject(result); - //var tmp = data["data"]; - //foreach (JsonData item in tmp) - //{ - // v_model_version v= JsonMapper.ToObject(item.ToJson()); - // if (ModelItem.modelItemPrefb == null) - // { - // ModelItem.modelItemPrefb = Resources.Load("prefeb/modelItem"); - // } - // GameObject go = Instantiate(ModelItem.modelItemPrefb, transform); - // go.GetComponent().Init(v,GetComponent()); - //} + JsonData data = JsonMapper.ToObject(result); + var tmp = data["data"]; + List list= new List(); + foreach (JsonData item in tmp) + { + v_model_version v = JsonMapper.ToObject(item.ToJson()); + if (ModelItem.modelItemPrefb == null) + { + ModelItem.modelItemPrefb = Resources.Load("prefeb/modelItem"); + } + GameObject go = Instantiate(ModelItem.modelItemPrefb, transform); + go.GetComponent().Init(v, GetComponent()); + list.Add(v); + } + + + Application.ExternalCall("ClickCustom", JsonMapper.ToJson(list)); + Debug.Log("调前端进入关区" + custCodes); + //Debug.Log(JsonMapper.ToJson(list)); } else { diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs index 5f7377b7..933582cb 100644 --- a/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs +++ b/FuZhou_FirstPage/Assets/Scripts/Item/ModelItem.cs @@ -26,12 +26,15 @@ public class ModelItem : MonoBehaviour text.text = modelData.ModelName; GetComponent().anchoredPosition = new Vector2(float.Parse(modelData.MapLongitude)* citytrans.rect.width, float.Parse(modelData.MapLatitude)* citytrans.rect.height); - btn.onClick.AddListener(() => - { - //打开启动器 - Application.ExternalCall("StartModel", JsonMapper.ToJson(modelData)); - Debug.Log(JsonMapper.ToJson(modelData)); - }); + modelData.MapLongitude=(GetComponent().position.x/Screen.width).ToString(); + modelData.MapLatitude= (GetComponent().position.y/Screen.height).ToString(); + + //btn.onClick.AddListener(() => + //{ + // //打开启动器 + // Application.ExternalCall("StartModel", JsonMapper.ToJson(modelData)); + // Debug.Log(JsonMapper.ToJson(modelData)); + //}); } public void PointIn(BaseEventData data)