This commit is contained in:
yulong 2023-12-11 13:43:15 +08:00
parent 8509f8a246
commit 5fe1857fc0
14 changed files with 1593 additions and 108 deletions

View File

@ -1415,7 +1415,7 @@ MonoBehaviour:
weather_cloudAltoStratusAmt: 0
weather_cloudCirrusAmt: 0
weather_cloudCumulusAmt: 0
weather_cloudScale: 8
weather_cloudScale: 10.5
weather_cloudSpeed: 0.084
weather_OvercastDarkeningAmt: 1
weather_OvercastAmt: 0
@ -1654,7 +1654,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 498133484
randSeed: 422705171
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &76575456

View File

@ -138,7 +138,7 @@ GameObject:
- component: {fileID: 1432105532577387308}
- component: {fileID: 3231389817124393935}
m_Layer: 9
m_Name: "\u65E0\u4EBA\u673AList"
m_Name: "\u65E0\u4EBA\u673AList_old"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -192,15 +192,13 @@ MonoBehaviour:
wayPoints: []
index1: 0
speed: 100
huoPaoControllerList: []
attackTarget: []
isMove: 0
dis: 0
limitDis: 0
firePos: {fileID: 7222213072416684655}
firePrefab: {fileID: 3257275699554257525, guid: deb8a70a5ca26dd41b3c33876785f507,
type: 3}
isGoToPlace: 0
isGoToPlace: 1
isAuto: 0
fireCount: 30
currentHuoPaoIndex: 0

Binary file not shown.

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c0b299817880e7f43b42aadfed2f817a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1574,9 +1574,9 @@ MonoBehaviour:
m_HandleRect: {fileID: 749958035}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 10
m_MaxValue: 100
m_WholeNumbers: 0
m_Value: 0
m_Value: 100
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
@ -7293,6 +7293,7 @@ RectTransform:
- {fileID: 8929732180791581995}
- {fileID: 1563486066}
- {fileID: 1136053770}
- {fileID: 3180684767354086347}
m_Father: {fileID: 6623670425880737214}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8200,6 +8201,84 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2752842313126106352
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3180684767354086347}
- component: {fileID: 2480163808270431038}
- component: {fileID: 6118971734338431410}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3180684767354086347
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2752842313126106352}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_Children: []
m_Father: {fileID: 767881268021807301}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 184, y: -160}
m_SizeDelta: {x: 300, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2480163808270431038
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2752842313126106352}
m_CullTransparentMesh: 0
--- !u!114 &6118971734338431410
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2752842313126106352}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9528302, g: 0.9033909, b: 0.9033909, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 60
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 60
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &6623670425880737213
GameObject:
m_ObjectHideFlags: 0
@ -8333,7 +8412,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 10
m_Text:
--- !u!1001 &1633798260
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -1 +1 @@
111.229.30.246:48888
172.16.1.254:48888

View File

@ -1 +1 @@
192.168.6.15
172.16.1.41

View File

@ -194,6 +194,11 @@ public class Environment
/// 阳光强度
/// </summary>
public string Light { get; set; }
///<summary>
/// 雾气大小
///</summary>
public string Thefog { get; set; }
}
[Serializable]
public class Traininginformation

View File

