This commit is contained in:
yulong 2024-02-04 13:54:23 +08:00
parent 1c4687d832
commit bdc8c8bbe8
2 changed files with 43 additions and 74 deletions

View File

@ -415,12 +415,12 @@ public class Scenariopage : MonoBehaviour
if (ison) if (ison)
{ {
pingpu3 += index + ","; pingpu3 += index + ",";
Debug.Log(pingpu3); //Debug.Log(pingpu3);
} }
else else
{ {
pingpu3 = pingpu3.Replace(index + ",", ""); pingpu3 = pingpu3.Replace(index + ",", "");
Debug.Log(pingpu3); //Debug.Log(pingpu3);
} }
})); }));
} }
@ -439,12 +439,12 @@ public class Scenariopage : MonoBehaviour
if (ison) if (ison)
{ {
frequ += index + ","; frequ += index + ",";
Debug.Log(frequ); //Debug.Log(frequ);
} }
else else
{ {
frequ = frequ.Replace(index + ",", ""); 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) private void WB(bool arg1, string arg2)
{ {
Debug.LogError(arg1); //Debug.LogError(arg1);
Debug.LogError(arg2); //Debug.LogError(arg2);
} }
private void Bobomethod() private void Bobomethod()
@ -611,8 +611,8 @@ public class Scenariopage : MonoBehaviour
private void PPTCWQ(bool arg1, string arg2) private void PPTCWQ(bool arg1, string arg2)
{ {
Debug.LogError(arg1); //Debug.LogError(arg1);
Debug.LogError(arg2); //Debug.LogError(arg2);
} }
private void Spectrumweapon1() private void Spectrumweapon1()
@ -626,7 +626,7 @@ public class Scenariopage : MonoBehaviour
{ {
if (bol) if (bol)
{ {
Debug.LogError(str); //Debug.LogError(str);
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str);
} }
for (int i = 0; i < toggleprobes.Count; i++) for (int i = 0; i < toggleprobes.Count; i++)
@ -746,7 +746,7 @@ public class Scenariopage : MonoBehaviour
if (ison) if (ison)
{ {
quantity7 += index + ","; quantity7 += index + ",";
Debug.Log(quantity7); //Debug.Log(quantity7);
} }
else else
{ {
@ -868,15 +868,15 @@ public class Scenariopage : MonoBehaviour
} }
string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts);
Debug.Log(str); //Debug.Log(str);
Dictionary<string, string> dic = new Dictionary<string, string>(); Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("data", str); dic.Add("data", str);
StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two20)); StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two20));
} }
public void Two20(bool bol, string str) public void Two20(bool bol, string str)
{ {
Debug.Log(bol); //Debug.Log(bol);
Debug.Log(str); //Debug.Log(str);
} }
private void Droneretrieval() private void Droneretrieval()
{ {
@ -892,7 +892,7 @@ public class Scenariopage : MonoBehaviour
{ {
if (bol) if (bol)
{ {
Debug.Log(str); //Debug.Log(str);
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str);
} }
if (weaponitemone1.state) if (weaponitemone1.state)
@ -901,7 +901,7 @@ public class Scenariopage : MonoBehaviour
{ {
uavnamelist2.Clear(); uavnamelist2.Clear();
} }
Debug.Log(weaponitemone1.data.Count); //Debug.Log(weaponitemone1.data.Count);
Toggle1.isOn = false; Toggle1.isOn = false;
Toggle2.isOn = false; Toggle2.isOn = false;
Toggle3.isOn = false; Toggle3.isOn = false;
@ -1134,15 +1134,15 @@ public class Scenariopage : MonoBehaviour
} }
string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts);
Debug.Log(str); //Debug.Log(str);
Dictionary<string, string> dic = new Dictionary<string, string>(); Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("data", str); dic.Add("data", str);
StartCoroutine(PostData2(Url_Updatedevicepara, dic, One4)); StartCoroutine(PostData2(Url_Updatedevicepara, dic, One4));
} }
public void One4(bool bol, string str) public void One4(bool bol, string str)
{ {
Debug.Log(bol); //Debug.Log(bol);
Debug.Log(str); //Debug.Log(str);
} }
private void Wirelesssearch() private void Wirelesssearch()
@ -1160,7 +1160,7 @@ public class Scenariopage : MonoBehaviour
{ {
if (bol) if (bol)
{ {
Debug.Log(str); //Debug.Log(str);
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str);
} }
if (weaponitemone1.state) if (weaponitemone1.state)
@ -1169,7 +1169,7 @@ public class Scenariopage : MonoBehaviour
{ {
wirelesslist2.Clear(); wirelesslist2.Clear();
} }
Debug.Log(weaponitemone1.data.Count); //Debug.Log(weaponitemone1.data.Count);
for (int i = 0; i < weaponitemone1.data.Count; i++) for (int i = 0; i < weaponitemone1.data.Count; i++)
{ {
wirelesslist[i].text = weaponitemone1.data[i].para_name; wirelesslist[i].text = weaponitemone1.data[i].para_name;
@ -1291,15 +1291,15 @@ public class Scenariopage : MonoBehaviour
} }
string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts);
Debug.Log(str); //Debug.Log(str);
Dictionary<string, string> dic = new Dictionary<string, string>(); Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("data", str); dic.Add("data", str);
StartCoroutine(PostData2(Url_Updatedevicepara, dic, getInfo5)); StartCoroutine(PostData2(Url_Updatedevicepara, dic, getInfo5));
} }
public void getInfo5(bool bol, string str) public void getInfo5(bool bol, string str)
{ {
Debug.Log(bol); //Debug.Log(bol);
Debug.Log(str); //Debug.Log(str);
} }
private void Aircraftparameters() private void Aircraftparameters()
{ {
@ -1316,12 +1316,12 @@ public class Scenariopage : MonoBehaviour
Weaponitemone weaponitemone1 = new Weaponitemone(); Weaponitemone weaponitemone1 = new Weaponitemone();
if (bol) if (bol)
{ {
Debug.Log(str); //Debug.Log(str);
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str); weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(str);
} }
if (weaponitemone1.state) if (weaponitemone1.state)
{ {
Debug.Log(weaponitemone1.data.Count); //Debug.Log(weaponitemone1.data.Count);
for (int i = 0; i < weaponitemone1.data.Count; i++) for (int i = 0; i < weaponitemone1.data.Count; i++)
{ {
Rettalist[i].text = weaponitemone1.data[i].para_name; Rettalist[i].text = weaponitemone1.data[i].para_name;
@ -1379,19 +1379,19 @@ public class Scenariopage : MonoBehaviour
aircraft.para_unit = laserunitlists[i]; aircraft.para_unit = laserunitlists[i];
aircraft.r1 = Laserunitlist[i].text; aircraft.r1 = Laserunitlist[i].text;
//aircraft.r2 = ""; //aircraft.r2 = "";
//aircraft.r3 = ""; k, //aircraft.r3 = "";
aircrafts.Add(aircraft); aircrafts.Add(aircraft);
} }
string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts); string str = Newtonsoft.Json.JsonConvert.SerializeObject(aircrafts);
Debug.Log(str); //Debug.Log(str);
Dictionary<string, string> dic = new Dictionary<string, string>(); Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("data", str); dic.Add("data", str);
StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two1)); StartCoroutine(PostData2(Url_Updatedevicepara, dic, Two1));
} }
public void Two1(bool bol, string str) public void Two1(bool bol, string str)
{ {
Debug.Log(bol); //Debug.Log(bol);
Debug.Log(str); //Debug.Log(str);
} }
private void Laserviewing() private void Laserviewing()
{ {
@ -2142,9 +2142,9 @@ public class Scenariopage : MonoBehaviour
} }
datalist.Add(data); datalist.Add(data);
} }
Debug.Log(datalist); //Debug.Log(datalist);
string datas = Newtonsoft.Json.JsonConvert.SerializeObject(datalist); string datas = Newtonsoft.Json.JsonConvert.SerializeObject(datalist);
Debug.Log(datas); //Debug.Log(datas);
Dictionary<string, string> dic = new Dictionary<string, string>(); Dictionary<string, string> dic = new Dictionary<string, string>();
//dic.Add("action", "adddevice"); //dic.Add("action", "adddevice");
dic.Add("think_id", "" + Id + ""); dic.Add("think_id", "" + Id + "");
@ -2153,8 +2153,8 @@ public class Scenariopage : MonoBehaviour
} }
public void getInfo2(bool bol, string str) public void getInfo2(bool bol, string str)
{ {
Debug.Log(bol); //Debug.Log(bol);
Debug.Log(str); //Debug.Log(str);
Chaxun();//查询接口 Chaxun();//查询接口
} }
@ -2642,7 +2642,7 @@ public class Scenariopage : MonoBehaviour
{ {
Inquire();//查询接口 Inquire();//查询设备想定接口
environment_configuration1.gameObject.SetActive(false); environment_configuration1.gameObject.SetActive(false);
object_list_panl.gameObject.SetActive(false); object_list_panl.gameObject.SetActive(false);
@ -2762,7 +2762,7 @@ public class Scenariopage : MonoBehaviour
Environment.WindDir = "" + winddir + ""; Environment.WindDir = "" + winddir + "";
Environment.Light = Slider.value.ToString("f0"); Environment.Light = Slider.value.ToString("f0");
Environment.EnvWu = Foggy_slider.value.ToString("0"); Environment.EnvWu = Foggy_slider.value.ToString("0");
//Debug.LogError((1 - Slider.value / 10).ToString("f1"));
string res = JsonMapper.ToJson(Environment);//利用插件LitJson将类对象转为json string res = JsonMapper.ToJson(Environment);//利用插件LitJson将类对象转为json
Debug.Log(res); Debug.Log(res);
Dictionary<string, string> formDic = new Dictionary<string, string>();//用字典保存到对应的想定id里面 Dictionary<string, string> formDic = new Dictionary<string, string>();//用字典保存到对应的想定id里面
@ -2902,7 +2902,7 @@ public class Scenariopage : MonoBehaviour
windamt = "1"; windamt = "1";
break; break;
} }
Debug.LogError(windamt); //Debug.LogError(windamt);
} }
private void WindDir(float wind) private void WindDir(float wind)
{ {
@ -3051,10 +3051,10 @@ public class Scenariopage : MonoBehaviour
tempEintAmt = 1.0f; tempEintAmt = 1.0f;
break; break;
} }
Debug.LogError(tempEintAmt); //Debug.LogError(tempEintAmt);
Debug.LogError(windDrop.value); //Debug.LogError(windDrop.value);
tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, tempEintAmt); tenkokuModule.weather_WindAmt = Mathf.Lerp(0.0f, 1.0f, tempEintAmt);
Debug.LogError(tenkokuModule.weather_WindAmt); //Debug.LogError(tenkokuModule.weather_WindAmt);
} }

