fix:代码提交
This commit is contained in:
@@ -18,7 +18,7 @@ public class PnlIcon : ActionBase
|
||||
{ PageType.Icon02, new List<GameObject>() },
|
||||
{ PageType.Icon03, new List<GameObject>() },
|
||||
{ PageType.Icon04, new List<GameObject>() },
|
||||
// { PageType.Icon05, new List<GameObject>() }
|
||||
{ PageType.Icon05, new List<GameObject>() }
|
||||
};
|
||||
private Dictionary<PageType, List<IconData>> appCacheLists;
|
||||
private void InitializeAppCacheLists()
|
||||
@@ -29,15 +29,17 @@ public class PnlIcon : ActionBase
|
||||
{ PageType.Icon02, AppCache.iconPointList02 },
|
||||
{ PageType.Icon03, AppCache.iconPointList03 },
|
||||
{ PageType.Icon04, AppCache.iconPointList04 },
|
||||
{ PageType.Icon05, AppCache.iconPointList05 }
|
||||
};
|
||||
}
|
||||
|
||||
private Dictionary<PageType, string> textPrefixes = new Dictionary<PageType, string>
|
||||
{
|
||||
{ PageType.Icon01, "gnss监测" },
|
||||
{ PageType.Icon02, "水位" },
|
||||
{ PageType.Icon02, "测斜仪监测" },
|
||||
{ PageType.Icon03, "雨量监测" },
|
||||
{ PageType.Icon04, "渗压计监测" },
|
||||
{ PageType.Icon05, "位移监测" }
|
||||
};
|
||||
|
||||
private Dictionary<PageType, string> prefabPaths = new Dictionary<PageType, string>
|
||||
@@ -46,14 +48,16 @@ public class PnlIcon : ActionBase
|
||||
{ PageType.Icon02, "Icon2D/iconPrefab" },
|
||||
{ PageType.Icon03, "Icon2D/iconPrefab" },
|
||||
{ PageType.Icon04, "Icon2D/iconPrefab" },
|
||||
{ PageType.Icon05, "Icon2D/iconPrefab" }
|
||||
};
|
||||
|
||||
private static readonly Dictionary<PageType, string> IconMapping = new Dictionary<PageType, string>
|
||||
{
|
||||
{ PageType.Icon01, "MT014" },
|
||||
{ PageType.Icon02, "MT011" },
|
||||
{ PageType.Icon02, "MT016" },
|
||||
{ PageType.Icon03, "MT002" },
|
||||
{ PageType.Icon04, "MT032" }
|
||||
{ PageType.Icon04, "MT031" },
|
||||
{ PageType.Icon05, "MT013" }
|
||||
};
|
||||
private GameObject Player;
|
||||
private CameraRover cameraRover;
|
||||
@@ -255,7 +259,8 @@ public class PnlIcon : ActionBase
|
||||
return AppCache.iconPointList01 != null &&
|
||||
AppCache.iconPointList02 != null &&
|
||||
AppCache.iconPointList03 != null &&
|
||||
AppCache.iconPointList04 != null;
|
||||
AppCache.iconPointList04 != null &&
|
||||
AppCache.iconPointList05 != null;
|
||||
}
|
||||
|
||||
void CloseIcon(PageType type)
|
||||
|
||||
@@ -7,7 +7,7 @@ using UnityEngine.UI;
|
||||
|
||||
public class PnlMain : ActionBase
|
||||
{
|
||||
private const int ButtonCount = 5;
|
||||
private const int ButtonCount = 6;
|
||||
private List<Button> buttons = new List<Button>();
|
||||
private List<Action> clickActions = new List<Action>();
|
||||
|
||||
@@ -25,15 +25,15 @@ public class PnlMain : ActionBase
|
||||
{
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04 },
|
||||
openPageType = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04 },
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04,PageType.Icon05 },
|
||||
actionPageType = PageType.Camera1,
|
||||
openDelay = 1f,
|
||||
buttonName = "all"
|
||||
},
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04 },
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon01 },
|
||||
actionPageType = PageType.Camera1,
|
||||
openDelay = 1f,
|
||||
@@ -41,15 +41,15 @@ public class PnlMain : ActionBase
|
||||
},
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04 },
|
||||
closePageTypes = new List<PageType> { PageType.Icon01,PageType.Icon02, PageType.Icon03, PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon02 },
|
||||
actionPageType = PageType.Camera2,
|
||||
openDelay = 1f,
|
||||
buttonName = "水位"
|
||||
buttonName = "测斜仪监测"
|
||||
},
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01, PageType.Icon02,PageType.Icon03, PageType.Icon04 },
|
||||
closePageTypes = new List<PageType> { PageType.Icon01, PageType.Icon02,PageType.Icon03, PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon03 },
|
||||
actionPageType = PageType.Camera1,
|
||||
openDelay = 1f,
|
||||
@@ -57,12 +57,20 @@ public class PnlMain : ActionBase
|
||||
},
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01, PageType.Icon02, PageType.Icon03,PageType.Icon04 },
|
||||
closePageTypes = new List<PageType> { PageType.Icon01, PageType.Icon02, PageType.Icon03,PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon04 },
|
||||
actionPageType = PageType.Camera1,
|
||||
openDelay = 1f,
|
||||
buttonName = "渗压计监测"
|
||||
}
|
||||
},
|
||||
new PageActionParams
|
||||
{
|
||||
closePageTypes = new List<PageType> { PageType.Icon01, PageType.Icon02, PageType.Icon03,PageType.Icon04,PageType.Icon05 },
|
||||
openPageType = new List<PageType> { PageType.Icon05 },
|
||||
actionPageType = PageType.Camera1,
|
||||
openDelay = 1f,
|
||||
buttonName = "位移监测"
|
||||
},
|
||||
};
|
||||
|
||||
public override void Init()
|
||||
|
||||
Reference in New Issue
Block a user