@ -114,7 +114,9 @@ public class Scenariopage : MonoBehaviour
public Environmentconfiguration Environmentconfiguration;
public Slider Slider;//天气变化的滑动条
public Text tips_text;//环境编辑提示文本
//[SerializeField] List<Environment> environments = new List<Environment>();
public Slider Foggy_slider;//雾天滑动调
public Text foggy_text;//雾天可见度显示
//[SerializeField] List<Environment> environments = new List<Environment>();
[SerializeField] string rainamt;//天气雨的传值
[SerializeField] string snowamt;//天气雪的传值
[SerializeField] string windamt;//风的等级的传值
@ -211,7 +213,7 @@ public class Scenariopage : MonoBehaviour
//public Text drive_text;//驱离文本
public Toggle Toggle_Crash;//迫降选项
//public Text crash_text;//迫降文本
public List<Toggle> toggledrive=new List<Toggle>();//
public List<Toggle> toggledrive = new List<Toggle>();//
public Dropdown Dropdown_power;//发射功率选项框
public float power;
public Text power_text;//功率选项框
@ -255,7 +257,7 @@ public class Scenariopage : MonoBehaviour
//是否有光学侦察能力
public Toggle toggle8;
public Toggle toggle9;
public List<Toggle> toggleslist= new List<Toggle>();//无人机页面选项
public List<Toggle> toggleslist = new List<Toggle>();//无人机页面选项
public List<Text> uavnamelist = new List<Text>();//无人机参数
public List<float> uavnamelist2 = new List<float>();//无人机数值
public List<Text> Droneunitlist = new List<Text>();//无人机单位
@ -321,11 +323,11 @@ public class Scenariopage : MonoBehaviour
private void Electronicreconnaissance()
{
if (toggles.Count>0)
if (toggles.Count > 0)
{
for (int i = 0; i < toggles.Count; i++)
{
if (toggles[i]!=null)
if (toggles[i] != null)
{
Destroy(toggles[i].gameObject);
}
@ -341,23 +343,23 @@ public class Scenariopage : MonoBehaviour
toggles.Add(toggle7);
for (int j = 0; j < toggles.Count; j++)
{
int index=j;
int index = j;
toggles[index].onValueChanged.AddListener((ison) =>
{
if (ison==true)
if (ison == true)
{
quantity7 = index;
Debug.Log(quantity7);
}
});
}
if (toggleslist.Count>0)
if (toggleslist.Count > 0)
{
for (int i = 0; i < toggleslist.Count; i++)
{
Destroy(toggleslist[i].gameObject);
}
toggleslist.Clear();
toggleslist.Clear();
}
toggleslist.Add(toggle8);
toggleslist.Add(toggle9);
@ -366,7 +368,7 @@ public class Scenariopage : MonoBehaviour
int index = i;
toggleslist[i].onValueChanged.AddListener((ison) =>
{
if (ison==true)
if (ison == true)
{
quantity8 = index;
}
@ -382,6 +384,17 @@ public class Scenariopage : MonoBehaviour
{
Droneretrieval();
}
else
{
Slider_endurance.value = 0;
Dropdown_wind.value = 0;
Slider_speed.value = 0;
Slider_rcs.value = 0;
Dropdown_orientation.value = 0;
Dropdown_communication.value = 0;
toggle1.isOn = true;
toggle8.isOn = true;
}
argument_panl.gameObject.SetActive(true);
});
off_btnn4.onClick.AddListener(() =>
@ -576,6 +589,14 @@ public class Scenariopage : MonoBehaviour
{
Wirelesssearch();//地面无线电查询
}
else
{
Dropdown_frequency.value = 0;
Toggle_Drive.isOn = true;
Dropdown_power.value = 0;
Slider_angle.value = 0;
Slider_distance.value = 0;
}
radio_wave_panl.gameObject.SetActive(true);
});
offbi_btn.onClick.AddListener(() =>
@ -595,13 +616,13 @@ public class Scenariopage : MonoBehaviour
{
radio_wave_panl.gameObject.SetActive(false);
});
if (toggledrive.Count>0)
if (toggledrive.Count > 0)
{
for (int i = 0; i < toggledrive.Count; i++)
{
Destroy(toggledrive[i].gameObject);
}
toggledrive.Clear();
toggledrive.Clear();
}
toggledrive.Add(Toggle_Drive);
toggledrive.Add(Toggle_Crash);
@ -610,13 +631,13 @@ public class Scenariopage : MonoBehaviour
int index = i;
toggledrive[index].onValueChanged.AddListener((ison) =>
{
if (ison==true)
if (ison == true)
{
drive = index;
}
});
}
}
private void Wirelessmodification()
@ -750,6 +771,13 @@ public class Scenariopage : MonoBehaviour
{
Aircraftparameters();
}
else
{
for (int i = 0; i < Radarparameterlist.Count; i++)
{
Radarparameterlist[i].value = 0;
}
}
radar_panl.gameObject.SetActive(true);
});
offguan1_btn.onClick.AddListener(() =>
@ -772,7 +800,7 @@ public class Scenariopage : MonoBehaviour
private void Modifyequipment()
{
List<Aircraft> aircrafts = new List<Aircraft>();
for (int i = 0; i < Rettalist.Count; i++)
{
@ -813,6 +841,7 @@ public class Scenariopage : MonoBehaviour
}
public void Weapon3(bool bol, string str)
{
Weaponitemone weaponitemone1 = new Weaponitemone();
if (bol)
{
Debug.Log(str);
@ -837,6 +866,13 @@ public class Scenariopage : MonoBehaviour
{
Laserviewing();//查询接口里面的参数
}
else
{
for (int i = 0; i < laserquantitylist.Count; i++)
{
laserquantitylist[i].value = 0;
}
}
valuerangepanl.gameObject.SetActive(true);
});
off1_btn1.onClick.AddListener(() =>
@ -987,6 +1023,7 @@ public class Scenariopage : MonoBehaviour
void LateUpdate()
{
tenkokuModule.weather_OvercastAmt = Mathf.Lerp(0.0f, 1.0f, 1 - Slider.value / 10);
tenkokuModule.weather_humidity = Mathf.Lerp(0.0f, 1.0f, 1 - Foggy_slider.value / 100);
SetWindDirection();
SetWindValue();
@ -998,6 +1035,7 @@ public class Scenariopage : MonoBehaviour
distance = Slider_distance.value;
frequ = Dropdown_frequency.value;
power = Dropdown_power.value;
foggy_text.text = Foggy_slider.value.ToString("0") + "%";
Radar();//雷达页面滑动条显示
Frequency(Dropdown_frequency.value);//干扰频率的下拉框
@ -1033,7 +1071,7 @@ public class Scenariopage : MonoBehaviour
distance_text.text = Slider_distance.value.ToString("0") + "km";
}
private void Frequency(int value)
{
@ -1388,11 +1426,11 @@ public class Scenariopage : MonoBehaviour
}
}
}
if (Id.Length>0)
if (Id.Length > 0)
{
Passbyvalue();//把场景中天气插件的值传给接口
}
//Modelitem();//把模型路径和对应的位置值传给接口
//Modelitem();//把模型路径和对应的位置值传给接口
if (Id.Length > 1)
{
View();//添加想定的设备接口
@ -1462,7 +1500,7 @@ public class Scenariopage : MonoBehaviour
}
private void Addweapons()
{
List<DataItem1> datalist = new List<DataItem1>();
for (int i = 0; i < namelists.Count; i++)
{
@ -1521,10 +1559,7 @@ public class Scenariopage : MonoBehaviour
{
stringlist.Add(weaponitem.data[i].id);
}
//PlayerPrefs.SetString("id0", stringlist[0]);
//PlayerPrefs.SetString("id1", stringlist[1]);
//PlayerPrefs.SetString("id2", stringlist[2]);
//PlayerPrefs.SetString("id3", stringlist[3]);
}
}
Saveaeroplane();//保存飞机参数值
@ -1535,9 +1570,9 @@ public class Scenariopage : MonoBehaviour
private void Dronereal()
{
List<Aircraft> aircrafts = new List<Aircraft>();
if (uavnamelist2.Count>0)
if (uavnamelist2.Count > 0)
{
uavnamelist2.Clear();
}
@ -1573,9 +1608,9 @@ public class Scenariopage : MonoBehaviour
private void Wirelessoutput()
{
List<Aircraft> aircrafts = new List<Aircraft>();
if (wirelesslist2.Count>0)
if (wirelesslist2.Count > 0)
{
wirelesslist2.Clear();
}
@ -1608,7 +1643,7 @@ public class Scenariopage : MonoBehaviour
private void Laserfirecontrol()
{
List<Aircraft> aircrafts = new List<Aircraft>();
for (int i = 0; i < laserlist.Count; i++)
{
@ -1634,7 +1669,7 @@ public class Scenariopage : MonoBehaviour
private void Saveaeroplane()
{
List<Aircraft> aircrafts = new List<Aircraft>();
for (int i = 0; i < Rettalist.Count; i++)
{
@ -1722,22 +1757,7 @@ public class Scenariopage : MonoBehaviour
Debug.Log(bol);
Debug.Log(str);
}
private void Modelitem()
{
string jsonmodel = Newtonsoft.Json.JsonConvert.SerializeObject(DragManager.Instance.deviceimages1);//把模型路径和位置参数转成json对象
//Debug.LogError(jsonmodel);
Dictionary<string, string> model = new Dictionary<string, string>();
model.Add("Id", "" + Id + "");//对应的想定ID
model.Add("DeviceContent", jsonmodel);//把对应的Json传到接口对应的字段里面
StartCoroutine(PostData1(Url_updatecontent, model, Model));
}
public void Model(bool s, string str)
{
Debug.Log(s);
Debug.Log(str);
}
public static IEnumerator PostData1(string url, Dictionary<string, string> model, System.Action<bool, string> action)
{
WWWForm form = new WWWForm();
@ -2001,7 +2021,16 @@ public class Scenariopage : MonoBehaviour
checklist[i].isOn = false;
}
}
if (weaponitem.data.Count == 0)
{
for (int j = 0; j < numberlist.Count; j++)
{
numberlist[j].text = "0";
checklist[j].isOn = false;
}
}
}
}
}
@ -2030,7 +2059,7 @@ public class Scenariopage : MonoBehaviour
WindDir(tenkokuModule.weather_WindDir);
//Debug.LogError(tenkokuModule.weather_WindAmt);
//tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text;
environment_configuration1.gameObject.SetActive(false);
}
@ -2048,7 +2077,7 @@ public class Scenariopage : MonoBehaviour
}
void Passbyvalue()
{
Environment Environment = new Environment();//需要传值对应类
//把需要传的值对象参数对应
Environment.Time = "" + tmie + "";
@ -2056,8 +2085,9 @@ public class Scenariopage : MonoBehaviour
Environment.Snow = "" + snowamt + "";
Environment.WindSpeed = "" + windamt + "";
Environment.WindDir = "" + winddir + "";
Environment.Light = (1-Slider.value/10).ToString("f1");
Debug.LogError((1 - Slider.value / 10).ToString("f1"));
Environment.Light = (1 - Slider.value / 10).ToString("f1");
//Environment.Thefog = (1 - Foggy_slider.value / 100).ToString("0") + "%";
//Debug.LogError((1 - Slider.value / 10).ToString("f1"));
string res = JsonMapper.ToJson(Environment);//利用插件LitJson将类对象转为json
Debug.Log(res);
Dictionary<string, string> formDic = new Dictionary<string, string>();//用字典保存到对应的想定id里面
@ -2074,7 +2104,22 @@ public class Scenariopage : MonoBehaviour
Modelitem();//把模型路径和对应的位置值传给接口
}
private void Modelitem()
{
string jsonmodel = Newtonsoft.Json.JsonConvert.SerializeObject(DragManager.Instance.deviceimages1);//把模型路径和位置参数转成json对象
//Debug.LogError(jsonmodel);
Dictionary<string, string> model = new Dictionary<string, string>();
model.Add("Id", "" + Id + "");//对应的想定ID
model.Add("DeviceContent", jsonmodel);//把对应的Json传到接口对应的字段里面
StartCoroutine(PostData1(Url_updatecontent, model, Model));
}
public void Model(bool s, string str)
{
Debug.Log(s);
Debug.Log(str);
}
public static IEnumerator PostData(string url, Dictionary<string, string> keyValuePairs, System.Action<bool, string> action)
{
WWWForm form = new WWWForm();
@ -2330,7 +2375,7 @@ public class Scenariopage : MonoBehaviour
}
//Debug.LogError(windDrop.value);
tenkokuModule.weather_WindAmt = Mathf.Lerp(0.1f, 1.1f, tempEintAmt);
}
public void SetWindDirection()

