向Train Mode中添加LevelPanel调整
创建UI滑动进入和收回动画控制 创建一个通用的LevelProbabilityPanel而不是Start页面专用 将AddEventTrigger作为Extension添加到EventTrigger上 修改LevelPanel的Material为UniversalBlur
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
|
||||
public static class EventTriggerExtensions
|
||||
{
|
||||
public static void AddEventTrigger(this EventTrigger trigger, EventTriggerType type, UnityEngine.Events.UnityAction<BaseEventData> action)
|
||||
{
|
||||
EventTrigger.Entry entry = new EventTrigger.Entry();
|
||||
entry.eventID = type;
|
||||
entry.callback.AddListener(action);
|
||||
trigger.triggers.Add(entry);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2fd51a74b20da1040b8f0d4db7d9ef70
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,11 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public static class Vector3PositionExtensions
|
||||
{
|
||||
public static Vector3 FixCanvas(this Vector3 position,Vector3 originalVanvas,Vector3 nowVanvas)
|
||||
{
|
||||
return position + nowVanvas - originalVanvas;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 60aebf9c97041a74eaa7c10ce97e7ba0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2,7 +2,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public static class targetTypeExtensions
|
||||
public static class TargetTypeExtensions
|
||||
{
|
||||
public static int ToIndex(this Targets targetType)
|
||||
{
|
||||
|
||||
@@ -170,9 +170,9 @@ public class EnvironmentUIControl : MonoBehaviour
|
||||
// update state text
|
||||
// public TextMeshProUGUI stateText;
|
||||
// targetState[0] = targetTypeInt;
|
||||
// targetState[1] = targetPosition.x / raySensors.viewDistance; // normalization
|
||||
// targetState[2] = targetPosition.y / raySensors.viewDistance;
|
||||
// targetState[3] = targetPosition.z / raySensors.viewDistance;
|
||||
// targetState[1] = targetEndPosition.x / raySensors.viewDistance; // normalization
|
||||
// targetState[2] = targetEndPosition.y / raySensors.viewDistance;
|
||||
// targetState[3] = targetEndPosition.z / raySensors.viewDistance;
|
||||
// targetState[4] = blockCont.thisBlock.firebasesAreaDiameter / raySensors.viewDistance;
|
||||
// targetState[5] = blockCont.thisBlock.belongRatio;
|
||||
// float[] myObserve = { transform.localPosition.x/raySensors.viewDistance, transform.localPosition.y / raySensors.viewDistance, transform.localPosition.z / raySensors.viewDistance, transform.eulerAngles.y/360f }
|
||||
|
||||
@@ -44,18 +44,6 @@ public class HUDController : MonoBehaviour
|
||||
chartOn = chartOnToggleObj.isOn;
|
||||
}
|
||||
|
||||
public void OnEnemyNumTextChange()
|
||||
{
|
||||
try
|
||||
{
|
||||
enemyNum = Math.Abs(int.Parse(enemyNumInputObj.GetComponent<TMP_InputField>().text));
|
||||
}
|
||||
catch (NullReferenceException)
|
||||
{
|
||||
enemyNum = 3;
|
||||
}
|
||||
}
|
||||
|
||||
public void OnChartTimeOutTextChange()
|
||||
{
|
||||
try
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class LevelProbabilityPanel : MonoBehaviour
|
||||
{
|
||||
public GameObject singleTargetLevelProbabilityPanel;
|
||||
public GameObject startSceneData;
|
||||
private SceneBlocksSet scenePrefabSet;
|
||||
|
||||
public List<TargetLevelProbabilityPanel> targetLevelProbabilityPanel = new List<TargetLevelProbabilityPanel>();
|
||||
|
||||
private void Start()
|
||||
{
|
||||
if (startSceneData == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
// try get start scene data
|
||||
scenePrefabSet = GameObject.Find("StartSceneDataTransfer").GetComponent<StartSeneData>().scenePrefabSet;
|
||||
}
|
||||
catch
|
||||
{
|
||||
// if not found, find dummy StartSeneData
|
||||
scenePrefabSet = GameObject.Find("StartSceneDataTransferDummy").GetComponent<StartSeneData>().scenePrefabSet;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
scenePrefabSet = startSceneData.GetComponent<StartSeneData>().scenePrefabSet;
|
||||
}
|
||||
for (int i = 0; i < scenePrefabSet.targetLevels.Length; i++)
|
||||
{
|
||||
Targets nowTarget = scenePrefabSet.targets[i];
|
||||
targetLevelProbabilityPanel.Add(Instantiate(singleTargetLevelProbabilityPanel, transform).GetComponent<TargetLevelProbabilityPanel>());
|
||||
targetLevelProbabilityPanel[i].IntializePanels(scenePrefabSet.GetLevelNumber(nowTarget), nowTarget.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44d064c42ee56374e94671f4f9f9d650
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -109,8 +109,6 @@ public class StartMenuAnimations : MonoBehaviour
|
||||
private Vector3 fixCanvas(Vector3 vector)
|
||||
{
|
||||
// fix position of button while canvas is changed
|
||||
Vector3 fixedV = vector;
|
||||
fixedV += (transform.parent.position - originalCanvas);
|
||||
return fixedV;
|
||||
return vector.FixCanvas(originalCanvas,transform.parent.position);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user