|
@@ -1,1642 +1,1664 @@
|
|
|
-using LitJson;
|
|
+using LitJson;
|
|
|
-using SC.XR.Unity;
|
|
+using SC.XR.Unity;
|
|
|
-using System;
|
|
+using System;
|
|
|
-using System.Collections;
|
|
+using System.Collections;
|
|
|
-using System.Collections.Generic;
|
|
+using System.Collections.Generic;
|
|
|
-using System.IO;
|
|
+using System.IO;
|
|
|
-using UnityEngine;
|
|
+using UnityEngine;
|
|
|
-using UnityEngine.UI;
|
|
+using UnityEngine.UI;
|
|
|
-using XRTool.Util;
|
|
+using XRTool.Util;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- * 半自动交付/自动交付
|
|
+ * 半自动交付/自动交付
|
|
|
- * 景点、触发范围、水晶点应保持顺序对应
|
|
+ * 景点、触发范围、水晶点应保持顺序对应
|
|
|
- * 当前场景下景点名称不应重复
|
|
+ * 当前场景下景点名称不应重复
|
|
|
- * 同一景点下素材名称不应重复
|
|
+ * 同一景点下素材名称不应重复
|
|
|
- * ListShowObjs/ListColliderBoxs/ListCrystals半自动时在场景中推拽，全自动时全部由代码生成
|
|
+ * ListShowObjs/ListColliderBoxs/ListCrystals半自动时在场景中推拽，全自动时全部由代码生成
|
|
|
- *
|
|
+ *
|
|
|
- * 新增锚点列表
|
|
+ * 新增锚点列表
|
|
|
- * 锚点识别图Vuforia XML和DAT文件
|
|
+ * 锚点识别图Vuforia XML和DAT文件
|
|
|
- * 各个锚点的位置信息
|
|
+ * 各个锚点的位置信息
|
|
|
- *
|
|
+ *
|
|
|
- * 每次打开都下载vuforia文件
|
|
+ * 每次打开都下载vuforia文件
|
|
|
- * 自动加载生成ImageTarget
|
|
+ * 自动加载生成ImageTarget
|
|
|
- *
|
|
+ *
|
|
|
- */
|
|
+ */
|
|
|
-public class GameManager : MonoSingleton<GameManager>
|
|
+public class GameManager : MonoSingleton<GameManager>
|
|
|
-{
|
|
+{
|
|
|
- public Text text;
|
|
+ public Text text;
|
|
|
- public GameObject Map;
|
|
+ public GameObject Map;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- [SerializeField, Tooltip("景点对应的物体及景点下的素材")]
|
|
+ [SerializeField, Tooltip("景点对应的物体及景点下的素材")]
|
|
|
- private Dictionary<int, ObjectValue> ObjectValues = new Dictionary<int, ObjectValue>();
|
|
+ private Dictionary<int, ObjectValue> ObjectValues = new Dictionary<int, ObjectValue>();
|
|
|
- public List<ObjectValue> ColliderObjectValues = new List<ObjectValue>();
|
|
+ public List<ObjectValue> ColliderObjectValues = new List<ObjectValue>();
|
|
|
- [Header("Spoit")]
|
|
+ [Header("Spoit")]
|
|
|
- [Tooltip("景点对应的显示物体")]
|
|
+ [Tooltip("景点对应的显示物体")]
|
|
|
- public List<Transform> ListShowObjs;
|
|
+ public List<Transform> ListShowObjs;
|
|
|
- [Tooltip("景点对应的显示物体，本地添加物体")]
|
|
+ [Tooltip("景点对应的显示物体，本地添加物体")]
|
|
|
- public List<Transform> ListLocalShowObjs;
|
|
+ public List<Transform> ListLocalShowObjs;
|
|
|
- public bool isShowLoacalShowObjs = false;
|
|
+ public bool isShowLoacalShowObjs = false;
|
|
|
- [Tooltip("景点对应的物体触发范围")]
|
|
+ [Tooltip("景点对应的物体触发范围")]
|
|
|
- public List<Transform> ListColliderBoxs;
|
|
+ public List<Transform> ListColliderBoxs;
|
|
|
-
|
|
+
|
|
|
- private List<MeshRenderer> ListColiderBoxs_Mesh;
|
|
+ private List<MeshRenderer> ListColiderBoxs_Mesh;
|
|
|
- [Tooltip("景点对应的水晶点")]
|
|
+ [Tooltip("景点对应的水晶点")]
|
|
|
- public List<Transform> ListCrystals;
|
|
+ public List<Transform> ListCrystals;
|
|
|
- [Tooltip("景点对应的显示物体父物体")]
|
|
+ [Tooltip("景点对应的显示物体父物体")]
|
|
|
- public Transform ObjsParent;
|
|
+ public Transform ObjsParent;
|
|
|
- [Tooltip("触发器父物体")]
|
|
+ [Tooltip("触发器父物体")]
|
|
|
- public Transform CollidersParent;
|
|
+ public Transform CollidersParent;
|
|
|
- [Tooltip("水晶点父物体")]
|
|
+ [Tooltip("水晶点父物体")]
|
|
|
- public Transform CrystalsParent;
|
|
+ public Transform CrystalsParent;
|
|
|
- [Tooltip("锚点父物体")]
|
|
+ [Tooltip("锚点父物体")]
|
|
|
- public Transform AnchorsParent;
|
|
+ public Transform AnchorsParent;
|
|
|
- public GameObject ColliderItem;
|
|
+ public GameObject ColliderItem;
|
|
|
- public GameObject CrystalItem;
|
|
+ public GameObject CrystalItem;
|
|
|
- [Space(20)]
|
|
+ [Space(20)]
|
|
|
- [Tooltip("是否显示路径")]
|
|
+ [Tooltip("是否显示路径")]
|
|
|
- public bool IsShowLuJIng = true;
|
|
+ public bool IsShowLuJIng = true;
|
|
|
- [Tooltip("是否为编辑模式")]
|
|
+ [Tooltip("是否为编辑模式")]
|
|
|
- public bool IsEditor = true;
|
|
+ public bool IsEditor = true;
|
|
|
- [Tooltip("是否是全自动显示景点")]
|
|
+ [Tooltip("是否是全自动显示景点")]
|
|
|
- public bool IsAuto = true;
|
|
+ public bool IsAuto = true;
|
|
|
- [SerializeField, Tooltip("路径控制器")]
|
|
+ [SerializeField, Tooltip("路径控制器")]
|
|
|
- private RouteCtr RouteCtr;
|
|
+ private RouteCtr RouteCtr;
|
|
|
- [SerializeField, Tooltip("素材编辑器")]
|
|
+ [SerializeField, Tooltip("素材编辑器")]
|
|
|
- private EditorPanel m_EditorPanel;
|
|
+ private EditorPanel m_EditorPanel;
|
|
|
- [SerializeField, Tooltip("计算人物在地图上的位置")]
|
|
+ [SerializeField, Tooltip("计算人物在地图上的位置")]
|
|
|
- [Header("MinMap")]
|
|
+ [Header("MinMap")]
|
|
|
- private CalMap m_CalMap;
|
|
+ private CalMap m_CalMap;
|
|
|
- [SerializeField, Tooltip("小地图信息")]
|
|
+ [SerializeField, Tooltip("小地图信息")]
|
|
|
- private MinMap m_MinMap;
|
|
+ private MinMap m_MinMap;
|
|
|
- [Header("Setting")]
|
|
+ [Header("Setting")]
|
|
|
- [SerializeField, Tooltip("设置面板")]
|
|
+ [SerializeField, Tooltip("设置面板")]
|
|
|
- private SettingPanel m_SettingPanel;
|
|
+ private SettingPanel m_SettingPanel;
|
|
|
- [SerializeField, Tooltip("编辑器面板")]
|
|
+ [SerializeField, Tooltip("编辑器面板")]
|
|
|
- private Transform m_EditorCanvas;
|
|
+ private Transform m_EditorCanvas;
|
|
|
- [SerializeField, Tooltip("设置按钮")]
|
|
+ [SerializeField, Tooltip("设置按钮")]
|
|
|
- private Transform m_SetBtn;
|
|
+ private Transform m_SetBtn;
|
|
|
-
|
|
+
|
|
|
- [Header("地图比例")]
|
|
+ [Header("地图比例")]
|
|
|
- public Transform PointA;
|
|
+ public Transform PointA;
|
|
|
- public Transform PointB;
|
|
+ public Transform PointB;
|
|
|
- public Transform PointC;
|
|
+ public Transform PointC;
|
|
|
- public Transform PointD;
|
|
+ public Transform PointD;
|
|
|
- public bool isStart;
|
|
+ public bool isStart;
|
|
|
-
|
|
+
|
|
|
- public Vector2 WebMapSize;
|
|
+ public Vector2 WebMapSize;
|
|
|
- public Vector2 MapSize;
|
|
+ public Vector2 MapSize;
|
|
|
- public Vector2 MinMapSize = new Vector2(320, 135);
|
|
+ public Vector2 MinMapSize = new Vector2(320, 135);
|
|
|
- public string MapPicUrl;
|
|
+ public string MapPicUrl;
|
|
|
-
|
|
+
|
|
|
- [Header("展厅")]
|
|
+ [Header("展厅")]
|
|
|
- public GameObject MRZhanTing;
|
|
+ public GameObject MRZhanTing;
|
|
|
- public bool isPlayMRZhanTing;
|
|
+ public bool isPlayMRZhanTing;
|
|
|
- public IrobotMove m_IroBot;
|
|
+ public IrobotMove m_IroBot;
|
|
|
- [Header("Player")]
|
|
+ [Header("Player")]
|
|
|
- public PlayerTrigger Player;
|
|
+ public PlayerTrigger Player;
|
|
|
- [Header("Head")]
|
|
+ [Header("Head")]
|
|
|
- public Transform m_head;
|
|
+ public Transform m_head;
|
|
|
- [Header("虚拟导游")]
|
|
+ [Header("虚拟导游")]
|
|
|
- public List<IrobotMove> Irobots;
|
|
+ public List<IrobotMove> Irobots;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- private bool m_IsTriggerExiting;
|
|
+ private bool m_IsTriggerExiting;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public bool IsTriggerExiting
|
|
+ public bool IsTriggerExiting
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_IsTriggerExiting; }
|
|
+ get { return m_IsTriggerExiting; }
|
|
|
- set { m_IsTriggerExiting = value; }
|
|
+ set { m_IsTriggerExiting = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- private bool m_IsStartEditor;
|
|
+ private bool m_IsStartEditor;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public bool IsStartEditor
|
|
+ public bool IsStartEditor
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_IsStartEditor; }
|
|
+ get { return m_IsStartEditor; }
|
|
|
- set { m_IsStartEditor = value; }
|
|
+ set { m_IsStartEditor = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public bool m_IsRuning;
|
|
+ public bool m_IsRuning;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public bool IsRuning
|
|
+ public bool IsRuning
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_IsRuning; }
|
|
+ get { return m_IsRuning; }
|
|
|
- set { m_IsRuning = value; }
|
|
+ set { m_IsRuning = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- private int m_SpoitIndex;
|
|
+ private int m_SpoitIndex;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public int SpoitIndex
|
|
+ public int SpoitIndex
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_SpoitIndex; }
|
|
+ get { return m_SpoitIndex; }
|
|
|
- set { m_SpoitIndex = value; }
|
|
+ set { m_SpoitIndex = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public SceneValue m_SceneValue;
|
|
+ public SceneValue m_SceneValue;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public SceneValue SceneValue
|
|
+ public SceneValue SceneValue
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_SceneValue; }
|
|
+ get { return m_SceneValue; }
|
|
|
- set { m_SceneValue = value; }
|
|
+ set { m_SceneValue = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- private List<SpoitValue> m_SpoitValues;
|
|
+ private List<SpoitValue> m_SpoitValues;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public List<SpoitValue> SpoitValues
|
|
+ public List<SpoitValue> SpoitValues
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_SpoitValues; }
|
|
+ get { return m_SpoitValues; }
|
|
|
- set { m_SpoitValues = value; }
|
|
+ set { m_SpoitValues = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- private Dictionary<int, SpoitValueDetail> m_SpoitsValueDetail;
|
|
+ private Dictionary<int, SpoitValueDetail> m_SpoitsValueDetail;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public Dictionary<int, SpoitValueDetail> SpoitsValueDetail
|
|
+ public Dictionary<int, SpoitValueDetail> SpoitsValueDetail
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_SpoitsValueDetail; }
|
|
+ get { return m_SpoitsValueDetail; }
|
|
|
- set { m_SpoitsValueDetail = value; }
|
|
+ set { m_SpoitsValueDetail = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- public UIAnchorsPanel m_UIAnchorsPanel;
|
|
+ public UIAnchorsPanel m_UIAnchorsPanel;
|
|
|
-
|
|
+
|
|
|
- private Dictionary<Anchor, MeshRenderer> m_AnchorValue;
|
|
+ private Dictionary<Anchor, MeshRenderer> m_AnchorValue;
|
|
|
- public Dictionary<Anchor, MeshRenderer> AnchorValue
|
|
+ public Dictionary<Anchor, MeshRenderer> AnchorValue
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_AnchorValue; }
|
|
+ get { return m_AnchorValue; }
|
|
|
- set { m_AnchorValue = value; }
|
|
+ set { m_AnchorValue = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- private Dictionary<Anchor, GameObject> m_AnchorChild;
|
|
+ private Dictionary<Anchor, GameObject> m_AnchorChild;
|
|
|
-
|
|
+
|
|
|
- public Dictionary<Anchor,GameObject> AnchorChild
|
|
+ public Dictionary<Anchor,GameObject> AnchorChild
|
|
|
- {
|
|
+ {
|
|
|
- get { return m_AnchorChild; }
|
|
+ get { return m_AnchorChild; }
|
|
|
- set { m_AnchorChild = value; }
|
|
+ set { m_AnchorChild = value; }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- public Toggle EditorToggle;
|
|
+ public Toggle EditorToggle;
|
|
|
- private void Awake()
|
|
+ private void Awake()
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- private void Start()
|
|
+ private void Start()
|
|
|
- {
|
|
+ {
|
|
|
- this.gameObject.AddComponent<TimerMgr>();
|
|
+ this.gameObject.AddComponent<TimerMgr>();
|
|
|
-
|
|
+
|
|
|
- isStart = false;
|
|
+ isStart = false;
|
|
|
- m_SpoitsValueDetail = new Dictionary<int, SpoitValueDetail>();
|
|
+ m_SpoitsValueDetail = new Dictionary<int, SpoitValueDetail>();
|
|
|
- m_AnchorValue = new Dictionary<Anchor, MeshRenderer>();
|
|
+ m_AnchorValue = new Dictionary<Anchor, MeshRenderer>();
|
|
|
- m_AnchorChild = new Dictionary<Anchor, GameObject>();
|
|
+ m_AnchorChild = new Dictionary<Anchor, GameObject>();
|
|
|
- SceneValue = null;
|
|
+ SceneValue = null;
|
|
|
- m_IsStartEditor = false;
|
|
+ m_IsStartEditor = false;
|
|
|
- m_IsRuning = false;
|
|
+ m_IsRuning = false;
|
|
|
- m_SetBtn.gameObject.SetActive(false);
|
|
+ m_SetBtn.gameObject.SetActive(false);
|
|
|
-
|
|
+
|
|
|
- SpoitIndex = -1;
|
|
+ SpoitIndex = -1;
|
|
|
- SpoitValues = new List<SpoitValue>();
|
|
+ SpoitValues = new List<SpoitValue>();
|
|
|
- if (m_EditorPanel == null)
|
|
+ if (m_EditorPanel == null)
|
|
|
- {
|
|
+ {
|
|
|
- m_EditorPanel = GameObject.FindObjectOfType<EditorPanel>();
|
|
+ m_EditorPanel = GameObject.FindObjectOfType<EditorPanel>();
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- if (!IsAuto)
|
|
+ if (!IsAuto)
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- else
|
|
+ else
|
|
|
- {
|
|
+ {
|
|
|
- ListShowObjs = new List<Transform>();
|
|
+ ListShowObjs = new List<Transform>();
|
|
|
- ListColliderBoxs = new List<Transform>();
|
|
+ ListColliderBoxs = new List<Transform>();
|
|
|
- ListColiderBoxs_Mesh = new List<MeshRenderer>();
|
|
+ ListColiderBoxs_Mesh = new List<MeshRenderer>();
|
|
|
- ListCrystals = new List<Transform>();
|
|
+ ListCrystals = new List<Transform>();
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- m_MinMap.gameObject.SetActive(false);
|
|
+ m_MinMap.gameObject.SetActive(false);
|
|
|
- Map.SetActive(false);
|
|
+ Map.SetActive(false);
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- private void LateUpdate()
|
|
+ private void LateUpdate()
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- m_SetBtn.transform.LookAt(OpenXRCamera.Instance.head);
|
|
+ m_SetBtn.transform.LookAt(OpenXRCamera.Instance.head);
|
|
|
- m_SetBtn.transform.localEulerAngles = new Vector3(0, m_SetBtn.transform.localEulerAngles.y+180, 0);
|
|
+ m_SetBtn.transform.localEulerAngles = new Vector3(0, m_SetBtn.transform.localEulerAngles.y+180, 0);
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- m_SetBtn.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward * 1.3f + new Vector3(-0.2f, 1f, 0);
|
|
+ m_SetBtn.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward * 1.3f + new Vector3(-0.2f, 1f, 0);
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- public void Init()
|
|
+ public void Init()
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- private void InitCrystals()
|
|
+ private void InitCrystals()
|
|
|
- {
|
|
+ {
|
|
|
- for (int i = 0; i < ListCrystals.Count; i++)
|
|
+ for (int i = 0; i < ListCrystals.Count; i++)
|
|
|
- {
|
|
+ {
|
|
|
- ListCrystals[i].gameObject.SetActive(true);
|
|
+ ListCrystals[i].gameObject.SetActive(true);
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- private void InitBoxColliders()
|
|
+ private void InitBoxColliders()
|
|
|
- {
|
|
+ {
|
|
|
- for (int i = 0; i < ListColliderBoxs.Count; i++)
|
|
+ for (int i = 0; i < ListColliderBoxs.Count; i++)
|
|
|
- {
|
|
+ {
|
|
|
- ListColliderBoxs[i].gameObject.SetActive(true);
|
|
+ ListColliderBoxs[i].gameObject.SetActive(true);
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- public void IntoScene()
|
|
+ public void IntoScene()
|
|
|
- {
|
|
+ {
|
|
|
- Map.SetActive(true);
|
|
+ Map.SetActive(true);
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- StartCoroutine(StartScene(isPlayMRZhanTing));
|
|
+ StartCoroutine(StartScene(isPlayMRZhanTing));
|
|
|
- HttpSocket.Instance.SendIpToElectric();
|
|
+ HttpSocket.Instance.SendIpToElectric();
|
|
|
- }
|
|
+ }
|
|
|
- IEnumerator StartScene( bool isPlayMRZhanTing)
|
|
+ IEnumerator StartScene( bool isPlayMRZhanTing)
|
|
|
- {
|
|
+ {
|
|
|
- yield return new WaitForSeconds(0.5f);
|
|
+ yield return new WaitForSeconds(0.5f);
|
|
|
- if(isPlayMRZhanTing)
|
|
+ if(isPlayMRZhanTing)
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- MRZhanTing.gameObject.SetActive(true);
|
|
+ MRZhanTing.gameObject.SetActive(true);
|
|
|
- MRZhanTing.transform.position = API_GSXR_Slam.GSXR_Get_Head().position + API_GSXR_Slam.GSXR_Get_Head().forward + new Vector3(0, -0.7f, 0);
|
|
+ MRZhanTing.transform.position = API_GSXR_Slam.GSXR_Get_Head().position + API_GSXR_Slam.GSXR_Get_Head().forward + new Vector3(0, -0.7f, 0);
|
|
|
- MRZhanTing.transform.localEulerAngles = new Vector3(0, API_GSXR_Slam.GSXR_Get_Head().eulerAngles.y, 0);
|
|
+ MRZhanTing.transform.localEulerAngles = new Vector3(0, API_GSXR_Slam.GSXR_Get_Head().eulerAngles.y, 0);
|
|
|
- yield return new WaitForSeconds(18f);
|
|
+ yield return new WaitForSeconds(18f);
|
|
|
- MRZhanTing.gameObject.SetActive(false);
|
|
+ MRZhanTing.gameObject.SetActive(false);
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- m_SettingPanel.gameObject.SetActive(true);
|
|
+ m_SettingPanel.gameObject.SetActive(true);
|
|
|
- m_EditorPanel.Init();
|
|
+ m_EditorPanel.Init();
|
|
|
- m_SettingPanel.Init();
|
|
+ m_SettingPanel.Init();
|
|
|
- if (RouteCtr.CurrentPoints.Count > 0)
|
|
+ if (RouteCtr.CurrentPoints.Count > 0)
|
|
|
- {
|
|
+ {
|
|
|
- Player.MovePoints = RouteCtr.CurrentPoints;
|
|
+ Player.MovePoints = RouteCtr.CurrentPoints;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- m_IroBot.gameObject.SetActive(true);
|
|
+ m_IroBot.gameObject.SetActive(true);
|
|
|
- m_IroBot.Points = RouteCtr.CurrentPoints;
|
|
+ m_IroBot.Points = RouteCtr.CurrentPoints;
|
|
|
- yield return new WaitForSeconds(5f);
|
|
+ yield return new WaitForSeconds(5f);
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- IsRuning = true;
|
|
+ IsRuning = true;
|
|
|
- m_SetBtn.gameObject.SetActive(true);
|
|
+ m_SetBtn.gameObject.SetActive(true);
|
|
|
- InitCrystals();
|
|
+ InitCrystals();
|
|
|
- InitBoxColliders();
|
|
+ InitBoxColliders();
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ private int ChooseIroBot()
|
|
|
- private int ChooseIroBot()
|
|
+ {
|
|
|
- {
|
|
+ int id = 3;
|
|
|
- int id = 3;
|
|
+ var navlines = DataManager.Instance.CurrentScene.navLines;
|
|
|
- var navlines = DataManager.Instance.CurrentScene.navLines;
|
|
+ if (navlines.Count > 0)
|
|
|
- if (navlines.Count > 0)
|
|
+ {
|
|
|
- {
|
|
+ id = navlines[0].guideMod;
|
|
|
- id = navlines[0].guideMod;
|
|
+ }
|
|
|
- }
|
|
+ return id;
|
|
|
- return id;
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ private void GetObjectValue()
|
|
|
- private void GetObjectValue()
|
|
+ {
|
|
|
- {
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ #region 设置功能
|
|
|
- #region 设置功能
|
|
+
|
|
|
-
|
|
+ public void OnEditorBtnValueChanged(bool ison)
|
|
|
- public void OnEditorBtnValueChanged(bool ison)
|
|
+ {
|
|
|
- {
|
|
+ m_EditorCanvas.gameObject.SetActive(ison);
|
|
|
- m_EditorCanvas.gameObject.SetActive(ison);
|
|
+ m_IsStartEditor = ison;
|
|
|
- m_IsStartEditor = ison;
|
|
+
|
|
|
-
|
|
+ for (int i = 0; i < ListColiderBoxs_Mesh.Count; i++)
|
|
|
- for (int i = 0; i < ListColiderBoxs_Mesh.Count; i++)
|
|
+ {
|
|
|
- {
|
|
+ ListColiderBoxs_Mesh[i].enabled = ison;
|
|
|
- ListColiderBoxs_Mesh[i].enabled = ison;
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ if (ison)
|
|
|
- if (ison)
|
|
+ {
|
|
|
- {
|
|
+ GetPosRotScale();
|
|
|
- m_EditorCanvas.position = OpenXRCamera.Instance.head.position + Player.transform.forward + new Vector3(0, 0.5f, 0);
|
|
+ m_EditorCanvas.position = OpenXRCamera.Instance.head.position + Player.transform.forward + new Vector3(0, 0.5f, 0);
|
|
|
- m_EditorCanvas.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
+ m_EditorCanvas.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
|
-
|
|
+
|
|
|
- CommandSystem.Instance.Send( new EditorSettingCommand(true){ } );
|
|
+ CommandSystem.Instance.Send( new EditorSettingCommand(true){ } );
|
|
|
- CommandSystem.Instance.Send( new Patch_VideoCommand(true){ } );
|
|
+ CommandSystem.Instance.Send( new Patch_VideoCommand(true){ } );
|
|
|
- }
|
|
+ }
|
|
|
- else
|
|
+ else
|
|
|
- {
|
|
+ {
|
|
|
- m_EditorCanvas.position = OpenXRCamera.Instance.head.position + new Vector3(0, 100, 0);
|
|
+ SetPosRotScale();
|
|
|
-
|
|
+ m_EditorCanvas.position = OpenXRCamera.Instance.head.position + new Vector3(0, 100, 0);
|
|
|
- if (SpoitIndex >= 0 && !IsTriggerExiting)
|
|
+
|
|
|
- {
|
|
+ if (SpoitIndex >= 0 && !IsTriggerExiting)
|
|
|
- ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+ {
|
|
|
- if (isShowLoacalShowObjs)
|
|
+ ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
- ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+ if (isShowLoacalShowObjs)
|
|
|
- ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
+ ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
- m_EditorPanel.ClosePanel();
|
|
+ ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
|
- SpoitIndex = -1;
|
|
+ m_EditorPanel.ClosePanel();
|
|
|
- }
|
|
+ SpoitIndex = -1;
|
|
|
- CommandSystem.Instance.Send( new EditorSettingCommand(false){ } );
|
|
+ }
|
|
|
- CommandSystem.Instance.Send( new Patch_VideoCommand(false){ } );
|
|
+ CommandSystem.Instance.Send( new EditorSettingCommand(false){ } );
|
|
|
- }
|
|
+ CommandSystem.Instance.Send( new Patch_VideoCommand(false){ } );
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ }
|
|
|
- public void OnSettingBtnValueChanged(bool ison)
|
|
+
|
|
|
- {
|
|
+ public void OnSettingBtnValueChanged(bool ison)
|
|
|
- m_SettingPanel.gameObject.SetActive(ison);
|
|
+ {
|
|
|
- if (ison)
|
|
+ m_SettingPanel.gameObject.SetActive(ison);
|
|
|
- {
|
|
+ if (ison)
|
|
|
- Debug.Log(OpenXRCamera.Instance.head.forward);
|
|
+ {
|
|
|
- m_SettingPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward;
|
|
+ Debug.Log(OpenXRCamera.Instance.head.forward);
|
|
|
- m_SettingPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
+ m_SettingPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward;
|
|
|
- }
|
|
+ m_SettingPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
- public void OnAnchorBtnValueChanged(bool ison)
|
|
+
|
|
|
- {
|
|
+ public void OnAnchorBtnValueChanged(bool ison)
|
|
|
- foreach (var item in m_AnchorValue)
|
|
+ {
|
|
|
- {
|
|
+ foreach (var item in m_AnchorValue)
|
|
|
- item.Value.enabled = ison;
|
|
+ {
|
|
|
- }
|
|
+ item.Value.enabled = ison;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- if(ison)
|
|
+
|
|
|
- {
|
|
+ if(ison)
|
|
|
- m_UIAnchorsPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward + new Vector3(0, 0.5f, 0);
|
|
+ {
|
|
|
- m_UIAnchorsPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
+ m_UIAnchorsPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward + new Vector3(0, 0.5f, 0);
|
|
|
- }
|
|
+ m_UIAnchorsPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
|
|
|
- else
|
|
+ }
|
|
|
- {
|
|
+ else
|
|
|
- m_UIAnchorsPanel.transform.position = OpenXRCamera.Instance.head.position + new Vector3(0, 100, 0);
|
|
+ {
|
|
|
- }
|
|
+ m_UIAnchorsPanel.transform.position = OpenXRCamera.Instance.head.position + new Vector3(0, 100, 0);
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
- #endregion
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- #region 获取景点信息--素材编辑模式下
|
|
+ public void GetPosRotScale()
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ PosRotScale.PosRotScalePatchList.Clear();
|
|
|
-
|
|
+ for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ if (i != 0)
|
|
|
- public ObjectValue GetSpoitObjs(int spoitID)
|
|
+ {
|
|
|
- {
|
|
+ for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
|
|
|
- if (ObjectValues.ContainsKey(spoitID))
|
|
+ {
|
|
|
- {
|
|
+ for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
|
|
|
- return ObjectValues[spoitID];
|
|
+ {
|
|
|
- }
|
|
+ PosRotScalePatch PosRotScalePatch = new PosRotScalePatch();
|
|
|
- else
|
|
+ PosRotScalePatch.PosPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
|
|
|
- {
|
|
+ PosRotScalePatch.RotPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
|
|
|
- return null;
|
|
+ PosRotScalePatch.ScalePatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
|
|
|
- }
|
|
+ PosRotScale.PosRotScalePatchList.Add(PosRotScalePatch);
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ #endregion
|
|
|
-
|
|
+
|
|
|
- public void InitSpoitObjs()
|
|
+ #region 获取景点信息--素材编辑模式下
|
|
|
- {
|
|
+
|
|
|
- m_EditorPanel.InitObjTransForm();
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public ObjectValue GetSpoitObjs(int spoitID)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ if (ObjectValues.ContainsKey(spoitID))
|
|
|
- public void SaveSpoitObjs()
|
|
+ {
|
|
|
- {
|
|
+ return ObjectValues[spoitID];
|
|
|
- m_EditorPanel.SaveObjTransForm();
|
|
+ }
|
|
|
- }
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
- public void SaveAnchorObjs( string name)
|
|
+ return null;
|
|
|
- {
|
|
+ }
|
|
|
- foreach (var item in AnchorValue)
|
|
+
|
|
|
- {
|
|
+ }
|
|
|
- item.Key.objectTransform.SavePos(item.Value.transform.localPosition, item.Value.transform.localEulerAngles, item.Value.transform.localScale);
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- m_UIAnchorsPanel.SaveAnchors(name);
|
|
+
|
|
|
-
|
|
+ public void InitSpoitObjs()
|
|
|
- }
|
|
+ {
|
|
|
- #endregion
|
|
+ m_EditorPanel.InitObjTransForm();
|
|
|
-
|
|
+ }
|
|
|
- #region 创建水晶点、触发器范围、显示物体
|
|
+
|
|
|
-
|
|
+
|
|
|
- public void CreateScene(SceneValue scene)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- SceneValue = scene;
|
|
+
|
|
|
- if (m_MinMap.Map.sprite == null)
|
|
+ public void SaveSpoitObjs()
|
|
|
- {
|
|
+ {
|
|
|
- GetMinMap(scene );
|
|
+ m_EditorPanel.SaveObjTransForm();
|
|
|
- }
|
|
+ }
|
|
|
- else
|
|
+
|
|
|
- {
|
|
+ public void SaveAnchorObjs( string name)
|
|
|
- StartCreateScene(scene);
|
|
+ {
|
|
|
- }
|
|
+ foreach (var item in AnchorValue)
|
|
|
- Invoke("MoveScenePatch",1);
|
|
+ {
|
|
|
- }
|
|
+ item.Key.objectTransform.SavePos(item.Value.transform.localPosition, item.Value.transform.localEulerAngles, item.Value.transform.localScale);
|
|
|
- private void MoveScenePatch()
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- Vector3 temp = ObjsParent.parent.localPosition;
|
|
+
|
|
|
- temp.z += MapSize.y;
|
|
+ m_UIAnchorsPanel.SaveAnchors(name);
|
|
|
- ObjsParent.parent.localPosition = temp;
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- private void StartCreateScene(SceneValue scene)
|
|
+ #endregion
|
|
|
- {
|
|
+
|
|
|
- if (scene.navLines != null && scene.navLines.Count > 0)
|
|
+ #region 创建水晶点、触发器范围、显示物体
|
|
|
- SetRouteValue(scene.navLines);
|
|
+
|
|
|
- else
|
|
+ public void CreateScene(SceneValue scene)
|
|
|
- Debug.LogError(" 当前场景未设置路径");
|
|
+ {
|
|
|
-
|
|
+ SceneValue = scene;
|
|
|
- if (scene.listSpoit != null && scene.listSpoit.Count > 0)
|
|
+ if (m_MinMap.Map.sprite == null)
|
|
|
- SetSpoitValue(scene.listSpoit);
|
|
+ {
|
|
|
- else
|
|
+ GetMinMap(scene );
|
|
|
- Debug.LogError(" 当前场景未创建景点");
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
- if (scene.listPicture != null && scene.listPicture.Count > 0)
|
|
+ {
|
|
|
- SetAnchor(scene.listPicture);
|
|
+ StartCreateScene(scene);
|
|
|
- else
|
|
+ }
|
|
|
- Debug.LogError(" 当前场景未创建锚点");
|
|
+ Invoke("MoveScenePatch",1);
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ private void MoveScenePatch()
|
|
|
-
|
|
+ {
|
|
|
- UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
|
|
+ Vector3 temp = ObjsParent.parent.localPosition;
|
|
|
- DownloadManager.Instance.UpdataData();
|
|
+ temp.z += MapSize.y;
|
|
|
- }
|
|
+ ObjsParent.parent.localPosition = temp;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ private void StartCreateScene(SceneValue scene)
|
|
|
-
|
|
+ {
|
|
|
- public void GetMinMap( SceneValue scene )
|
|
+ if (scene.navLines != null && scene.navLines.Count > 0)
|
|
|
- {
|
|
+ SetRouteValue(scene.navLines);
|
|
|
- DownloadData data1 = new DownloadData();
|
|
+ else
|
|
|
- string filename = Path.GetFileName(MapPicUrl);
|
|
+ Debug.LogError(" 当前场景未设置路径");
|
|
|
- data1.name = filename;
|
|
+
|
|
|
- data1.type = 1;
|
|
+ if (scene.listSpoit != null && scene.listSpoit.Count > 0)
|
|
|
- data1.downloadPath = MapPicUrl;
|
|
+ SetSpoitValue(scene.listSpoit);
|
|
|
-
|
|
+ else
|
|
|
- data1.localSavePath = DownloadManager.Instance.LocaDataPath + "/map/" + filename;
|
|
+ Debug.LogError(" 当前场景未创建景点");
|
|
|
-
|
|
+
|
|
|
- if(scene.width>0 &&scene.length>0)
|
|
+ if (scene.listPicture != null && scene.listPicture.Count > 0)
|
|
|
- {
|
|
+ SetAnchor(scene.listPicture);
|
|
|
-
|
|
+ else
|
|
|
- isStart = true;
|
|
+ Debug.LogError(" 当前场景未创建锚点");
|
|
|
- PointB.position = Vector3.zero;
|
|
+
|
|
|
- PointB.eulerAngles = Vector3.zero;
|
|
+
|
|
|
- PointA.position = PointB.position + new Vector3(0, 0, scene.width);
|
|
+
|
|
|
- PointA.eulerAngles = Vector3.zero;
|
|
+ UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
|
|
|
- PointC.position = PointB.position + new Vector3(scene.length, 0, 0);
|
|
+ DownloadManager.Instance.UpdataData();
|
|
|
- PointC.eulerAngles = Vector3.zero;
|
|
+ }
|
|
|
- PointD.position = PointB.position + new Vector3(scene.length, 0, scene.width);
|
|
+
|
|
|
- PointD.eulerAngles = Vector3.zero;
|
|
+
|
|
|
- m_CalMap.SettingMapPoint(ListCrystals);
|
|
+
|
|
|
- }
|
|
+ public void GetMinMap( SceneValue scene )
|
|
|
-
|
|
+ {
|
|
|
- DownloadManager.Instance.GetMapImage(data1, m_MinMap.Map, (b, tex) =>
|
|
+ DownloadData data1 = new DownloadData();
|
|
|
- {
|
|
+ string filename = Path.GetFileName(MapPicUrl);
|
|
|
- if (b)
|
|
+ data1.name = filename;
|
|
|
- {
|
|
+ data1.type = 1;
|
|
|
- Sprite sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
|
|
+ data1.downloadPath = MapPicUrl;
|
|
|
- m_MinMap.Map.sprite = sprite;
|
|
+
|
|
|
-
|
|
+ data1.localSavePath = DownloadManager.Instance.LocaDataPath + "/map/" + filename;
|
|
|
-
|
|
+
|
|
|
- float width = tex.width;
|
|
+ if(scene.width>0 &&scene.length>0)
|
|
|
- float height = tex.height;
|
|
+ {
|
|
|
- if(width>height)
|
|
+
|
|
|
- {
|
|
+ isStart = true;
|
|
|
- width = width / height;
|
|
+ PointB.position = Vector3.zero;
|
|
|
- height = 1;
|
|
+ PointB.eulerAngles = Vector3.zero;
|
|
|
- }
|
|
+ PointA.position = PointB.position + new Vector3(0, 0, scene.width);
|
|
|
- else
|
|
+ PointA.eulerAngles = Vector3.zero;
|
|
|
- {
|
|
+ PointC.position = PointB.position + new Vector3(scene.length, 0, 0);
|
|
|
- height = height / width;
|
|
+ PointC.eulerAngles = Vector3.zero;
|
|
|
- width = 1;
|
|
+ PointD.position = PointB.position + new Vector3(scene.length, 0, scene.width);
|
|
|
- }
|
|
+ PointD.eulerAngles = Vector3.zero;
|
|
|
-
|
|
+ m_CalMap.SettingMapPoint(ListCrystals);
|
|
|
- MinMapSize = new Vector2(width * 150, height * 150);
|
|
+ }
|
|
|
- CalMapSize();
|
|
+
|
|
|
- m_MinMap.Map.GetComponent<RectTransform>().sizeDelta = new Vector2( width*150,height*150 );
|
|
+ DownloadManager.Instance.GetMapImage(data1, m_MinMap.Map, (b, tex) =>
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ if (b)
|
|
|
- WebMapSize = new Vector2((float)tex.width, (float)tex.height);
|
|
+ {
|
|
|
- if (SceneValue != null)
|
|
+ Sprite sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
|
|
|
- {
|
|
+ m_MinMap.Map.sprite = sprite;
|
|
|
- StartCreateScene(SceneValue);
|
|
+
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ float width = tex.width;
|
|
|
- });
|
|
+ float height = tex.height;
|
|
|
- }
|
|
+ if(width>height)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ width = width / height;
|
|
|
-
|
|
+ height = 1;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
- public void SetSpoitValue(List<SpoitValue> spoits)
|
|
+ height = height / width;
|
|
|
- {
|
|
+ width = 1;
|
|
|
- SpoitValue spoitValue;
|
|
+ }
|
|
|
- for (int i = 0; i < spoits.Count-1; i++)
|
|
+
|
|
|
- {
|
|
+ MinMapSize = new Vector2(width * 150, height * 150);
|
|
|
- spoitValue = null;
|
|
+ CalMapSize();
|
|
|
- for (int j = 0; j < spoits.Count-1-i; j++)
|
|
+ m_MinMap.Map.GetComponent<RectTransform>().sizeDelta = new Vector2( width*150,height*150 );
|
|
|
- {
|
|
+
|
|
|
- if(spoits[j].id>spoits[j+1].id)
|
|
+
|
|
|
- {
|
|
+ WebMapSize = new Vector2((float)tex.width, (float)tex.height);
|
|
|
- spoitValue = spoits[j];
|
|
+ if (SceneValue != null)
|
|
|
- spoits[j] = spoits[j+1];
|
|
+ {
|
|
|
- spoits[j+1] = spoitValue;
|
|
+ StartCreateScene(SceneValue);
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ });
|
|
|
-
|
|
+ }
|
|
|
- SpoitValues.Clear();
|
|
+
|
|
|
- for (int i = 0; i < spoits.Count; i++)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- var spoit = spoits[i];
|
|
+
|
|
|
- SpoitValue spoit1 = spoit;
|
|
+
|
|
|
-
|
|
+
|
|
|
- CreateCrystalAndTrigger(spoit);
|
|
+ public void SetSpoitValue(List<SpoitValue> spoits)
|
|
|
- CreateMaterial(spoit, out spoit1);
|
|
+ {
|
|
|
- spoits[i] = spoit1;
|
|
+ SpoitValue spoitValue;
|
|
|
- }
|
|
+ for (int i = 0; i < spoits.Count-1; i++)
|
|
|
- for (int i = 0; i < ListColiderBoxs_Mesh.Count; i++)
|
|
+ {
|
|
|
- {
|
|
+ spoitValue = null;
|
|
|
- ListColiderBoxs_Mesh[i].enabled = false;
|
|
+ for (int j = 0; j < spoits.Count-1-i; j++)
|
|
|
- }
|
|
+ {
|
|
|
- SpoitValues.AddRange(spoits);
|
|
+ if(spoits[j].id>spoits[j+1].id)
|
|
|
- SceneValue.listSpoit = SpoitValues;
|
|
+ {
|
|
|
- DataManager.Instance.Spoits = SpoitValues;
|
|
+ spoitValue = spoits[j];
|
|
|
- }
|
|
+ spoits[j] = spoits[j+1];
|
|
|
-
|
|
+ spoits[j+1] = spoitValue;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
- private void CreateCrystalAndTrigger(SpoitValue spoit)
|
|
+
|
|
|
- {
|
|
+ SpoitValues.Clear();
|
|
|
- var spoitPos = Vector3.zero;
|
|
+ for (int i = 0; i < spoits.Count; i++)
|
|
|
- if (spoit.SpoitTransform.Count > 0)
|
|
+ {
|
|
|
- {
|
|
+ var spoit = spoits[i];
|
|
|
-
|
|
+ SpoitValue spoit1 = spoit;
|
|
|
- SpoitPos trans = spoit.SpoitTransform[0];
|
|
+
|
|
|
- spoitPos = new Vector3((float)trans.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)trans.pointRelativeY / WebMapSize.y * MapSize.y);
|
|
+ CreateCrystalAndTrigger(spoit);
|
|
|
-
|
|
+ CreateMaterial(spoit, out spoit1);
|
|
|
- var obj = Instantiate(CrystalItem, CrystalsParent);
|
|
+ spoits[i] = spoit1;
|
|
|
- CommandSystem.Instance.Send(
|
|
+ }
|
|
|
- new InstantiateGOCommand(InstantiateSystem.Instance.BlueObject.SpoitName, obj.gameObject)
|
|
+ for (int i = 0; i < ListColiderBoxs_Mesh.Count; i++)
|
|
|
- );
|
|
+ {
|
|
|
- obj.name = spoit.name;
|
|
+ ListColiderBoxs_Mesh[i].enabled = false;
|
|
|
- obj.transform.localPosition = spoitPos;
|
|
+ }
|
|
|
- ListCrystals.Add(obj.transform);
|
|
+ SpoitValues.AddRange(spoits);
|
|
|
-
|
|
+ SceneValue.listSpoit = SpoitValues;
|
|
|
- var spoitobj = CreateSpoit(spoit, spoitPos);
|
|
+ DataManager.Instance.Spoits = SpoitValues;
|
|
|
- ListShowObjs.Add(spoitobj.transform);
|
|
+ }
|
|
|
- ObjectValue spoitvalue = new ObjectValue(spoit.id, -1, spoitobj.name, spoitobj);
|
|
+
|
|
|
- ObjectValues.Add(spoit.id, spoitvalue);
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ private void CreateCrystalAndTrigger(SpoitValue spoit)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ var spoitPos = Vector3.zero;
|
|
|
-
|
|
+ if (spoit.SpoitTransform.Count > 0)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+ SpoitPos trans = spoit.SpoitTransform[0];
|
|
|
-
|
|
+ spoitPos = new Vector3((float)trans.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)trans.pointRelativeY / WebMapSize.y * MapSize.y);
|
|
|
-
|
|
+
|
|
|
-
|
|
+ var obj = Instantiate(CrystalItem, CrystalsParent);
|
|
|
-
|
|
+ CommandSystem.Instance.Send(
|
|
|
-
|
|
+ new InstantiateGOCommand(InstantiateSystem.Instance.BlueObject.SpoitName, obj.gameObject)
|
|
|
-
|
|
+ );
|
|
|
-
|
|
+ obj.name = spoit.name;
|
|
|
-
|
|
+ obj.transform.localPosition = spoitPos;
|
|
|
-
|
|
+ ListCrystals.Add(obj.transform);
|
|
|
-
|
|
+
|
|
|
- var tiggerpos = new Vector3((float)(trans.areaRelativeX + trans.areaRelativeW / 2) / WebMapSize.x * MapSize.x, -0.5f, -(float)(trans.areaRelativeY + trans.areaRelativeH / 2) / WebMapSize.y * MapSize.y);
|
|
+ var spoitobj = CreateSpoit(spoit, spoitPos);
|
|
|
- var tiggerRange = new Vector3((float)trans.areaRelativeW / WebMapSize.x * MapSize.x, 0.1f, (float)trans.areaRelativeH / WebMapSize.y * MapSize.y);
|
|
+ ListShowObjs.Add(spoitobj.transform);
|
|
|
- var triggerobj = Instantiate(ColliderItem, CollidersParent);
|
|
+ ObjectValue spoitvalue = new ObjectValue(spoit.id, -1, spoitobj.name, spoitobj);
|
|
|
- triggerobj.name = spoit.name;
|
|
+ ObjectValues.Add(spoit.id, spoitvalue);
|
|
|
- triggerobj.transform.localPosition = tiggerpos;
|
|
+
|
|
|
- triggerobj.transform.localScale = tiggerRange;
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- ObjectValue boxvalue = new ObjectValue(spoit.id, -1, triggerobj.name, triggerobj);
|
|
+
|
|
|
- ColliderObjectValues.Add(boxvalue);
|
|
+
|
|
|
- ListColliderBoxs.Add(triggerobj.transform);
|
|
+
|
|
|
- ListColiderBoxs_Mesh.Add(triggerobj.GetComponent<MeshRenderer>());
|
|
+
|
|
|
- }
|
|
+
|
|
|
- else
|
|
+
|
|
|
- {
|
|
+
|
|
|
- Debug.LogFormat("{0}{1}", spoit.name, "景点不存在");
|
|
+
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
- private GameObject CreateSpoit(SpoitValue spoit, Vector3 spoitPos)
|
|
+
|
|
|
- {
|
|
+
|
|
|
-
|
|
+
|
|
|
- GameObject spoitObj = new GameObject(spoit.name);
|
|
+
|
|
|
- spoitObj.transform.SetParent(ObjsParent.transform);
|
|
+ var tiggerpos = new Vector3((float)(trans.areaRelativeX + trans.areaRelativeW / 2) / WebMapSize.x * MapSize.x, -0.5f, -(float)(trans.areaRelativeY + trans.areaRelativeH / 2) / WebMapSize.y * MapSize.y);
|
|
|
- spoitObj.AddComponent<EditorEventHandler>().IsClickEditor = false;
|
|
+ var tiggerRange = new Vector3((float)trans.areaRelativeW / WebMapSize.x * MapSize.x, 0.1f, (float)trans.areaRelativeH / WebMapSize.y * MapSize.y);
|
|
|
-
|
|
+ var triggerobj = Instantiate(ColliderItem, CollidersParent);
|
|
|
-
|
|
+ triggerobj.name = spoit.name;
|
|
|
-
|
|
+ triggerobj.transform.localPosition = tiggerpos;
|
|
|
- if (spoit.spoitTf.startPos == Vector3.zero && spoit.spoitTf.nowPos == Vector3.zero)
|
|
+ triggerobj.transform.localScale = tiggerRange;
|
|
|
- {
|
|
+
|
|
|
- spoitObj.transform.localPosition = new Vector3(spoitPos.x, 0.5f, spoitPos.z);
|
|
+
|
|
|
- spoitObj.transform.localRotation = Quaternion.identity;
|
|
+ ObjectValue boxvalue = new ObjectValue(spoit.id, -1, triggerobj.name, triggerobj);
|
|
|
- spoitObj.transform.localScale = new Vector3(1, 1, 1);
|
|
+ ColliderObjectValues.Add(boxvalue);
|
|
|
- spoit.spoitTf.SetStartValue(spoitObj.transform.localPosition, spoitObj.transform.localEulerAngles, spoitObj.transform.localScale);
|
|
+ ListColliderBoxs.Add(triggerobj.transform);
|
|
|
- }
|
|
+ ListColiderBoxs_Mesh.Add(triggerobj.GetComponent<MeshRenderer>());
|
|
|
- else
|
|
+ }
|
|
|
- {
|
|
+ else
|
|
|
- spoitObj.transform.localPosition = spoit.spoitTf.nowPos;
|
|
+ {
|
|
|
- spoitObj.transform.localEulerAngles = spoit.spoitTf.nowRot;
|
|
+ Debug.LogFormat("{0}{1}", spoit.name, "景点不存在");
|
|
|
- spoitObj.transform.localScale = spoit.spoitTf.nowScale;
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- return spoitObj;
|
|
+ private GameObject CreateSpoit(SpoitValue spoit, Vector3 spoitPos)
|
|
|
- }
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+ GameObject spoitObj = new GameObject(spoit.name);
|
|
|
-
|
|
+ spoitObj.transform.SetParent(ObjsParent.transform);
|
|
|
-
|
|
+ spoitObj.AddComponent<EditorEventHandler>().IsClickEditor = false;
|
|
|
-
|
|
+
|
|
|
- private void CreateMaterial(SpoitValue spoit, out SpoitValue newspoit)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- var spoitValues = ObjectValues[spoit.id];
|
|
+ if (spoit.spoitTf.startPos == Vector3.zero && spoit.spoitTf.nowPos == Vector3.zero)
|
|
|
- var spoitObj = spoitValues.Object;
|
|
+ {
|
|
|
-
|
|
+ spoitObj.transform.localPosition = new Vector3(spoitPos.x, 0.5f, spoitPos.z);
|
|
|
-
|
|
+ spoitObj.transform.localRotation = Quaternion.identity;
|
|
|
- for (int i = 0; i < spoit.material.Count; i++)
|
|
+ spoitObj.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- {
|
|
+ spoit.spoitTf.SetStartValue(spoitObj.transform.localPosition, spoitObj.transform.localEulerAngles, spoitObj.transform.localScale);
|
|
|
-
|
|
+ }
|
|
|
- MaterialObl material = spoit.material[i];
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ spoitObj.transform.localPosition = spoit.spoitTf.nowPos;
|
|
|
- GameObject matObj = new GameObject(material.name);
|
|
+ spoitObj.transform.localEulerAngles = spoit.spoitTf.nowRot;
|
|
|
- matObj.transform.SetParent(spoitValues.Object.transform);
|
|
+ spoitObj.transform.localScale = spoit.spoitTf.nowScale;
|
|
|
- if (!material.select)
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- matObj.transform.localPosition = Vector3.zero;
|
|
+ return spoitObj;
|
|
|
- matObj.transform.localEulerAngles = Vector3.zero;
|
|
+ }
|
|
|
- matObj.transform.localScale = new Vector3(1, 1, 1);
|
|
+
|
|
|
- material.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
|
|
+
|
|
|
- }
|
|
+
|
|
|
- else
|
|
+
|
|
|
- {
|
|
+
|
|
|
- matObj.transform.localPosition = material.objectTransform.nowPos;
|
|
+ private void CreateMaterial(SpoitValue spoit, out SpoitValue newspoit)
|
|
|
- matObj.transform.localEulerAngles = material.objectTransform.nowRot;
|
|
+ {
|
|
|
- matObj.transform.localScale = material.objectTransform.nowScale;
|
|
+ var spoitValues = ObjectValues[spoit.id];
|
|
|
- }
|
|
+ var spoitObj = spoitValues.Object;
|
|
|
-
|
|
+
|
|
|
- ObjectValue spoitValue = new ObjectValue(i, spoit.id, material.name, matObj);
|
|
+
|
|
|
-
|
|
+ for (int i = 0; i < spoit.material.Count; i++)
|
|
|
- List<ObjectValue> objsvalue = null;
|
|
+ {
|
|
|
- MaterialObl newmaterial = material;
|
|
+
|
|
|
-
|
|
+ MaterialObl material = spoit.material[i];
|
|
|
- switch (material.type)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- case (int)MaterialType.None:
|
|
+ GameObject matObj = new GameObject(material.name);
|
|
|
- break;
|
|
+ matObj.transform.SetParent(spoitValues.Object.transform);
|
|
|
- case (int)MaterialType.Image:
|
|
+ if (!material.select)
|
|
|
- case (int)MaterialType.Video:
|
|
+ {
|
|
|
- case (int)MaterialType.Model:
|
|
+ matObj.transform.localPosition = Vector3.zero;
|
|
|
- case (int)MaterialType.Text:
|
|
+ matObj.transform.localEulerAngles = Vector3.zero;
|
|
|
- case (int)MaterialType.LocaImage:
|
|
+ matObj.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- objsvalue = CreateSuCaiObj(material, matObj, out newmaterial);
|
|
+ material.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
|
|
|
- break;
|
|
+ }
|
|
|
- case (int)MaterialType.Image_Video_Text:
|
|
+ else
|
|
|
- objsvalue = CreateImage_Video_Text(material, matObj, out newmaterial);
|
|
+ {
|
|
|
- break;
|
|
+ matObj.transform.localPosition = material.objectTransform.nowPos;
|
|
|
- case (int)MaterialType.Model_Text:
|
|
+ matObj.transform.localEulerAngles = material.objectTransform.nowRot;
|
|
|
- objsvalue = CreateModel_Text(material, matObj, out newmaterial);
|
|
+ matObj.transform.localScale = material.objectTransform.nowScale;
|
|
|
- break;
|
|
+ }
|
|
|
- default:
|
|
+
|
|
|
- break;
|
|
+ ObjectValue spoitValue = new ObjectValue(i, spoit.id, material.name, matObj);
|
|
|
- }
|
|
+
|
|
|
- spoit.material[i] = newmaterial;
|
|
+ List<ObjectValue> objsvalue = null;
|
|
|
- spoitValue.ChildrenObj.AddRange(objsvalue);
|
|
+ MaterialObl newmaterial = material;
|
|
|
- spoitValues.ChildrenObj.Add(spoitValue);
|
|
+
|
|
|
- }
|
|
+ switch (material.type)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ case (int)MaterialType.None:
|
|
|
- newspoit = spoit;
|
|
+ break;
|
|
|
-
|
|
+ case (int)MaterialType.Image:
|
|
|
- if (ObjectValues.ContainsKey(spoit.id))
|
|
+ case (int)MaterialType.Video:
|
|
|
- {
|
|
+ case (int)MaterialType.Model:
|
|
|
- ObjectValues[spoit.id] = spoitValues;
|
|
+ case (int)MaterialType.Text:
|
|
|
- }
|
|
+ case (int)MaterialType.LocaImage:
|
|
|
- else
|
|
+ objsvalue = CreateSuCaiObj(material, matObj, out newmaterial);
|
|
|
- {
|
|
+ break;
|
|
|
- ObjectValues.Add(spoit.id, spoitValues);
|
|
+ case (int)MaterialType.Image_Video_Text:
|
|
|
- }
|
|
+ objsvalue = CreateImage_Video_Text(material, matObj, out newmaterial);
|
|
|
- spoitObj.gameObject.SetActive(false);
|
|
+ break;
|
|
|
- }
|
|
+ case (int)MaterialType.Model_Text:
|
|
|
-
|
|
+ objsvalue = CreateModel_Text(material, matObj, out newmaterial);
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ default:
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ }
|
|
|
- public void AddMaterial(MaterialObl material)
|
|
+ spoit.material[i] = newmaterial;
|
|
|
- {
|
|
+ spoitValue.ChildrenObj.AddRange(objsvalue);
|
|
|
- if (SpoitIndex < 0)
|
|
+ spoitValues.ChildrenObj.Add(spoitValue);
|
|
|
- {
|
|
+ }
|
|
|
- return;
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ newspoit = spoit;
|
|
|
- MaterialObl newmaterial = new MaterialObl();
|
|
+
|
|
|
- newmaterial = material;
|
|
+ if (ObjectValues.ContainsKey(spoit.id))
|
|
|
- var spoit = SpoitValues[SpoitIndex];
|
|
+ {
|
|
|
- var spoitValues = ObjectValues[spoit.id];
|
|
+ ObjectValues[spoit.id] = spoitValues;
|
|
|
- var spoitObj = spoitValues.Object;
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
- GameObject matObj = new GameObject(newmaterial.name + "-" + spoit.material.Count.ToString());
|
|
+ ObjectValues.Add(spoit.id, spoitValues);
|
|
|
- newmaterial.name = matObj.name;
|
|
+ }
|
|
|
- matObj.transform.SetParent(spoitValues.Object.transform);
|
|
+ spoitObj.gameObject.SetActive(false);
|
|
|
- if (!material.select)
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- matObj.transform.localPosition = Vector3.zero;
|
|
+
|
|
|
- matObj.transform.localEulerAngles = Vector3.zero;
|
|
+
|
|
|
- matObj.transform.localScale = new Vector3(1, 1, 1);
|
|
+
|
|
|
- newmaterial.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
|
|
+
|
|
|
- }
|
|
+ public void AddMaterial(MaterialObl material)
|
|
|
- else
|
|
+ {
|
|
|
- {
|
|
+ if (SpoitIndex < 0)
|
|
|
- matObj.transform.localPosition = newmaterial.objectTransform.nowPos;
|
|
+ {
|
|
|
- matObj.transform.localEulerAngles = newmaterial.objectTransform.nowRot;
|
|
+ return;
|
|
|
- matObj.transform.localScale = newmaterial.objectTransform.nowScale;
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ MaterialObl newmaterial = new MaterialObl();
|
|
|
- ObjectValue spoitValue = new ObjectValue(spoit.material.Count, spoit.id, newmaterial.name, matObj);
|
|
+ newmaterial = material;
|
|
|
-
|
|
+ var spoit = SpoitValues[SpoitIndex];
|
|
|
-
|
|
+ var spoitValues = ObjectValues[spoit.id];
|
|
|
- List<ObjectValue> objsvalue = null;
|
|
+ var spoitObj = spoitValues.Object;
|
|
|
-
|
|
+
|
|
|
- switch (material.type)
|
|
+
|
|
|
- {
|
|
+ GameObject matObj = new GameObject(newmaterial.name + "-" + spoit.material.Count.ToString());
|
|
|
- case (int)MaterialType.None:
|
|
+ newmaterial.name = matObj.name;
|
|
|
- break;
|
|
+ matObj.transform.SetParent(spoitValues.Object.transform);
|
|
|
- case (int)MaterialType.Image:
|
|
+ if (!material.select)
|
|
|
- case (int)MaterialType.Video:
|
|
+ {
|
|
|
- case (int)MaterialType.Model:
|
|
+ matObj.transform.localPosition = Vector3.zero;
|
|
|
- case (int)MaterialType.Text:
|
|
+ matObj.transform.localEulerAngles = Vector3.zero;
|
|
|
- case (int)MaterialType.LocaImage:
|
|
+ matObj.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- objsvalue = CreateSuCaiObj(newmaterial, matObj, out newmaterial);
|
|
+ newmaterial.objectTransform.SetStartValue(matObj.transform.localPosition, matObj.transform.localEulerAngles, matObj.transform.localScale);
|
|
|
- break;
|
|
+ }
|
|
|
- case (int)MaterialType.Image_Video_Text:
|
|
+ else
|
|
|
- objsvalue = CreateImage_Video_Text(newmaterial, matObj, out newmaterial);
|
|
+ {
|
|
|
- break;
|
|
+ matObj.transform.localPosition = newmaterial.objectTransform.nowPos;
|
|
|
- case (int)MaterialType.Model_Text:
|
|
+ matObj.transform.localEulerAngles = newmaterial.objectTransform.nowRot;
|
|
|
- objsvalue = CreateModel_Text(newmaterial, matObj, out newmaterial);
|
|
+ matObj.transform.localScale = newmaterial.objectTransform.nowScale;
|
|
|
- break;
|
|
+ }
|
|
|
- default:
|
|
+
|
|
|
- break;
|
|
+ ObjectValue spoitValue = new ObjectValue(spoit.material.Count, spoit.id, newmaterial.name, matObj);
|
|
|
- }
|
|
+
|
|
|
- newmaterial.select = true;
|
|
+
|
|
|
- spoit.material.Add(newmaterial);
|
|
+ List<ObjectValue> objsvalue = null;
|
|
|
- spoitValue.ChildrenObj.AddRange(objsvalue);
|
|
+
|
|
|
- spoitValues.ChildrenObj.Add(spoitValue);
|
|
+ switch (material.type)
|
|
|
-
|
|
+ {
|
|
|
- if (ObjectValues.ContainsKey(spoit.id))
|
|
+ case (int)MaterialType.None:
|
|
|
- {
|
|
+ break;
|
|
|
- ObjectValues[spoit.id] = spoitValues;
|
|
+ case (int)MaterialType.Image:
|
|
|
- }
|
|
+ case (int)MaterialType.Video:
|
|
|
- else
|
|
+ case (int)MaterialType.Model:
|
|
|
- {
|
|
+ case (int)MaterialType.Text:
|
|
|
- ObjectValues.Add(spoit.id, spoitValues);
|
|
+ case (int)MaterialType.LocaImage:
|
|
|
- }
|
|
+ objsvalue = CreateSuCaiObj(newmaterial, matObj, out newmaterial);
|
|
|
-
|
|
+ break;
|
|
|
- SpoitValues[SpoitIndex] = spoit;
|
|
+ case (int)MaterialType.Image_Video_Text:
|
|
|
-
|
|
+ objsvalue = CreateImage_Video_Text(newmaterial, matObj, out newmaterial);
|
|
|
- UpdateEditorUI();
|
|
+ break;
|
|
|
- }
|
|
+ case (int)MaterialType.Model_Text:
|
|
|
-
|
|
+ objsvalue = CreateModel_Text(newmaterial, matObj, out newmaterial);
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ default:
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ newmaterial.select = true;
|
|
|
-
|
|
+ spoit.material.Add(newmaterial);
|
|
|
- private List<ObjectValue> CreateSuCaiObj(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
+ spoitValue.ChildrenObj.AddRange(objsvalue);
|
|
|
- {
|
|
+ spoitValues.ChildrenObj.Add(spoitValue);
|
|
|
- List<ObjectValue> objects = new List<ObjectValue>();
|
|
+
|
|
|
- List<MaterialObjValue> objs = material.materialList;
|
|
+ if (ObjectValues.ContainsKey(spoit.id))
|
|
|
- newmaterial = material;
|
|
+ {
|
|
|
-
|
|
+ ObjectValues[spoit.id] = spoitValues;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ ObjectValues.Add(spoit.id, spoitValues);
|
|
|
-
|
|
+ }
|
|
|
- for (int i = 0; i < objs.Count; i++)
|
|
+
|
|
|
- {
|
|
+ SpoitValues[SpoitIndex] = spoit;
|
|
|
- var mat = objs[i];
|
|
+
|
|
|
- GameObject go = null;
|
|
+ UpdateEditorUI();
|
|
|
- switch (int.Parse(mat.type))
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- case (int)MaterialType.None:
|
|
+
|
|
|
- break;
|
|
+
|
|
|
- case (int)MaterialType.Image:
|
|
+
|
|
|
- var pImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
+
|
|
|
- go = Instantiate(pImage, spoit.transform);
|
|
+
|
|
|
- var imageitem = go.AddComponent<TemplateImage>();
|
|
+
|
|
|
- go.SetActive(true);
|
|
+ private List<ObjectValue> CreateSuCaiObj(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
|
- imageitem.SetData(mat, material.updateTime);
|
|
+ {
|
|
|
- break;
|
|
+ List<ObjectValue> objects = new List<ObjectValue>();
|
|
|
- case (int)MaterialType.Video:
|
|
+ List<MaterialObjValue> objs = material.materialList;
|
|
|
- var pVideo = ResMgr.Instance.Load<GameObject>("Template/Prefab/Video");
|
|
+ newmaterial = material;
|
|
|
- go = Instantiate(pVideo, spoit.transform);
|
|
+
|
|
|
- var videoitem = go.AddComponent<TemplateVideo>();
|
|
+
|
|
|
- go.SetActive(true);
|
|
+
|
|
|
- videoitem.SetData(mat, material.updateTime);
|
|
+
|
|
|
- break;
|
|
+
|
|
|
- case (int)MaterialType.Model:
|
|
+
|
|
|
- var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
+ for (int i = 0; i < objs.Count; i++)
|
|
|
- go = Instantiate(pModel, spoit.transform);
|
|
+ {
|
|
|
- var modelitem = go.AddComponent<TemplateModel>();
|
|
+ var mat = objs[i];
|
|
|
- go.SetActive(true);
|
|
+ GameObject go = null;
|
|
|
- modelitem.SetData(mat, material.updateTime);
|
|
+ switch (int.Parse(mat.type))
|
|
|
- Debug.Log(modelitem.Data.localSavePath);
|
|
+ {
|
|
|
- break;
|
|
+ case (int)MaterialType.None:
|
|
|
- case (int)MaterialType.Text:
|
|
+ break;
|
|
|
- var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
+ case (int)MaterialType.Image:
|
|
|
- go = Instantiate(pText, spoit.transform);
|
|
+ var pImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
|
- var textitem = go.AddComponent<TemplateText>();
|
|
+ go = Instantiate(pImage, spoit.transform);
|
|
|
- go.SetActive(true);
|
|
+ var imageitem = go.AddComponent<TemplateImage>();
|
|
|
- textitem.SetData(mat, material.updateTime);
|
|
+ go.SetActive(true);
|
|
|
- break;
|
|
+ imageitem.SetData(mat, material.updateTime);
|
|
|
- case (int)MaterialType.LocaImage:
|
|
+ break;
|
|
|
- var pLocaImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
+ case (int)MaterialType.Video:
|
|
|
- go = Instantiate(pLocaImage, spoit.transform);
|
|
+ var pVideo = ResMgr.Instance.Load<GameObject>("Template/Prefab/Video");
|
|
|
- var locaImageitem = go.AddComponent<TemplateImage>();
|
|
+ go = Instantiate(pVideo, spoit.transform);
|
|
|
- go.SetActive(true);
|
|
+ var videoitem = go.AddComponent<TemplateVideo>();
|
|
|
- locaImageitem.SetLocaImageData(mat);
|
|
+ go.SetActive(true);
|
|
|
- break;
|
|
+ videoitem.SetData(mat, material.updateTime);
|
|
|
- default:
|
|
+ break;
|
|
|
- break;
|
|
+ case (int)MaterialType.Model:
|
|
|
- }
|
|
+ var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
|
-
|
|
+ go = Instantiate(pModel, spoit.transform);
|
|
|
- if (go != null)
|
|
+ var modelitem = go.AddComponent<TemplateModel>();
|
|
|
- {
|
|
+ go.SetActive(true);
|
|
|
- go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
|
|
+ modelitem.SetData(mat, material.updateTime);
|
|
|
- mat.name = go.name;
|
|
+ Debug.Log(modelitem.Data.localSavePath);
|
|
|
- go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
+ break;
|
|
|
-
|
|
+ case (int)MaterialType.Text:
|
|
|
- if (material.select)
|
|
+ var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
|
- {
|
|
+ go = Instantiate(pText, spoit.transform);
|
|
|
- go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
+ var textitem = go.AddComponent<TemplateText>();
|
|
|
- go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
+ go.SetActive(true);
|
|
|
- go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
+ textitem.SetData(mat, material.updateTime);
|
|
|
-
|
|
+ break;
|
|
|
- }
|
|
+ case (int)MaterialType.LocaImage:
|
|
|
- else
|
|
+ var pLocaImage = ResMgr.Instance.Load<GameObject>("Template/Prefab/Image");
|
|
|
- {
|
|
+ go = Instantiate(pLocaImage, spoit.transform);
|
|
|
- go.transform.localEulerAngles = Vector3.zero;
|
|
+ var locaImageitem = go.AddComponent<TemplateImage>();
|
|
|
- go.transform.localScale = new Vector3(1, 1, 1);
|
|
+ go.SetActive(true);
|
|
|
- if (int.Parse(mat.type) != (int)MaterialType.Text)
|
|
+ locaImageitem.SetLocaImageData(mat);
|
|
|
- {
|
|
+ break;
|
|
|
- go.transform.localPosition = Vector3.zero;
|
|
+ default:
|
|
|
- }
|
|
+ break;
|
|
|
- else
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
-
|
|
+ if (go != null)
|
|
|
- if (mat.textPosition == "top")
|
|
+ {
|
|
|
- {
|
|
+ go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
|
|
|
- go.transform.localPosition = new Vector3(0, 0.3f, 0);
|
|
+ mat.name = go.name;
|
|
|
- }
|
|
+ go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
|
- else if (mat.textPosition == "bottom")
|
|
+
|
|
|
- {
|
|
+ if (material.select)
|
|
|
- go.transform.localPosition = new Vector3(0, -0.3f, 0);
|
|
+ {
|
|
|
- }
|
|
+ go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
|
- }
|
|
+ go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
|
- mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
+ go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ }
|
|
|
- ObjectValue objectValue = new ObjectValue(i, material.id, mat.name, go);
|
|
+ else
|
|
|
- objects.Add(objectValue);
|
|
+ {
|
|
|
- }
|
|
+ go.transform.localEulerAngles = Vector3.zero;
|
|
|
- newmaterial.materialList[i] = mat;
|
|
+ go.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- }
|
|
+ if (int.Parse(mat.type) != (int)MaterialType.Text)
|
|
|
- return objects;
|
|
+ {
|
|
|
- }
|
|
+ go.transform.localPosition = Vector3.zero;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+ if (mat.textPosition == "top")
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ go.transform.localPosition = new Vector3(0, 0.3f, 0);
|
|
|
- private List<ObjectValue> CreateModel_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
+ }
|
|
|
- {
|
|
+ else if (mat.textPosition == "bottom")
|
|
|
- List<ObjectValue> objects = new List<ObjectValue>();
|
|
+ {
|
|
|
- List<MaterialObjValue> objs = material.materialList;
|
|
+ go.transform.localPosition = new Vector3(0, -0.3f, 0);
|
|
|
- newmaterial = material;
|
|
+ }
|
|
|
- for (int i = 0; i < objs.Count; i++)
|
|
+ }
|
|
|
- {
|
|
+ mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
|
- var mat = objs[i];
|
|
+ }
|
|
|
- GameObject go = null;
|
|
+
|
|
|
- switch (int.Parse(mat.type))
|
|
+ ObjectValue objectValue = new ObjectValue(i, material.id, mat.name, go);
|
|
|
- {
|
|
+ objects.Add(objectValue);
|
|
|
- case (int)MaterialType.None:
|
|
+ }
|
|
|
- break;
|
|
+ newmaterial.materialList[i] = mat;
|
|
|
- case (int)MaterialType.Model:
|
|
+ }
|
|
|
- var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
+ return objects;
|
|
|
- go = Instantiate(pModel, spoit.transform);
|
|
+ }
|
|
|
- var modelitem = go.AddComponent<TemplateModel>();
|
|
+
|
|
|
- go.SetActive(true);
|
|
+
|
|
|
- modelitem.SetData(mat, material.updateTime);
|
|
+
|
|
|
- break;
|
|
+
|
|
|
- case (int)MaterialType.Text:
|
|
+
|
|
|
- var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
+
|
|
|
- go = Instantiate(pText, spoit.transform);
|
|
+
|
|
|
- var textitem = go.AddComponent<TemplateText>();
|
|
+ private List<ObjectValue> CreateModel_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
|
- go.SetActive(true);
|
|
+ {
|
|
|
- textitem.SetData(mat, material.updateTime);
|
|
+ List<ObjectValue> objects = new List<ObjectValue>();
|
|
|
- break;
|
|
+ List<MaterialObjValue> objs = material.materialList;
|
|
|
- default:
|
|
+ newmaterial = material;
|
|
|
- break;
|
|
+ for (int i = 0; i < objs.Count; i++)
|
|
|
- }
|
|
+ {
|
|
|
-
|
|
+ var mat = objs[i];
|
|
|
- if (go != null)
|
|
+ GameObject go = null;
|
|
|
- {
|
|
+ switch (int.Parse(mat.type))
|
|
|
- go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
|
|
+ {
|
|
|
- go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
+ case (int)MaterialType.None:
|
|
|
-
|
|
+ break;
|
|
|
- if (material.select)
|
|
+ case (int)MaterialType.Model:
|
|
|
- {
|
|
+ var pModel = ResMgr.Instance.Load<GameObject>("Template/Prefab/Model");
|
|
|
- go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
+ go = Instantiate(pModel, spoit.transform);
|
|
|
- go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
+ var modelitem = go.AddComponent<TemplateModel>();
|
|
|
- go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
+ go.SetActive(true);
|
|
|
- }
|
|
+ modelitem.SetData(mat, material.updateTime);
|
|
|
- else
|
|
+ break;
|
|
|
- {
|
|
+ case (int)MaterialType.Text:
|
|
|
- go.transform.localEulerAngles = Vector3.zero;
|
|
+ var pText = ResMgr.Instance.Load<GameObject>("Template/Prefab/Text");
|
|
|
- go.transform.localScale = new Vector3(1, 1, 1);
|
|
+ go = Instantiate(pText, spoit.transform);
|
|
|
- if (int.Parse(mat.type) != (int)MaterialType.Text)
|
|
+ var textitem = go.AddComponent<TemplateText>();
|
|
|
- {
|
|
+ go.SetActive(true);
|
|
|
- go.transform.localPosition = Vector3.zero;
|
|
+ textitem.SetData(mat, material.updateTime);
|
|
|
- }
|
|
+ break;
|
|
|
- else
|
|
+ default:
|
|
|
- {
|
|
+ break;
|
|
|
-
|
|
+ }
|
|
|
- if (mat.textPosition == "top")
|
|
+
|
|
|
- {
|
|
+ if (go != null)
|
|
|
- go.transform.localPosition = new Vector3(0, 0.3f, 0);
|
|
+ {
|
|
|
- }
|
|
+ go.name = string.IsNullOrWhiteSpace(mat.name) ? spoit.name + "-" + i.ToString() : mat.name;
|
|
|
- else if (mat.textPosition == "bottom")
|
|
+ go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
|
- {
|
|
+
|
|
|
- go.transform.localPosition = new Vector3(0, -0.3f, 0);
|
|
+ if (material.select)
|
|
|
- }
|
|
+ {
|
|
|
- else if (mat.textPosition == "left")
|
|
+ go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
|
- {
|
|
+ go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
|
- go.transform.localPosition = new Vector3(-0.3f, 0, 0);
|
|
+ go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
|
- }
|
|
+ }
|
|
|
- else if (mat.textPosition == "right")
|
|
+ else
|
|
|
- {
|
|
+ {
|
|
|
- go.transform.localPosition = new Vector3(0.3f, 0f, 0);
|
|
+ go.transform.localEulerAngles = Vector3.zero;
|
|
|
- }
|
|
+ go.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- }
|
|
+ if (int.Parse(mat.type) != (int)MaterialType.Text)
|
|
|
- mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
+ {
|
|
|
- }
|
|
+ go.transform.localPosition = Vector3.zero;
|
|
|
- ObjectValue objectValue = CreateMatObjectValue(i, material.id, go, mat);
|
|
+ }
|
|
|
- objects.Add(objectValue);
|
|
+ else
|
|
|
- }
|
|
+ {
|
|
|
-
|
|
+
|
|
|
- newmaterial.materialList[i] = mat;
|
|
+ if (mat.textPosition == "top")
|
|
|
- }
|
|
+ {
|
|
|
- return objects;
|
|
+ go.transform.localPosition = new Vector3(0, 0.3f, 0);
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+ else if (mat.textPosition == "bottom")
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ go.transform.localPosition = new Vector3(0, -0.3f, 0);
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ else if (mat.textPosition == "left")
|
|
|
- private List<ObjectValue> CreateImage_Video_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
+ {
|
|
|
- {
|
|
+ go.transform.localPosition = new Vector3(-0.3f, 0, 0);
|
|
|
- newmaterial = material;
|
|
+ }
|
|
|
- List<ObjectValue> objects = new List<ObjectValue>();
|
|
+ else if (mat.textPosition == "right")
|
|
|
- switch (material.typesetting)
|
|
+ {
|
|
|
- {
|
|
+ go.transform.localPosition = new Vector3(0.3f, 0f, 0);
|
|
|
- case "1":
|
|
+ }
|
|
|
- objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial);
|
|
+ }
|
|
|
- break;
|
|
+ mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
|
- case "2":
|
|
+ }
|
|
|
- objects = SRSectorLayout.CalLayout(material, spoit, out newmaterial);
|
|
+ ObjectValue objectValue = CreateMatObjectValue(i, material.id, go, mat);
|
|
|
- break;
|
|
+ objects.Add(objectValue);
|
|
|
- case "3":
|
|
+ }
|
|
|
- objects = DRTitleLayout.CalLayout(material, spoit, out newmaterial);
|
|
+
|
|
|
- break;
|
|
+ newmaterial.materialList[i] = mat;
|
|
|
- case "4":
|
|
+ }
|
|
|
- objects = DRFanLayout.CalLayout(material, spoit, out newmaterial);
|
|
+ return objects;
|
|
|
- break;
|
|
+ }
|
|
|
- case "5":
|
|
+
|
|
|
- objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial,"5");
|
|
+
|
|
|
- break;
|
|
+
|
|
|
- case "自定义":
|
|
+
|
|
|
- break;
|
|
+
|
|
|
- default:
|
|
+ private List<ObjectValue> CreateImage_Video_Text(MaterialObl material, GameObject spoit, out MaterialObl newmaterial)
|
|
|
- break;
|
|
+ {
|
|
|
- }
|
|
+ newmaterial = material;
|
|
|
- return objects;
|
|
+ List<ObjectValue> objects = new List<ObjectValue>();
|
|
|
- }
|
|
+ switch (material.typesetting)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ case "1":
|
|
|
-
|
|
+ objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial);
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ case "2":
|
|
|
-
|
|
+ objects = SRSectorLayout.CalLayout(material, spoit, out newmaterial);
|
|
|
-
|
|
+ break;
|
|
|
-
|
|
+ case "3":
|
|
|
-
|
|
+ objects = DRTitleLayout.CalLayout(material, spoit, out newmaterial);
|
|
|
- private ObjectValue CreateMatObjectValue(int id, int parentid, GameObject go, MaterialObjValue mat)
|
|
+ break;
|
|
|
- {
|
|
+ case "4":
|
|
|
- go.name = string.IsNullOrWhiteSpace(mat.name) ? go.name : mat.name;
|
|
+ objects = DRFanLayout.CalLayout(material, spoit, out newmaterial);
|
|
|
- go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
+ break;
|
|
|
-
|
|
+ case "5":
|
|
|
- if (mat.ObjectTransform != null)
|
|
+ objects = SRTitleLayout.CalLayout(material, spoit, out newmaterial,"5");
|
|
|
- {
|
|
+ break;
|
|
|
- go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
+ case "自定义":
|
|
|
- go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
+ break;
|
|
|
- go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
+ default:
|
|
|
- }
|
|
+ break;
|
|
|
- else
|
|
+ }
|
|
|
- {
|
|
+ return objects;
|
|
|
- go.transform.localPosition = Vector3.zero;
|
|
+ }
|
|
|
- go.transform.localEulerAngles = Vector3.zero;
|
|
+
|
|
|
- go.transform.localScale = new Vector3(1, 1, 1);
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
- ObjectValue objectValue = new ObjectValue(id, parentid, mat.name, go, go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
+
|
|
|
- return objectValue;
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
- #endregion
|
|
+
|
|
|
-
|
|
+ private ObjectValue CreateMatObjectValue(int id, int parentid, GameObject go, MaterialObjValue mat)
|
|
|
- #region 路径
|
|
+ {
|
|
|
-
|
|
+ go.name = string.IsNullOrWhiteSpace(mat.name) ? go.name : mat.name;
|
|
|
-
|
|
+ go.AddComponent<EditorEventHandler>().Type = (MaterialType)(int.Parse(mat.type));
|
|
|
-
|
|
+
|
|
|
-
|
|
+ if (mat.ObjectTransform != null)
|
|
|
-
|
|
+ {
|
|
|
- public void SetRouteValue(List<NavLinesItem> navLines)
|
|
+ go.transform.localPosition = mat.ObjectTransform.nowPos;
|
|
|
- {
|
|
+ go.transform.localEulerAngles = mat.ObjectTransform.nowRot;
|
|
|
- if (navLines == null || navLines.Count <= 0)
|
|
+ go.transform.localScale = mat.ObjectTransform.nowScale;
|
|
|
- {
|
|
+ }
|
|
|
- Debug.Log("当前景点未绘制路线");
|
|
+ else
|
|
|
- return;
|
|
+ {
|
|
|
- }
|
|
+ go.transform.localPosition = Vector3.zero;
|
|
|
- RouteCtr.SetRouteValue(navLines);
|
|
+ go.transform.localEulerAngles = Vector3.zero;
|
|
|
- }
|
|
+ go.transform.localScale = new Vector3(1, 1, 1);
|
|
|
- #endregion
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- #region 锚点
|
|
+ ObjectValue objectValue = new ObjectValue(id, parentid, mat.name, go, go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
|
|
|
-
|
|
+ return objectValue;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ #endregion
|
|
|
-
|
|
+
|
|
|
- public void SetAnchor(List<Anchor> listAnchor)
|
|
+ #region 路径
|
|
|
- {
|
|
+
|
|
|
- if (listAnchor == null)
|
|
+
|
|
|
- return;
|
|
+
|
|
|
- Anchor anchor;
|
|
+
|
|
|
- for (int i = 0; i < listAnchor.Count - 1; i++)
|
|
+
|
|
|
- {
|
|
+ public void SetRouteValue(List<NavLinesItem> navLines)
|
|
|
- for (int j = 0; j < listAnchor.Count - 1 - i; j++)
|
|
+ {
|
|
|
- {
|
|
+ if (navLines == null || navLines.Count <= 0)
|
|
|
- if (listAnchor[j].id > listAnchor[j + 1].id)
|
|
+ {
|
|
|
- {
|
|
+ Debug.Log("当前景点未绘制路线");
|
|
|
- anchor = listAnchor[j];
|
|
+ return;
|
|
|
- listAnchor[j] = listAnchor[j + 1];
|
|
+ }
|
|
|
- listAnchor[j + 1] = anchor;
|
|
+ RouteCtr.SetRouteValue(navLines);
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ #endregion
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ #region 锚点
|
|
|
- for (int i = 0; i < listAnchor.Count; i++)
|
|
+
|
|
|
- {
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- GameManager.Instance.AnchorValue.Add(listAnchor[i], CreateAnchor(listAnchor[i]));
|
|
+
|
|
|
- GameManager.Instance.AnchorChild.Add(listAnchor[i], AnchorValue[listAnchor[i]].transform.GetChild(0).gameObject);
|
|
+ public void SetAnchor(List<Anchor> listAnchor)
|
|
|
- }
|
|
+ {
|
|
|
- m_UIAnchorsPanel.SetAnchor(AnchorValue);
|
|
+ if (listAnchor == null)
|
|
|
- }
|
|
+ return;
|
|
|
-
|
|
+ Anchor anchor;
|
|
|
- private MeshRenderer CreateAnchor(Anchor anchor)
|
|
+ for (int i = 0; i < listAnchor.Count - 1; i++)
|
|
|
- {
|
|
+ {
|
|
|
-
|
|
+ for (int j = 0; j < listAnchor.Count - 1 - i; j++)
|
|
|
-
|
|
+ {
|
|
|
- GameObject anchorObj = GameObject.Instantiate(Resources.Load<GameObject>("Template/Prefab/Anchor"),AnchorsParent);
|
|
+ if (listAnchor[j].id > listAnchor[j + 1].id)
|
|
|
- anchorObj.name = "Anchor" + anchor.id;
|
|
+ {
|
|
|
-
|
|
+ anchor = listAnchor[j];
|
|
|
- VuforiaAnchor vuforiaAnchor = anchorObj.GetComponent<VuforiaAnchor>();
|
|
+ listAnchor[j] = listAnchor[j + 1];
|
|
|
- vuforiaAnchor.player = GameManager.Instance.m_head.transform;
|
|
+ listAnchor[j + 1] = anchor;
|
|
|
- if (VuforiaManager.Instance.list_Anchor == null)
|
|
+ }
|
|
|
- VuforiaManager.Instance.list_Anchor = new List<VuforiaAnchor>();
|
|
+ }
|
|
|
- VuforiaManager.Instance.list_Anchor.Add(vuforiaAnchor);*/
|
|
+ }
|
|
|
- var anchorPos = Vector3.zero;
|
|
+
|
|
|
- Debug.Log(anchor.picturePosition.pointRelativeX+" "+ WebMapSize.x);
|
|
+ for (int i = 0; i < listAnchor.Count; i++)
|
|
|
- anchorPos = new Vector3((float)anchor.picturePosition.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)anchor.picturePosition.pointRelativeY / WebMapSize.y * MapSize.y);
|
|
+ {
|
|
|
- anchorObj.transform.localPosition = anchorPos;
|
|
+
|
|
|
-
|
|
+
|
|
|
- anchorObj.transform.GetChild(0).gameObject.SetActive(false);
|
|
+ GameManager.Instance.AnchorValue.Add(listAnchor[i], CreateAnchor(listAnchor[i]));
|
|
|
-
|
|
+ GameManager.Instance.AnchorChild.Add(listAnchor[i], AnchorValue[listAnchor[i]].transform.GetChild(0).gameObject);
|
|
|
- var mesh = anchorObj.GetComponent<MeshRenderer>();
|
|
+ }
|
|
|
- mesh.enabled = false;
|
|
+ m_UIAnchorsPanel.SetAnchor(AnchorValue);
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ private MeshRenderer CreateAnchor(Anchor anchor)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- if(anchor.objectTransform!=null && anchor.objectTransform.nowScale!=Vector3.zero)
|
|
+ GameObject anchorObj = GameObject.Instantiate(Resources.Load<GameObject>("Template/Prefab/Anchor"),AnchorsParent);
|
|
|
- {
|
|
+ anchorObj.name = "Anchor" + anchor.id;
|
|
|
- anchorObj.transform.localEulerAngles = anchor.objectTransform.nowRot;
|
|
+
|
|
|
- anchorObj.transform.localPosition = anchor.objectTransform.nowPos;
|
|
+ VuforiaAnchor vuforiaAnchor = anchorObj.GetComponent<VuforiaAnchor>();
|
|
|
- }
|
|
+ vuforiaAnchor.player = GameManager.Instance.m_head.transform;
|
|
|
-
|
|
+ if (VuforiaManager.Instance.list_Anchor == null)
|
|
|
-
|
|
+ VuforiaManager.Instance.list_Anchor = new List<VuforiaAnchor>();
|
|
|
- return mesh;
|
|
+ VuforiaManager.Instance.list_Anchor.Add(vuforiaAnchor);*/
|
|
|
- }
|
|
+ var anchorPos = Vector3.zero;
|
|
|
- #endregion
|
|
+ Debug.Log(anchor.picturePosition.pointRelativeX+" "+ WebMapSize.x);
|
|
|
-
|
|
+ anchorPos = new Vector3((float)anchor.picturePosition.pointRelativeX / WebMapSize.x * MapSize.x, -1f, -(float)anchor.picturePosition.pointRelativeY / WebMapSize.y * MapSize.y);
|
|
|
-
|
|
+ anchorObj.transform.localPosition = anchorPos;
|
|
|
- #region 触发器判定
|
|
+
|
|
|
-
|
|
+ anchorObj.transform.GetChild(0).gameObject.SetActive(false);
|
|
|
-
|
|
+
|
|
|
-
|
|
+ var mesh = anchorObj.GetComponent<MeshRenderer>();
|
|
|
-
|
|
+ mesh.enabled = false;
|
|
|
- public void OnColliderTriggerEnter(Collider other)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- IsTriggerExiting = true;
|
|
+
|
|
|
- for (int i = 0; i < ListColliderBoxs.Count; i++)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- if (other.name == ListColliderBoxs[i].name)
|
|
+
|
|
|
- {
|
|
+ if(anchor.objectTransform!=null && anchor.objectTransform.nowScale!=Vector3.zero)
|
|
|
- ListShowObjs[i].gameObject.SetActive(true);
|
|
+ {
|
|
|
- Debug.Log(i);
|
|
+ anchorObj.transform.localEulerAngles = anchor.objectTransform.nowRot;
|
|
|
- if (isShowLoacalShowObjs)
|
|
+ anchorObj.transform.localPosition = anchor.objectTransform.nowPos;
|
|
|
- ListLocalShowObjs[i].gameObject.SetActive(true);
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- HttpSocket.Instance.SendIpToPointTrigger(" ",other.name, CallBack);
|
|
+ return mesh;
|
|
|
-
|
|
+ }
|
|
|
- if (SpoitIndex == i)
|
|
+ #endregion
|
|
|
- {
|
|
+
|
|
|
- return;
|
|
+
|
|
|
- }
|
|
+ #region 触发器判定
|
|
|
-
|
|
+
|
|
|
- if (SpoitIndex >= 0 && IsStartEditor)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+
|
|
|
-
|
|
+ public void OnColliderTriggerEnter(Collider other)
|
|
|
- if (isShowLoacalShowObjs)
|
|
+ {
|
|
|
- ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+ IsTriggerExiting = true;
|
|
|
- ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
+ for (int i = 0; i < ListColliderBoxs.Count; i++)
|
|
|
- m_EditorPanel.ClosePanel();
|
|
+ {
|
|
|
- }
|
|
+ if (other.name == ListColliderBoxs[i].name)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ ListShowObjs[i].gameObject.SetActive(true);
|
|
|
- SpoitIndex = i;
|
|
+ Debug.Log(i);
|
|
|
- ListCrystals[SpoitIndex].gameObject.SetActive(false);
|
|
+ if (isShowLoacalShowObjs)
|
|
|
- m_EditorPanel.SetSpoit(SpoitValues[i]);
|
|
+ ListLocalShowObjs[i].gameObject.SetActive(true);
|
|
|
- StartCoroutine(patch());
|
|
+
|
|
|
- return;
|
|
+
|
|
|
- }
|
|
+ HttpSocket.Instance.SendIpToPointTrigger(" ",other.name, CallBack);
|
|
|
- }
|
|
+
|
|
|
- StartCoroutine(patch());
|
|
+ if (SpoitIndex == i)
|
|
|
- }
|
|
+ {
|
|
|
-
|
|
+ return;
|
|
|
- private IEnumerator patch()
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- yield return new WaitForSeconds(0.005f);
|
|
+ if (SpoitIndex >= 0 && IsStartEditor)
|
|
|
- if (PosRotScale.PosRotScalePatchList.Count != 0)
|
|
+ {
|
|
|
- {
|
|
+ ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
- int temp = 0;
|
|
+
|
|
|
- for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
|
|
+ if (isShowLoacalShowObjs)
|
|
|
- {
|
|
+ ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
- if (i != 0)
|
|
+ ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
|
- {
|
|
+ m_EditorPanel.ClosePanel();
|
|
|
- for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
|
|
+ }
|
|
|
- {
|
|
+
|
|
|
- for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
|
|
+
|
|
|
- {
|
|
+ SpoitIndex = i;
|
|
|
- GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition = PosRotScale.PosRotScalePatchList[temp].PosPatch;
|
|
+ ListCrystals[SpoitIndex].gameObject.SetActive(false);
|
|
|
- GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles = PosRotScale.PosRotScalePatchList[temp].RotPatch;
|
|
+ m_EditorPanel.SetSpoit(SpoitValues[i]);
|
|
|
- GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale = PosRotScale.PosRotScalePatchList[temp].ScalePatch;
|
|
+
|
|
|
- temp++;
|
|
+ return;
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ public void SetPosRotScale()
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ if (PosRotScale.PosRotScalePatchList.Count != 0)
|
|
|
-
|
|
+ {
|
|
|
- public void OnColliderTriggerExit(Collider other)
|
|
+ int temp = 0;
|
|
|
- {
|
|
+ for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
|
|
|
- IsTriggerExiting = false;
|
|
+ {
|
|
|
- if (IsStartEditor)
|
|
+ if (i != 0)
|
|
|
- {
|
|
+ {
|
|
|
- return;
|
|
+ for (int j = 0; j < GameManager.Instance.ObjsParent.GetChild(i).childCount; j++)
|
|
|
- }
|
|
+ {
|
|
|
- else
|
|
+ for (int k = 0; k < GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).childCount; k++)
|
|
|
- {
|
|
+ {
|
|
|
- ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+ GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition = PosRotScale.PosRotScalePatchList[temp].PosPatch;
|
|
|
- if (isShowLoacalShowObjs)
|
|
+ GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles = PosRotScale.PosRotScalePatchList[temp].RotPatch;
|
|
|
- ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
+ GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale = PosRotScale.PosRotScalePatchList[temp].ScalePatch;
|
|
|
- ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
+ temp++;
|
|
|
- m_EditorPanel.ClosePanel();
|
|
+ }
|
|
|
- SpoitIndex = -1;
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public void UpdateSpoitValue()
|
|
+
|
|
|
- {
|
|
+ public void OnColliderTriggerExit(Collider other)
|
|
|
- var spoit = SpoitValues[SpoitIndex];
|
|
+ {
|
|
|
- var objvalues = ObjectValues[spoit.id];
|
|
+ IsTriggerExiting = false;
|
|
|
- spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
|
|
+ if (IsStartEditor)
|
|
|
-
|
|
+ {
|
|
|
- var collidervalue = ColliderObjectValues[SpoitIndex];
|
|
+ return;
|
|
|
- var collider = collidervalue.Object;
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
- var pos = collidervalue.nowPos;
|
|
+ {
|
|
|
- var w = collidervalue.nowScale.x;
|
|
+ ListShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
- var h = collidervalue.nowScale.z;
|
|
+ if (isShowLoacalShowObjs)
|
|
|
-
|
|
+ ListLocalShowObjs[SpoitIndex].gameObject.SetActive(false);
|
|
|
-
|
|
+ ListCrystals[SpoitIndex].gameObject.SetActive(true);
|
|
|
- var webpos = new Vector3(Math.Abs(pos.x) / MapSize.x * WebMapSize.x, 0, Math.Abs(pos.z) / MapSize.y * WebMapSize.y);
|
|
+ m_EditorPanel.ClosePanel();
|
|
|
- var webw = w / MapSize.x * WebMapSize.x;
|
|
+ SpoitIndex = -1;
|
|
|
- var webh = h / MapSize.y * WebMapSize.y;
|
|
+ }
|
|
|
- spoit.SpoitTransform[0].areaRelativeX = webpos.x;
|
|
+ }
|
|
|
- spoit.SpoitTransform[0].areaRelativeY = webpos.z;
|
|
+
|
|
|
- spoit.SpoitTransform[0].areaRelativeW = webw;
|
|
+
|
|
|
- spoit.SpoitTransform[0].areaRelativeH = webh;
|
|
+
|
|
|
-
|
|
+
|
|
|
- spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
|
|
+ public void UpdateSpoitValue()
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ var spoit = SpoitValues[SpoitIndex];
|
|
|
- if (objvalues.Object == null)
|
|
+ var objvalues = ObjectValues[spoit.id];
|
|
|
- {
|
|
+ spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
|
|
|
- RemoveSpoitObjectValue(spoit.id);
|
|
+
|
|
|
- spoit.material = new List<MaterialObl>();
|
|
+ var collidervalue = ColliderObjectValues[SpoitIndex];
|
|
|
- }
|
|
+ var collider = collidervalue.Object;
|
|
|
- else
|
|
+
|
|
|
- {
|
|
+ var pos = collidervalue.nowPos;
|
|
|
- var mats = spoit.material;
|
|
+ var w = collidervalue.nowScale.x;
|
|
|
- var objvalue = objvalues.ChildrenObj;
|
|
+ var h = collidervalue.nowScale.z;
|
|
|
-
|
|
+
|
|
|
- for (int j = 0; j < mats.Count; j++)
|
|
+
|
|
|
- {
|
|
+ var webpos = new Vector3(Math.Abs(pos.x) / MapSize.x * WebMapSize.x, 0, Math.Abs(pos.z) / MapSize.y * WebMapSize.y);
|
|
|
- var matobj = mats[j];
|
|
+ var webw = w / MapSize.x * WebMapSize.x;
|
|
|
- var obis = objvalue[j];
|
|
+ var webh = h / MapSize.y * WebMapSize.y;
|
|
|
- matobj.objectTransform.SavePos(obis.nowPos, obis.nowRot, obis.nowScale);
|
|
+ spoit.SpoitTransform[0].areaRelativeX = webpos.x;
|
|
|
-
|
|
+ spoit.SpoitTransform[0].areaRelativeY = webpos.z;
|
|
|
- for (int m = 0; m < matobj.materialList.Count; m++)
|
|
+ spoit.SpoitTransform[0].areaRelativeW = webw;
|
|
|
- {
|
|
+ spoit.SpoitTransform[0].areaRelativeH = webh;
|
|
|
- var childrenobj = obis.ChildrenObj[m];
|
|
+
|
|
|
- var mat = matobj.materialList[m];
|
|
+ spoit.spoitTf.SavePos(objvalues.nowPos, objvalues.nowRot, objvalues.nowScale);
|
|
|
-
|
|
+
|
|
|
- if (childrenobj.Object == null)
|
|
+
|
|
|
- {
|
|
+ if (objvalues.Object == null)
|
|
|
- obis.ChildrenObj.RemoveAt(m);
|
|
+ {
|
|
|
- matobj.materialList.RemoveAt(m);
|
|
+ RemoveSpoitObjectValue(spoit.id);
|
|
|
- break;
|
|
+ spoit.material = new List<MaterialObl>();
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+ else
|
|
|
- mat.ObjectTransform.SavePos(childrenobj.nowPos, childrenobj.nowRot, childrenobj.nowScale);
|
|
+ {
|
|
|
- }
|
|
+ var mats = spoit.material;
|
|
|
- matobj.select = true;
|
|
+ var objvalue = objvalues.ChildrenObj;
|
|
|
-
|
|
+
|
|
|
- if (obis.ChildrenObj.Count <= 0)
|
|
+ for (int j = 0; j < mats.Count; j++)
|
|
|
- {
|
|
+ {
|
|
|
- mats.RemoveAt(j);
|
|
+ var matobj = mats[j];
|
|
|
- objvalue.RemoveAt(j);
|
|
+ var obis = objvalue[j];
|
|
|
- Destroy(obis.Object);
|
|
+ matobj.objectTransform.SavePos(obis.nowPos, obis.nowRot, obis.nowScale);
|
|
|
- break;
|
|
+
|
|
|
- }
|
|
+ for (int m = 0; m < matobj.materialList.Count; m++)
|
|
|
- }
|
|
+ {
|
|
|
- }
|
|
+ var childrenobj = obis.ChildrenObj[m];
|
|
|
- SpoitValues[SpoitIndex] = spoit;
|
|
+ var mat = matobj.materialList[m];
|
|
|
-
|
|
+
|
|
|
- }
|
|
+ if (childrenobj.Object == null)
|
|
|
-
|
|
+ {
|
|
|
- public void UpdateEditorUI()
|
|
+ obis.ChildrenObj.RemoveAt(m);
|
|
|
- {
|
|
+ matobj.materialList.RemoveAt(m);
|
|
|
- m_EditorPanel.SetSpoit(SpoitValues[SpoitIndex]);
|
|
+ break;
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ mat.ObjectTransform.SavePos(childrenobj.nowPos, childrenobj.nowRot, childrenobj.nowScale);
|
|
|
-
|
|
+ }
|
|
|
- #endregion
|
|
+ matobj.select = true;
|
|
|
-
|
|
+
|
|
|
- public ObjectValue GetCurrentColliderValue()
|
|
+ if (obis.ChildrenObj.Count <= 0)
|
|
|
- {
|
|
+ {
|
|
|
- return ColliderObjectValues[SpoitIndex];
|
|
+ mats.RemoveAt(j);
|
|
|
- }
|
|
+ objvalue.RemoveAt(j);
|
|
|
-
|
|
+ Destroy(obis.Object);
|
|
|
- public void SaveSpoitObjectValue(ObjectValue value)
|
|
+ break;
|
|
|
- {
|
|
+ }
|
|
|
- if (ObjectValues.ContainsKey(SpoitValues[SpoitIndex].id))
|
|
+ }
|
|
|
- {
|
|
+ }
|
|
|
- ObjectValues[SpoitValues[SpoitIndex].id] = value;
|
|
+ SpoitValues[SpoitIndex] = spoit;
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ }
|
|
|
-
|
|
+
|
|
|
- public void RemoveSpoitObjectValue(int id)
|
|
+ public void UpdateEditorUI()
|
|
|
- {
|
|
+ {
|
|
|
- if (ObjectValues.ContainsKey(id))
|
|
+ m_EditorPanel.SetSpoit(SpoitValues[SpoitIndex]);
|
|
|
- {
|
|
+ }
|
|
|
- ObjectValues.Remove(id);
|
|
+
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+ #endregion
|
|
|
- public void SaveCurrentColliderValue(ObjectValue value)
|
|
+
|
|
|
- {
|
|
+ public ObjectValue GetCurrentColliderValue()
|
|
|
- if (ColliderObjectValues.Contains(value))
|
|
+ {
|
|
|
- {
|
|
+ return ColliderObjectValues[SpoitIndex];
|
|
|
- ColliderObjectValues[SpoitIndex] = value;
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ public void SaveSpoitObjectValue(ObjectValue value)
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ if (ObjectValues.ContainsKey(SpoitValues[SpoitIndex].id))
|
|
|
- public void CalMapSize()
|
|
+ {
|
|
|
- {
|
|
+ ObjectValues[SpoitValues[SpoitIndex].id] = value;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public void RemoveSpoitObjectValue(int id)
|
|
|
- var disX = Vector3.Distance(PointA.localPosition, PointD.localPosition);
|
|
+ {
|
|
|
- var disZ = Vector3.Distance(PointA.localPosition, PointB.localPosition);
|
|
+ if (ObjectValues.ContainsKey(id))
|
|
|
-
|
|
+ {
|
|
|
- MapSize = new Vector2(disX, disZ);
|
|
+ ObjectValues.Remove(id);
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public void SaveCurrentColliderValue(ObjectValue value)
|
|
|
-
|
|
+ {
|
|
|
- }
|
|
+ if (ColliderObjectValues.Contains(value))
|
|
|
-
|
|
+ {
|
|
|
- public void CallBack(string message)
|
|
+ ColliderObjectValues[SpoitIndex] = value;
|
|
|
- {
|
|
+ }
|
|
|
-
|
|
+ }
|
|
|
- }
|
|
+
|
|
|
-}
|
|
+
|
|
|
-
|
|
+ public void CalMapSize()
|
|
|
-[Serializable]
|
|
+ {
|
|
|
-public class ObjectValue
|
|
+
|
|
|
-{
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ var disX = Vector3.Distance(PointA.localPosition, PointD.localPosition);
|
|
|
- [SerializeField]
|
|
+ var disZ = Vector3.Distance(PointA.localPosition, PointB.localPosition);
|
|
|
- public int ID;
|
|
+
|
|
|
-
|
|
+ MapSize = new Vector2(disX, disZ);
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- [SerializeField]
|
|
+
|
|
|
- public string matName;
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public void CallBack(string message)
|
|
|
- [SerializeField]
|
|
+ {
|
|
|
- public int parentID;
|
|
+
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+}
|
|
|
-
|
|
+
|
|
|
- [SerializeField]
|
|
+[Serializable]
|
|
|
- public GameObject Object;
|
|
+public class ObjectValue
|
|
|
-
|
|
+{
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- [SerializeField]
|
|
+
|
|
|
- public List<ObjectValue> ChildrenObj;
|
|
+ [SerializeField]
|
|
|
-
|
|
+ public int ID;
|
|
|
- public Vector3 startPos { get; set; }
|
|
+
|
|
|
- public Vector3 startRot { get; set; }
|
|
+
|
|
|
- public Vector3 startScale { get; set; }
|
|
+
|
|
|
-
|
|
+ [SerializeField]
|
|
|
- public Vector3 nowPos { get; set; }
|
|
+ public string matName;
|
|
|
- public Vector3 nowRot { get; set; }
|
|
+
|
|
|
- public Vector3 nowScale { get; set; }
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ [SerializeField]
|
|
|
- public ObjectValue()
|
|
+ public int parentID;
|
|
|
- {
|
|
+
|
|
|
- ChildrenObj = new List<ObjectValue>();
|
|
+
|
|
|
- parentID = -1;
|
|
+
|
|
|
- }
|
|
+ [SerializeField]
|
|
|
-
|
|
+ public GameObject Object;
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
-
|
|
+ [SerializeField]
|
|
|
-
|
|
+ public List<ObjectValue> ChildrenObj;
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public Vector3 startPos { get; set; }
|
|
|
-
|
|
+ public Vector3 startRot { get; set; }
|
|
|
-
|
|
+ public Vector3 startScale { get; set; }
|
|
|
- public ObjectValue(int id, int parentid, string name, GameObject @object, Vector3 pos, Vector3 Rot, Vector3 Scale)
|
|
+
|
|
|
- {
|
|
+ public Vector3 nowPos { get; set; }
|
|
|
- ID = id;
|
|
+ public Vector3 nowRot { get; set; }
|
|
|
- parentID = parentid;
|
|
+ public Vector3 nowScale { get; set; }
|
|
|
- matName = name;
|
|
+
|
|
|
- Object = @object;
|
|
+
|
|
|
- ChildrenObj = new List<ObjectValue>();
|
|
+
|
|
|
-
|
|
+ public ObjectValue()
|
|
|
- startPos = pos;
|
|
+ {
|
|
|
- nowPos = pos;
|
|
+ ChildrenObj = new List<ObjectValue>();
|
|
|
-
|
|
+ parentID = -1;
|
|
|
- startRot = Rot;
|
|
+ }
|
|
|
- nowRot = Rot;
|
|
+
|
|
|
-
|
|
+
|
|
|
- startScale = Scale;
|
|
+
|
|
|
- nowScale = Scale;
|
|
+
|
|
|
- }
|
|
+
|
|
|
-
|
|
+
|
|
|
- public ObjectValue(int id, int parentid, string name, GameObject @object)
|
|
+
|
|
|
- {
|
|
+
|
|
|
- ID = id;
|
|
+
|
|
|
- parentID = parentid;
|
|
+
|
|
|
- matName = name;
|
|
+ public ObjectValue(int id, int parentid, string name, GameObject @object, Vector3 pos, Vector3 Rot, Vector3 Scale)
|
|
|
- Object = @object;
|
|
+ {
|
|
|
- ChildrenObj = new List<ObjectValue>();
|
|
+ ID = id;
|
|
|
-
|
|
+ parentID = parentid;
|
|
|
- startPos = @object.transform.localPosition;
|
|
+ matName = name;
|
|
|
- nowPos = startPos;
|
|
+ Object = @object;
|
|
|
-
|
|
+ ChildrenObj = new List<ObjectValue>();
|
|
|
- startRot = @object.transform.localEulerAngles;
|
|
+
|
|
|
- nowRot = startRot;
|
|
+ startPos = pos;
|
|
|
-
|
|
+ nowPos = pos;
|
|
|
- startScale = @object.transform.localScale;
|
|
+
|
|
|
- nowScale = startScale;
|
|
+ startRot = Rot;
|
|
|
- }
|
|
+ nowRot = Rot;
|
|
|
-
|
|
+
|
|
|
-
|
|
+ startScale = Scale;
|
|
|
-
|
|
+ nowScale = Scale;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+ public ObjectValue(int id, int parentid, string name, GameObject @object)
|
|
|
- public void InitTransform()
|
|
+ {
|
|
|
- {
|
|
+ ID = id;
|
|
|
- if (Object != null)
|
|
+ parentID = parentid;
|
|
|
- {
|
|
+ matName = name;
|
|
|
- startPos = Object.transform.localPosition;
|
|
+ Object = @object;
|
|
|
- nowPos = Object.transform.localPosition;
|
|
+ ChildrenObj = new List<ObjectValue>();
|
|
|
-
|
|
+
|
|
|
- startRot = Object.transform.localEulerAngles;
|
|
+ startPos = @object.transform.localPosition;
|
|
|
- nowRot = Object.transform.localEulerAngles;
|
|
+ nowPos = startPos;
|
|
|
-
|
|
+
|
|
|
- startScale = Object.transform.localScale;
|
|
+ startRot = @object.transform.localEulerAngles;
|
|
|
- nowScale = Object.transform.localScale;
|
|
+ nowRot = startRot;
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+ startScale = @object.transform.localScale;
|
|
|
-
|
|
+ nowScale = startScale;
|
|
|
-
|
|
+ }
|
|
|
-
|
|
+
|
|
|
-
|
|
+
|
|
|
- public void InitObjTransform()
|
|
+
|
|
|
- {
|
|
+
|
|
|
- Object.transform.localPosition = startPos;
|
|
+
|
|
|
- Object.transform.localEulerAngles = startRot;
|
|
+
|
|
|
- Object.transform.localScale = startScale;
|
|
+ public void InitTransform()
|
|
|
-
|
|
+ {
|
|
|
- nowPos = startPos;
|
|
+ if (Object != null)
|
|
|
- nowRot = startRot;
|
|
+ {
|
|
|
- nowScale = startScale;
|
|
+ startPos = Object.transform.localPosition;
|
|
|
- }
|
|
+ nowPos = Object.transform.localPosition;
|
|
|
-
|
|
+
|
|
|
-
|
|
+ startRot = Object.transform.localEulerAngles;
|
|
|
-
|
|
+ nowRot = Object.transform.localEulerAngles;
|
|
|
- public void SaveObjTransfoem()
|
|
+
|
|
|
- {
|
|
+ startScale = Object.transform.localScale;
|
|
|
- if (Object != null)
|
|
+ nowScale = Object.transform.localScale;
|
|
|
- {
|
|
+ }
|
|
|
- nowPos = Object.transform.localPosition;
|
|
+ }
|
|
|
- nowRot = Object.transform.localEulerAngles;
|
|
+
|
|
|
- nowScale = Object.transform.localScale;
|
|
+
|
|
|
- }
|
|
+
|
|
|
- }
|
|
+
|
|
|
-}
|
|
+ public void InitObjTransform()
|
|
|
-
|
|
+ {
|
|
|
-
|
|
+ Object.transform.localPosition = startPos;
|
|
|
|
|
+ Object.transform.localEulerAngles = startRot;
|
|
|
|
|
+ Object.transform.localScale = startScale;
|
|
|
|
|
+
|
|
|
|
|
+ nowPos = startPos;
|
|
|
|
|
+ nowRot = startRot;
|
|
|
|
|
+ nowScale = startScale;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ public void SaveObjTransfoem()
|
|
|
|
|
+ {
|
|
|
|
|
+ if (Object != null)
|
|
|
|
|
+ {
|
|
|
|
|
+ nowPos = Object.transform.localPosition;
|
|
|
|
|
+ nowRot = Object.transform.localEulerAngles;
|
|
|
|
|
+ nowScale = Object.transform.localScale;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+
|
蓝色星空