View File

@ -475,7 +475,7 @@ public class View_Panel2 : XUIPanel
///进入训练
start_training_btn.onClick.AddListener(() =>
{
GameMain.model = false;
GameMain.model = false;
//SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
//加入房间
Debug.Log("进入训练");

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
m_IndirectSpecularColor: {r: 0.16229844, g: 0.30645394, b: 0.67109674, a: 1}
m_IndirectSpecularColor: {r: 0.16521391, g: 0.30764452, b: 0.6578343, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -6651,36 +6651,6 @@ MonoBehaviour:
deviceID:
isPlayer: 0
isThinck: 0
--- !u!1 &142321708
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 142321709}
m_Layer: 0
m_Name: blueOriginPos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &142321709
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 142321708}
m_LocalRotation: {x: 0.27262092, y: -0, z: -0, w: 0.9621216}
m_LocalPosition: {x: -502, y: 410, z: -508}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 31.641, y: 0, z: 0}
--- !u!1 &147647007
GameObject:
m_ObjectHideFlags: 0
@ -48915,7 +48885,7 @@ MonoBehaviour:
type: 3}
currentSpt: {fileID: 0}
redSpawnPos: {fileID: 1618372688}
blueSpawnPos: {fileID: 142321709}
blueSpawnPos: {fileID: 0}
userIds:
tenkokuModule: {fileID: 1820978573}
modelsInfo: []
@ -63087,7 +63057,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 20472046
randSeed: 82898796
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574

File diff suppressed because it is too large Load Diff

View File

@ -335,7 +335,7 @@ public class GameManager : MonoSingleton<GameManager>
device.GetComponent<EquipmentCommon>().deviceID = data.id;
device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para);
}
private void OnGetRoomUsers(string obj)
{
if (!string.IsNullOrWhiteSpace(obj))

View File

@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq;
public static class InterfaceManager
{
private static string _IP = "111.229.30.246";
private static string _IP = "172.16.1.254";
public static string IP
{
get { return _IP; }
@ -166,6 +166,7 @@ public static class InterfaceManager
}
}
}
}
public static IEnumerator GetString(string url, Action<string> callback)