diff --git a/Assets/Resources/UIPanel/Deviceinformation.prefab b/Assets/Resources/UIPanel/Deviceinformation.prefab index 784bf7fc..c44fbb88 100644 --- a/Assets/Resources/UIPanel/Deviceinformation.prefab +++ b/Assets/Resources/UIPanel/Deviceinformation.prefab @@ -236,7 +236,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "1.\u65E0\u4EBA\u673A" + m_Text: "\u9891\u8C31\u63A2\u6D4B" --- !u!1 &8515206955072374123 GameObject: m_ObjectHideFlags: 0 @@ -485,7 +485,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 2 + m_Text: 0 --- !u!1 &8515206956283252545 GameObject: m_ObjectHideFlags: 0 @@ -605,13 +605,13 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8515206956283252546} m_TextComponent: {fileID: 8515206955669019583} m_Placeholder: {fileID: 8515206955072374125} - m_ContentType: 0 + m_ContentType: 2 m_InputType: 0 m_AsteriskChar: 42 - m_KeyboardType: 0 + m_KeyboardType: 4 m_LineType: 0 m_HideMobileInput: 0 - m_CharacterValidation: 0 + m_CharacterValidation: 1 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: @@ -622,7 +622,7 @@ MonoBehaviour: m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: 2 + m_Text: 0 m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab index 86c33323..2c944eda 100644 --- a/Assets/Resources/model/重点攻击目标3.prefab +++ b/Assets/Resources/model/重点攻击目标3.prefab @@ -1562,7 +1562,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2949388239291875526 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index f0876169..7d6b0c4f 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -415,12 +415,12 @@ public class Scenariopage : MonoBehaviour if (ison) { pingpu3 += index + ","; - Debug.Log(pingpu3); + //Debug.Log(pingpu3); } else { pingpu3 = pingpu3.Replace(index + ",", ""); - Debug.Log(pingpu3); + //Debug.Log(pingpu3); } })); } @@ -439,12 +439,12 @@ public class Scenariopage : MonoBehaviour if (ison) { frequ += index + ","; - Debug.Log(frequ); + //Debug.Log(frequ); } else { frequ = frequ.Replace(index + ",", ""); - Debug.Log(frequ); + //Debug.Log(frequ); } })); } @@ -508,8 +508,8 @@ public class Scenariopage : MonoBehaviour private void WB(bool arg1, string arg2) { - Debug.LogError(arg1); - Debug.LogError(arg2); + //Debug.LogError(arg1); + //Debug.LogError(arg2); } private void Bobomethod() @@ -611,8 +611,8 @@ public class Scenariopage : MonoBehaviour private void PPTCWQ(bool arg1, string arg2) { - Debug.LogError(arg1); - Debug.LogError(arg2); + //Debug.LogError(arg1); + //Debug.LogError(arg2); } private void Spectrumweapon1() @@ -626,7 +626,7 @@ public class Scenariopage : MonoBehaviour { if (bol) { - Debug.LogError(str); + //Debug.LogError(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject(str); } for (int i = 0; i < toggleprobes.Count; i++) @@ -746,7 +746,7 @@ public class Scenariopage : MonoBehaviour if (ison) { quantity7 += index + ","; - Debug.Log(quantity7); + //Debug.Log(quantity7); } else { @@ -868,15 +868,15 @@ public class Scenariopage : MonoBehaviour } string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); - Debug.Log(str); + //Debug.Log(str); Dictionary dic = new Dictionary(); dic.Add("data", str); StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two20)); } public void Two20(bool bol, string str) { - Debug.Log(bol); - Debug.Log(str); + //Debug.Log(bol); + //Debug.Log(str); } private void Droneretrieval() { @@ -892,7 +892,7 @@ public class Scenariopage : MonoBehaviour { if (bol) { - Debug.Log(str); + //Debug.Log(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject(str); } if (weaponitemone1.state) @@ -901,7 +901,7 @@ public class Scenariopage : MonoBehaviour { uavnamelist2.Clear(); } - Debug.Log(weaponitemone1.data.Count); + //Debug.Log(weaponitemone1.data.Count); Toggle1.isOn = false; Toggle2.isOn = false; Toggle3.isOn = false; @@ -1134,15 +1134,15 @@ public class Scenariopage : MonoBehaviour } string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); - Debug.Log(str); + //Debug.Log(str); Dictionary dic = new Dictionary(); dic.Add("data", str); StartCoroutine(PostData2(Url_Updatedevicepara, dic, One4)); } public void One4(bool bol, string str) { - Debug.Log(bol); - Debug.Log(str); + //Debug.Log(bol); + //Debug.Log(str); } private void Wirelesssearch() @@ -1160,7 +1160,7 @@ public class Scenariopage : MonoBehaviour { if (bol) { - Debug.Log(str); + //Debug.Log(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject(str); } if (weaponitemone1.state) @@ -1169,7 +1169,7 @@ public class Scenariopage : MonoBehaviour { wirelesslist2.Clear(); } - Debug.Log(weaponitemone1.data.Count); + //Debug.Log(weaponitemone1.data.Count); for (int i = 0; i < weaponitemone1.data.Count; i++) { wirelesslist[i].text = weaponitemone1.data[i].para_name; @@ -1291,15 +1291,15 @@ public class Scenariopage : MonoBehaviour } string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); - Debug.Log(str); + //Debug.Log(str); Dictionary dic = new Dictionary(); dic.Add("data", str); StartCoroutine(PostData2(Url_Updatedevicepara, dic, getInfo5)); } public void getInfo5(bool bol, string str) { - Debug.Log(bol); - Debug.Log(str); + //Debug.Log(bol); + //Debug.Log(str); } private void Aircraftparameters() { @@ -1316,12 +1316,12 @@ public class Scenariopage : MonoBehaviour Weaponitemone weaponitemone1 = new Weaponitemone(); if (bol) { - Debug.Log(str); + //Debug.Log(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject(str); } if (weaponitemone1.state) { - Debug.Log(weaponitemone1.data.Count); + //Debug.Log(weaponitemone1.data.Count); for (int i = 0; i < weaponitemone1.data.Count; i++) { Rettalist[i].text = weaponitemone1.data[i].para_name; @@ -1379,19 +1379,19 @@ public class Scenariopage : MonoBehaviour aircraft.para_unit = laserunitlists[i]; aircraft.r1 = Laserunitlist[i].text; //aircraft.r2 = ""; - //aircraft.r3 = ""; k, + //aircraft.r3 = ""; aircrafts.Add(aircraft); } string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); - Debug.Log(str); + //Debug.Log(str); Dictionary dic = new Dictionary(); dic.Add("data", str); StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two1)); } public void Two1(bool bol, string str) { - Debug.Log(bol); - Debug.Log(str); + //Debug.Log(bol); + //Debug.Log(str); } private void Laserviewing() { @@ -1536,6 +1536,7 @@ public class Scenariopage : MonoBehaviour weather8.isOn = false; weather9.isOn = false; weather10.isOn = false; + xitong.isOn = true; switch (scen.data[i].EnvRain) { case "0": @@ -1648,7 +1649,19 @@ public class Scenariopage : MonoBehaviour Foggy_slider.value = float.Parse(scen.data[i].EnvWu); SetWindValue();//风速传值 - + if (kaiguan == false) + { + tmie = auto_text.text; + } + if (kaiguan == true) + { + tmie = year_text.text + month_text.text + day_text.text + when_text.text; + kaiguan = false; + } + Rain(tenkokuModule.weather_RainAmt); + Snow(tenkokuModule.weather_SnowAmt.ToString()); + WindAmt(tenkokuModule.weather_WindAmt.ToString()); + WindDir(tenkokuModule.weather_WindDir); var ss = Newtonsoft.Json.JsonConvert.DeserializeObject>(scen.data[i].DeviceContent); ss.ForEach((item) => { @@ -1960,126 +1973,7 @@ public class Scenariopage : MonoBehaviour } } } - public void Screen() - { - int a = 1; - int b = 1; - int c = 1; - int d = 1; - int e = 1; - int f = 1; - int g = 1; - int h = 1; - int y = 1; - int z = 1; - int a1 = 1; - int a2 = 1; - int a3 = 1; - int a4 = 1; - int a5 = 1; - int a6 = 1; - int a7 = 1; - int a8 = 1; - int a9 = 1; - for (int i = 0; i < DragManager.Instance.modellist.Count; i++) - { - if (DragManager.Instance.modellist[i] == "车辆1") - { - DragManager.Instance.modellist[i] += " (" + a + ")"; - a++; - } - if (DragManager.Instance.modellist[i] == "车辆2") - { - DragManager.Instance.modellist[i] += " (" + b + ")"; - b++; - } - if (DragManager.Instance.modellist[i] == "石块1") - { - DragManager.Instance.modellist[i] += " (" + c + ")"; - c++; - } - if (DragManager.Instance.modellist[i] == "石块2") - { - DragManager.Instance.modellist[i] += " (" + d + ")"; - d++; - } - if (DragManager.Instance.modellist[i] == "石块3") - { - DragManager.Instance.modellist[i] += " (" + e + ")"; - e++; - } - if (DragManager.Instance.modellist[i] == "石块4") - { - DragManager.Instance.modellist[i] += " (" + f + ")"; - f++; - } - if (DragManager.Instance.modellist[i] == "石块5") - { - DragManager.Instance.modellist[i] += " (" + g + ")"; - g++; - } - if (DragManager.Instance.modellist[i] == "树木1") - { - DragManager.Instance.modellist[i] += " (" + h + ")"; - h++; - } - if (DragManager.Instance.modellist[i] == "树木2") - { - DragManager.Instance.modellist[i] += " (" + y + ")"; - y++; - } - if (DragManager.Instance.modellist[i] == "树木3") - { - DragManager.Instance.modellist[i] += " (" + z + ")"; - z++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋1") - { - DragManager.Instance.modellist[i] += " (" + a1 + ")"; - a1++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋2") - { - DragManager.Instance.modellist[i] += " (" + a2 + ")"; - a2++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋3") - { - DragManager.Instance.modellist[i] += " (" + a3 + ")"; - a3++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋4") - { - DragManager.Instance.modellist[i] += " (" + a4 + ")"; - a4++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋5") - { - DragManager.Instance.modellist[i] += " (" + a5 + ")"; - a5++; - } - if (DragManager.Instance.modellist[i] == "三间瓦屋6") - { - DragManager.Instance.modellist[i] += " (" + a6 + ")"; - a6++; - } - if (DragManager.Instance.modellist[i] == "二层小楼") - { - DragManager.Instance.modellist[i] += " (" + a7 + ")"; - a7++; - } - if (DragManager.Instance.modellist[i] == "储物间1") - { - DragManager.Instance.modellist[i] += " (" + a8 + ")"; - a8++; - } - if (DragManager.Instance.modellist[i] == "储物间2") - { - DragManager.Instance.modellist[i] += " (" + a9 + ")"; - a9++; - } - } - } + private void Propertymodel() { if (properties.Count > 0)//判断生成UI预设体的个数是否大于零 @@ -2154,16 +2048,12 @@ public class Scenariopage : MonoBehaviour if (DragManager.Instance.devices[i] != null)//如果链表里有一个物体就进去 { Destroy(DragManager.Instance.devices[i].gameObject);//删除链表有的物体 - Debug.Log("清空链表"); + } } DragManager.Instance.devices.Clear();//清空链表 } - if (DragManager.Instance.modellist.Count > 0) - { - DragManager.Instance.modellist.Clear();//清空模型链表的名字 - } - //Modelitem();//把模型路径和对应的位置值传给接口 + if (Id.Length > 1) { View();//添加想定的设备接口 @@ -2252,9 +2142,9 @@ public class Scenariopage : MonoBehaviour } datalist.Add(data); } - Debug.Log(datalist); + //Debug.Log(datalist); string datas = Newtonsoft.Json.JsonConvert.SerializeObject(datalist); - Debug.Log(datas); + //Debug.Log(datas); Dictionary dic = new Dictionary(); //dic.Add("action", "adddevice"); dic.Add("think_id", "" + Id + ""); @@ -2263,8 +2153,8 @@ public class Scenariopage : MonoBehaviour } public void getInfo2(bool bol, string str) { - Debug.Log(bol); - Debug.Log(str); + //Debug.Log(bol); + //Debug.Log(str); Chaxun();//查询接口 } @@ -2752,7 +2642,7 @@ public class Scenariopage : MonoBehaviour { - Inquire();//查询接口 + Inquire();//查询设备想定接口 environment_configuration1.gameObject.SetActive(false); object_list_panl.gameObject.SetActive(false); @@ -2836,6 +2726,7 @@ public class Scenariopage : MonoBehaviour if (kaiguan == true) { tmie = year_text.text + month_text.text + day_text.text + when_text.text; + kaiguan = false; } Rain(tenkokuModule.weather_RainAmt); Snow(tenkokuModule.weather_SnowAmt.ToString()); @@ -2871,7 +2762,7 @@ public class Scenariopage : MonoBehaviour Environment.WindDir = "" + winddir + ""; Environment.Light = Slider.value.ToString("f0"); Environment.EnvWu = Foggy_slider.value.ToString("0"); - //Debug.LogError((1 - Slider.value / 10).ToString("f1")); + string res = JsonMapper.ToJson(Environment);//利用插件LitJson将类对象转为json Debug.Log(res); Dictionary formDic = new Dictionary();//用字典保存到对应的想定id里面 @@ -3011,7 +2902,7 @@ public class Scenariopage : MonoBehaviour windamt = "1"; break; } - Debug.LogError(windamt); + //Debug.LogError(windamt); } private void WindDir(float wind) { @@ -3160,10 +3051,10 @@ public class Scenariopage : MonoBehaviour tempEintAmt = 1.0f; break; } - Debug.LogError(tempEintAmt); - Debug.LogError(windDrop.value); + //Debug.LogError(tempEintAmt); + //Debug.LogError(windDrop.value); tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, tempEintAmt); - Debug.LogError(tenkokuModule.weather_WindAmt); + //Debug.LogError(tenkokuModule.weather_WindAmt); } diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index f14314c2..b66a1e3a 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -286472,16 +286472,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u9891\u8C31\u63A2\u6D4B" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -286592,16 +286582,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation (4) objectReference: {fileID: 0} - - target: {fileID: 8515206955669019583, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &548547111 stripped @@ -338521,16 +338501,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u63A2\u6D4B\u96F7\u8FBE" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -338641,11 +338611,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &633298599 stripped @@ -359913,16 +359878,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u5FAE\u6CE2\u6B66\u5668" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -360033,16 +359988,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation (5) objectReference: {fileID: 0} - - target: {fileID: 8515206955669019583, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &678954344 stripped @@ -740847,16 +740792,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u5730\u9762\u65E0\u7EBF\u7535\u5E72\u6270" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -740967,11 +740902,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation (1) objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &1456026332 stripped @@ -927156,7 +927086,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 192848890 + randSeed: 343539078 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -952051,16 +951981,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -952171,16 +952091,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation (3) objectReference: {fileID: 0} - - target: {fileID: 8515206955669019583, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &1868450397 stripped @@ -1048384,16 +1048294,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1118613071} m_Modifications: - - target: {fileID: 8515206955068824533, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: "\u8702\u7FA4\u65E0\u4EBA\u673A" - objectReference: {fileID: 0} - - target: {fileID: 8515206955072374125, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8515206955621953985, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} propertyPath: m_LocalPosition.x @@ -1048504,16 +1048404,6 @@ PrefabInstance: propertyPath: m_Name value: Deviceinformation (2) objectReference: {fileID: 0} - - target: {fileID: 8515206955669019583, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317, - type: 3} - propertyPath: m_Text - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3} --- !u!224 &2039072614 stripped diff --git a/Assets/Zion/Scripts/Adam/DragController.cs b/Assets/Zion/Scripts/Adam/DragController.cs index 60449396..41eaabc3 100644 --- a/Assets/Zion/Scripts/Adam/DragController.cs +++ b/Assets/Zion/Scripts/Adam/DragController.cs @@ -75,7 +75,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, if (DragManager.Instance != null) { DragManager.Instance.AddObj(model);//把对应模型传入链表 - DragManager.Instance.Addtext(modelname_text.text);//把对应名字存入链表 + } model = null; } diff --git a/Assets/Zion/Scripts/Adam/DragManager.cs b/Assets/Zion/Scripts/Adam/DragManager.cs index 30606b2b..89251df0 100644 --- a/Assets/Zion/Scripts/Adam/DragManager.cs +++ b/Assets/Zion/Scripts/Adam/DragManager.cs @@ -11,7 +11,7 @@ public class DragManager : MonoSingleton { public List deviceimages1 = new List();//把最终场景中存在的模型放入链表当中 public List devices = new List();//把最开始生成在场景中的模型存入链表 - public List modellist = new List();//存入最开始场景生成模型的名字 + public Dictionary model = new Dictionary(); @@ -26,14 +26,7 @@ public class DragManager : MonoSingleton } - //public void AddModeData(string str, GameObject gameObject) - //{ - // GameObject obj = null; - // if (model.TryGetValue(str, out obj)) - // return; - - // model.Add(str, gameObject); - //} + public void AddObj(GameObject obj) { devices.Add(obj);//把生成的预设体放入链表当中 @@ -42,10 +35,7 @@ public class DragManager : MonoSingleton { deviceimages1.Add(obj.GetComponent().modelequipment);//把场景中存在的的模型放入链表当众 } - public void Addtext(string name) - { - modellist.Add(name);//把UI上模型对应的名字存入链表 - } + public void RemoveObj(GameObject obj) { @@ -72,25 +62,4 @@ public class DragManager : MonoSingleton } } -//public class DragManager : MonoSingleton -//{ -// public Deviceimage prefab; - -// start() -// { -// for deviceimages -// Deviceimage d = instance (prefab) -// d.setvalue(Set, De, deviceimages[i].name ,) -// } - -// public void Set() -// { - -// } - -// public void De() -// { - - -// } -//} +