View File

@ -11,7 +11,7 @@ public class DragManager : MonoSingleton<DragManager>
{ {
public List<Modelequipment> deviceimages1 = new List<Modelequipment>();//把最终场景中存在的模型放入链表当中 public List<Modelequipment> deviceimages1 = new List<Modelequipment>();//把最终场景中存在的模型放入链表当中
public List<GameObject> devices = new List<GameObject>();//把最开始生成在场景中的模型存入链表 public List<GameObject> devices = new List<GameObject>();//把最开始生成在场景中的模型存入链表
public List<string> modellist = new List<string>();//存入最开始场景生成模型的名字
public Dictionary<string, int> model = new Dictionary<string, int>(); public Dictionary<string, int> model = new Dictionary<string, int>();
@ -26,14 +26,7 @@ public class DragManager : MonoSingleton<DragManager>
} }
//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) public void AddObj(GameObject obj)
{ {
devices.Add(obj);//把生成的预设体放入链表当中 devices.Add(obj);//把生成的预设体放入链表当中
@ -42,10 +35,7 @@ public class DragManager : MonoSingleton<DragManager>
{ {
deviceimages1.Add(obj.GetComponent<Modeldata>().modelequipment);//把场景中存在的的模型放入链表当众 deviceimages1.Add(obj.GetComponent<Modeldata>().modelequipment);//把场景中存在的的模型放入链表当众
} }
public void Addtext(string name)
{
modellist.Add(name);//把UI上模型对应的名字存入链表
}
public void RemoveObj(GameObject obj) public void RemoveObj(GameObject obj)
{ {
@ -72,25 +62,4 @@ public class DragManager : MonoSingleton<DragManager>
} }
} }
//public class DragManager : MonoSingleton<DragManager>
//{
// public Deviceimage prefab;
// start()
// {
// for deviceimages
// Deviceimage d = instance (prefab)
// d.setvalue(Set, De, deviceimages[i].name ,)
// }
// public void Set()
// {
// }
// public void De()
// {
// }
//}