yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改 预制体

This commit is contained in:
YangHua 2023-11-18 17:34:46 +08:00
parent e5a6757d37
commit 9ff5c8bde0
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/DeviceBtn/HuoPao.prefab
View File

@ -77,7 +77,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u65E0\u4EBA\u673A" m_Text: "\u706B\u70AE"
--- !u!1 &3438159621899897934 --- !u!1 &3438159621899897934
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Resources/DeviceBtn/LeiDa.prefab
View File

@ -252,4 +252,4 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u65E0\u4EBA\u673A" m_Text: "\u96F7\u8FBE"

13
Assets/Zion/Scripts/Adam/DragController.cs
View File

@ -21,7 +21,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
//Debug.Log(prefabItem.name); //Debug.Log(prefabItem.name);
//Debug.Log(model.name); //Debug.Log(model.name);
} }
} }
public void OnDrag(PointerEventData eventData) public void OnDrag(PointerEventData eventData)
@ -44,10 +44,13 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
//} //}
//model.GetComponent<WRJController>().huoPaoControllerList = huoPaoCtrls; //model.GetComponent<WRJController>().huoPaoControllerList = huoPaoCtrls;
} }
DragManager.Instance.AddObj(model);//把对应模型传入链表 if (DragManager.Instance != null)
//DragManager.Instance.Addobj1(model);// {
//model.GetComponent<Modeldata>().SetPos();//重新获取该模型的位置的值 DragManager.Instance.AddObj(model);//把对应模型传入链表
DragManager.Instance.Addtext(modelname_text.text);//把对应名字存入链表 //DragManager.Instance.Addobj1(model);//
//model.GetComponent<Modeldata>().SetPos();//重新获取该模型的位置的值
DragManager.Instance.Addtext(modelname_text.text);//把对应名字存入链表
}
model = null; model = null;
} }
} }

2
Assets/Zion/Scripts/Adam/GameManager.cs
View File

@ -128,7 +128,7 @@ public class GameManager : MonoBehaviour
{ {
string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent; string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent;
Debug.Log(info); Debug.Log(info);
if (info.Length > 0) if (info.Length > 0 &&string .IsNullOrWhiteSpace(info))
{ {
modelsInfo = Jsonanalyze.FromJson<List<ModelInfo>>(info); modelsInfo = Jsonanalyze.FromJson<List<ModelInfo>>(info);
for (int i = 0; i < modelsInfo.Count; i++) for (int i = 0; i < modelsInfo.Count; i++)