Compare commits
No commits in common. "cdd47ff47a4b334d9e54a47843b87b74e6ace828" and "ae8ad146db7efbc264c477a3347625ebe559df64" have entirely different histories.
cdd47ff47a
...
ae8ad146db
|
|
@ -209,7 +209,7 @@ public class Microwaveweapon : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Launchattack()
|
public void Launchattack()
|
||||||
{
|
{
|
||||||
if (miceopos != null&&Vector3.Distance(miceopos.position, transform.position) < micdistance)
|
if (miceopos != null)
|
||||||
{
|
{
|
||||||
micdistance = Vector3.Distance(miceopos.position, transform.position);
|
micdistance = Vector3.Distance(miceopos.position, transform.position);
|
||||||
var newdata = Getmicdata();
|
var newdata = Getmicdata();
|
||||||
|
|
@ -220,11 +220,6 @@ public class Microwaveweapon : MonoBehaviour
|
||||||
microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f);
|
microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f);
|
||||||
Closeattack(miceopos);
|
Closeattack(miceopos);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
ismicow = false;
|
|
||||||
miceopos = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 上传服务器即关闭激光
|
/// 上传服务器即关闭激光
|
||||||
|
|
|
||||||
|
|
@ -295,8 +295,6 @@ public class LaserFireControlPlatformManger : MonoBehaviour
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
targetPoint = null;
|
|
||||||
isLasing = false;
|
|
||||||
Debug.LogError("飞机不在摄像机范围内");
|
Debug.LogError("飞机不在摄像机范围内");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,14 +73,8 @@ public class DropdownDouble : MonoBehaviour, IPointerClickHandler
|
||||||
_currentSubjectInfo.data = _data;
|
_currentSubjectInfo.data = _data;
|
||||||
subjectInfos.Add(_currentSubjectInfo);
|
subjectInfos.Add(_currentSubjectInfo);
|
||||||
}
|
}
|
||||||
Debug.Log(transform.GetSiblingIndex());
|
|
||||||
if (transform.GetSiblingIndex() == 1)
|
|
||||||
{
|
|
||||||
Debug.Log("初始化");
|
|
||||||
PointerClick();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -97,16 +91,11 @@ public class DropdownDouble : MonoBehaviour, IPointerClickHandler
|
||||||
|
|
||||||
// 单击事件
|
// 单击事件
|
||||||
public void OnPointerClick(PointerEventData eventData)
|
public void OnPointerClick(PointerEventData eventData)
|
||||||
{
|
|
||||||
PointerClick();
|
|
||||||
//DoublePlayMain.instance.videolistmanager.VideoMain();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PointerClick()
|
|
||||||
{
|
{
|
||||||
Debug.Log("Dropdown value 2: " + dropdown.value);
|
Debug.Log("Dropdown value 2: " + dropdown.value);
|
||||||
DoublePlayMain.instance.doublePlayIntroduceList.IntroduceListShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]);
|
DoublePlayMain.instance.doublePlayIntroduceList.IntroduceListShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]);
|
||||||
DoublePlayMain.instance.doublePlayEvaluatePanel.DoublePlayEvaluatePanelShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]);
|
DoublePlayMain.instance.doublePlayEvaluatePanel.DoublePlayEvaluatePanelShow(dataItem, traininginformation, dropdown.value, subjectInfos[dropdown.value]);
|
||||||
DoublePlayMain.instance.videolistmanager._name = dataItem.Id;
|
DoublePlayMain.instance.videolistmanager._name = dataItem.Id;
|
||||||
|
//DoublePlayMain.instance.videolistmanager.VideoMain();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue