Compare commits
No commits in common. "85246472d961fa9f0e033a463d3daf7ac4b65b16" and "61817ef075e822ae43c9e0a372b20cbc2a84c363" have entirely different histories.
85246472d9
...
61817ef075
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: cf122010443e3604895bdfb8410700d5
|
|
||||||
PrefabImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -585,7 +585,7 @@ MonoBehaviour:
|
||||||
onValueChanged:
|
onValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 1
|
m_IsOn: 0
|
||||||
--- !u!1 &2630901018476344866
|
--- !u!1 &2630901018476344866
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2772,7 +2772,8 @@ MonoBehaviour:
|
||||||
- {fileID: 8932471483062020681}
|
- {fileID: 8932471483062020681}
|
||||||
- {fileID: 64890494959671527}
|
- {fileID: 64890494959671527}
|
||||||
- {fileID: 4401106011680143311}
|
- {fileID: 4401106011680143311}
|
||||||
frequency: UHF;
|
frequency:
|
||||||
|
gamepos: {fileID: 0}
|
||||||
--- !u!54 &-3761067737480147572
|
--- !u!54 &-3761067737480147572
|
||||||
Rigidbody:
|
Rigidbody:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2829,16 +2830,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
number:
|
number:
|
||||||
slider: {fileID: 8342369848364726390}
|
slider: {fileID: 8342369848364726390}
|
||||||
standaloneevent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
doubleclickecent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
timer1: 0
|
|
||||||
lasttime: 0
|
|
||||||
count: 0
|
|
||||||
interval: 0.2
|
|
||||||
--- !u!1 &8469085005729862802
|
--- !u!1 &8469085005729862802
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1660,7 +1660,7 @@ MonoBehaviour:
|
||||||
onValueChanged:
|
onValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 1
|
m_IsOn: 0
|
||||||
--- !u!1 &4536037141069892858
|
--- !u!1 &4536037141069892858
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2945,7 +2945,8 @@ MonoBehaviour:
|
||||||
- {fileID: 1595232079232995888}
|
- {fileID: 1595232079232995888}
|
||||||
- {fileID: 848134281435870856}
|
- {fileID: 848134281435870856}
|
||||||
- {fileID: 6994627430635325071}
|
- {fileID: 6994627430635325071}
|
||||||
frequency: UHF;
|
frequency:
|
||||||
|
gamepos: {fileID: 0}
|
||||||
--- !u!54 &-5022022242888478449
|
--- !u!54 &-5022022242888478449
|
||||||
Rigidbody:
|
Rigidbody:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3002,16 +3003,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
number:
|
number:
|
||||||
slider: {fileID: 8156631250937224867}
|
slider: {fileID: 8156631250937224867}
|
||||||
standaloneevent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
doubleclickecent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
timer1: 0
|
|
||||||
lasttime: 0
|
|
||||||
count: 0
|
|
||||||
interval: 0.2
|
|
||||||
--- !u!1 &8523810302534801015
|
--- !u!1 &8523810302534801015
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -272,7 +272,7 @@ MonoBehaviour:
|
||||||
onValueChanged:
|
onValueChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_IsOn: 1
|
m_IsOn: 0
|
||||||
--- !u!1 &1761400387808716194
|
--- !u!1 &1761400387808716194
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2945,7 +2945,8 @@ MonoBehaviour:
|
||||||
- {fileID: 3776191318234792201}
|
- {fileID: 3776191318234792201}
|
||||||
- {fileID: 6688120530323237334}
|
- {fileID: 6688120530323237334}
|
||||||
- {fileID: 8540854955145205225}
|
- {fileID: 8540854955145205225}
|
||||||
frequency: HUF;
|
frequency:
|
||||||
|
gamepos: {fileID: 0}
|
||||||
--- !u!54 &-796140687388611865
|
--- !u!54 &-796140687388611865
|
||||||
Rigidbody:
|
Rigidbody:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3002,16 +3003,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
number:
|
number:
|
||||||
slider: {fileID: 6948589270895844640}
|
slider: {fileID: 6948589270895844640}
|
||||||
standaloneevent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
doubleclickecent:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
timer1: 0
|
|
||||||
lasttime: 0
|
|
||||||
count: 0
|
|
||||||
interval: 0.2
|
|
||||||
--- !u!1 &8450263572622937584
|
--- !u!1 &8450263572622937584
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -809,7 +809,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
toggle1.isOn = true;
|
toggle1.isOn = false;
|
||||||
toggle2.isOn = false;
|
toggle2.isOn = false;
|
||||||
toggle3.isOn = false;
|
toggle3.isOn = false;
|
||||||
toggle4.isOn = false;
|
toggle4.isOn = false;
|
||||||
|
|
@ -823,7 +823,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
Slider_speed.value = 0;
|
Slider_speed.value = 0;
|
||||||
Slider_rcs.value = 0;
|
Slider_rcs.value = 0;
|
||||||
Dropdown_orientation.value = 0;
|
Dropdown_orientation.value = 0;
|
||||||
Toggle1.isOn = true;
|
Toggle1.isOn = false;
|
||||||
Toggle2.isOn = false;
|
Toggle2.isOn = false;
|
||||||
Toggle3.isOn = false;
|
Toggle3.isOn = false;
|
||||||
Toggle4.isOn = false;
|
Toggle4.isOn = false;
|
||||||
|
|
@ -831,7 +831,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
Toggle6.isOn = false;
|
Toggle6.isOn = false;
|
||||||
Toggle7.isOn = false;
|
Toggle7.isOn = false;
|
||||||
toggle1.isOn = true;
|
toggle1.isOn = true;
|
||||||
toggle8.isOn = false;
|
toggle8.isOn = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
radar_panl.gameObject.SetActive(false);
|
radar_panl.gameObject.SetActive(false);
|
||||||
|
|
@ -1839,7 +1839,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
Scenariofile_panl.gameObject.SetActive(false);
|
Scenariofile_panl.gameObject.SetActive(false);
|
||||||
object_list_panl.gameObject.SetActive(true);
|
object_list_panl.gameObject.SetActive(true);
|
||||||
//Screen();
|
//Screen();
|
||||||
//Propertymodel();//场景对应模型生成对应的UI
|
Propertymodel();//添加场景双击删除按钮
|
||||||
if (strlist.Count > 0)
|
if (strlist.Count > 0)
|
||||||
{
|
{
|
||||||
Radarid();//保存雷达id
|
Radarid();//保存雷达id
|
||||||
|
|
@ -1866,7 +1866,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
{
|
{
|
||||||
if (arg1)
|
if (arg1)
|
||||||
{
|
{
|
||||||
Debug.Log(arg2);
|
Debug.LogError(arg2);
|
||||||
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
|
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
|
||||||
}
|
}
|
||||||
if (weaponitemone1.state)
|
if (weaponitemone1.state)
|
||||||
|
|
@ -1894,7 +1894,7 @@ public class Scenariopage : MonoBehaviour
|
||||||
{
|
{
|
||||||
if (arg1)
|
if (arg1)
|
||||||
{
|
{
|
||||||
Debug.Log(arg2);
|
Debug.LogError(arg2);
|
||||||
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
|
weaponitemone1 = Newtonsoft.Json.JsonConvert.DeserializeObject<Weaponitemone>(arg2);
|
||||||
}
|
}
|
||||||
if (weaponitemone1.state)
|
if (weaponitemone1.state)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class Secondarymovement : MonoBehaviour
|
public class Secondarymovement : MonoBehaviour
|
||||||
|
|
@ -14,13 +13,6 @@ public class Secondarymovement : MonoBehaviour
|
||||||
private float time1 = 3;
|
private float time1 = 3;
|
||||||
private float timer = 0;
|
private float timer = 0;
|
||||||
private Coroutine myCoroutine;
|
private Coroutine myCoroutine;
|
||||||
public UnityEvent standaloneevent;
|
|
||||||
public UnityEvent doubleclickecent;
|
|
||||||
public float timer1;//用来判断是否事单机还是双击
|
|
||||||
public float lasttime;//计入当前场景的时间
|
|
||||||
public int count;//用来判断点击了几下
|
|
||||||
public float interval = 0.2f;//用来判断双击间隔时间
|
|
||||||
private bool iscount = true;//用来判断的是单机还是双击
|
|
||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
if (GameMain.skip ==false)
|
if (GameMain.skip ==false)
|
||||||
|
|
@ -62,56 +54,10 @@ public class Secondarymovement : MonoBehaviour
|
||||||
slider.value = 0;
|
slider.value = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
if (Input.GetMouseButtonDown(1))
|
|
||||||
{
|
|
||||||
timer1 = 0.2f;
|
|
||||||
if (Time.realtimeSinceStartup - lasttime < interval)
|
|
||||||
{
|
|
||||||
count = 2;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
count = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (Input.GetMouseButtonUp(1))
|
|
||||||
{
|
|
||||||
iscount = false;
|
|
||||||
lasttime = Time.realtimeSinceStartup;
|
|
||||||
}
|
|
||||||
if (!iscount)
|
|
||||||
{
|
|
||||||
timer1 -= Time.deltaTime;
|
|
||||||
if (timer1 < 0)
|
|
||||||
{
|
|
||||||
if (count == 1)
|
|
||||||
{
|
|
||||||
|
|
||||||
standaloneevent?.Invoke();
|
|
||||||
}
|
|
||||||
else if (count == 2)
|
|
||||||
{
|
|
||||||
Deletionmodel();
|
|
||||||
doubleclickecent?.Invoke();
|
|
||||||
}
|
|
||||||
iscount = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Deletionmodel()
|
|
||||||
{
|
|
||||||
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
|
||||||
RaycastHit hit;
|
|
||||||
if (Physics.Raycast(ray, out hit, 1000))
|
|
||||||
{
|
|
||||||
Secondarymovement secondarymovement = hit.collider.GetComponent<Secondarymovement>();
|
|
||||||
if (secondarymovement&&secondarymovement.number==number)
|
|
||||||
{
|
|
||||||
Destroy(gameObject);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue