提交

Assets/Resources/UI/UIPanel/UI_RoamingPanel.prefab

@@ -31,12 +31,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4549688177440690067}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1224, y: 704}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8612646090308961640
 CanvasRenderer:
@@ -73,127 +73,6 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!1 &4235602320892124301
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2444594900165260165}
-  - component: {fileID: 1285823634493170506}
-  - component: {fileID: 4034666149508896477}
-  - component: {fileID: 6089915510140395021}
-  m_Layer: 5
-  m_Name: CloseBtn
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2444594900165260165
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4235602320892124301}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4549688177440690067}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1285823634493170506
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4235602320892124301}
-  m_CullTransparentMesh: 1
---- !u!114 &4034666149508896477
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4235602320892124301}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &6089915510140395021
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4235602320892124301}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 4034666149508896477}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &7853188093099217572
 GameObject:
   m_ObjectHideFlags: 0
@@ -224,7 +103,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2444594900165260165}
   - {fileID: 5974318608921515883}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -258,3 +136,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 39d72113ade30bc4381b69cd3bbf3d9d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  RoamingRawImage: {fileID: 6903066682161480639}
+  canvasGroup: {fileID: 3444312057051000385}

Assets/Scripts/GameManager.cs

@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameManager : MonoBehaviour
+{
+    public static GameManager Instance;
+    /// <summary>
+    /// 位移相机
+    /// </summary>
+    public Transform MoveCamera;
+    /// <summary>
+    /// 复制的物体
+    /// </summary>
+    public GameObject CopyObj;
+    /// <summary>
+    /// 相机位移旋转点位
+    /// </summary>
+    public List<Transform> MoveAndRotatePonit;
+
+    public void Awake()
+    {
+        Instance = this;
+        Init();
+    }
+
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    public void Init()
+    {
+        CopyObj.SetActive(true);
+    }
+}

Assets/Scripts/GameManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d672c5636f0d5ae42ab1ecf33a7a6d1b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/SubjectToggle.cs

@@ -15,8 +15,8 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
     public TextMeshProUGUI SubjectContentText; //课题内容名字
     //public Image targetimage;
     public bool isIPointer; //是否放上去
-    
+
-    
+
     void Start()
     {
         Toggle_Subject = GetComponent<Toggle>();
@@ -38,9 +38,12 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
                             {
                                 Bootstrap.Instance.uiManager.ShowPanel<UI_ExperimentChooesPanel>(this, E_UI_Layer.Top, (panel) =>
                                 {
-                                    Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>();
+                                    Bootstrap.Instance.uiManager.ShowPanel<UI_RoamingPanel>(this, E_UI_Layer.System, (panel) =>
-                                Debug.Log("¼ÓÔس¡¾°³É¹¦");
+                                    {
-                                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f);
+                                        Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>();
+                                        Debug.Log("¼ÓÔس¡¾°³É¹¦");
+                                        Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f);
+                                    });
                                 });
                             });
                         });
@@ -90,7 +93,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
     public void OnPointerExit(PointerEventData eventData)
     {
         isIPointer = false;
-        
+
         //ChooesPanel.targetimage.gameObject.SetActive(isIPointer);
         Image image = GetComponentInChildren<Image>();
         image.sprite = subjectSprites[1];
@@ -119,10 +122,10 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
                 Debug.Log("3333");
                 break;
             case "Subject4":
-               // Debug.Log("4444");
+                // Debug.Log("4444");
-               Toggle_Subject.isOn = false;
+                Toggle_Subject.isOn = false;
-               SubjectContentText.gameObject.SetActive(false);
+                SubjectContentText.gameObject.SetActive(false);
-               SubjectContentText.DOFade(0, 0.01f);
+                SubjectContentText.DOFade(0, 0.01f);
                 break;
         }
     }
@@ -157,14 +160,14 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
         {
             SubjectContentText.DOFade(1, 1f);
             SubjectContentText.gameObject.SetActive(isOn);
-            SubjectNameText.transform.DOLocalMoveY(70,0.5f);
+            SubjectNameText.transform.DOLocalMoveY(70, 0.5f);
             Toggle_Subject.transform.DOScale(1.2f, 0.1f);
         }
         else
         {
             SubjectContentText.DOFade(0, 0.5f);
             SubjectContentText.gameObject.SetActive(isOn);
-            SubjectNameText.transform.DOLocalMoveY(0,0.5f);
+            SubjectNameText.transform.DOLocalMoveY(0, 0.5f);
             Toggle_Subject.transform.DOScale(1f, 0.1f);
         }
     }

Assets/Scripts/UI/UIPanel/UI_ExperimentChooesPanel.cs

@@ -2,9 +2,14 @@ using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class UI_ExperimentChooesPanel : BasePanel
 {
+    /// <summary>
+    /// ¿ÆÄ¿
+    /// </summary>
+    public List<Toggle> SubjectTog;
     protected override void Awake()
     {
         base.Awake();
@@ -14,6 +19,16 @@ public class UI_ExperimentChooesPanel : BasePanel
     public void OnInit()
     {
 
+    }
+    public override void ShowMe()
+    {
+        base.ShowMe();
+    }
+
+    public override void HideMe()
+    {
+        base.HideMe();
+        SubjectTog[0].isOn = true;
     }
     protected override void OnChangeToggle(string btnPath, bool isOn)
     {

Assets/Scripts/UI/UIPanel/UI_RoamingPanel.cs

@@ -1,12 +1,15 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
 using DG.Tweening;
+using System.Collections;
+using UnityEngine;
+using UnityEngine.UI;
 
+/// <summary>
+/// ÂþÓÎÃæ°å
+/// </summary>
 public class UI_RoamingPanel : BasePanel
 {
-    private CanvasGroup canvasGroup; //屏幕显示
+    public RawImage RoamingRawImage;
+    public CanvasGroup canvasGroup; //ÆÁÄ»ÏÔʾ
     protected override void Awake()
     {
         base.Awake();
@@ -24,7 +27,6 @@ public class UI_RoamingPanel : BasePanel
     {
         base.ShowMe();
         FadeIn(0.5f);
-        StopAllCoroutines();
         StartCoroutine(RoamingIE());
     }
 
@@ -38,8 +40,9 @@ public class UI_RoamingPanel : BasePanel
         base.OnClick(btnPath);
         switch (btnPath)
         {
-            case "左侧大按钮":
+            case "CloseBtn":
                 FadeOut(0.5f);
+                GameManager.Instance.CopyObj.SetActive(false);
                 break;
         }
     }
@@ -50,8 +53,21 @@ public class UI_RoamingPanel : BasePanel
     /// <returns></returns>
     private IEnumerator RoamingIE()
     {
+        yield return new WaitForSeconds(0.5f);
+        GameManager.Instance.MoveCamera.transform.
+            DOMove(GameManager.Instance.MoveAndRotatePonit[1].position, 3f);
+        yield return new WaitForSeconds(3.1f);
+        GameManager.Instance.MoveCamera.transform.
+           DORotateQuaternion(GameManager.Instance.MoveAndRotatePonit[2].rotation, 1f);
         yield return new WaitForSeconds(1f);
-
+        GameManager.Instance.MoveCamera.transform.
+          DOMove(GameManager.Instance.MoveAndRotatePonit[3].transform.position, 3f);
+        yield return new WaitForSeconds(3.5f);
+        //RoamingRawImage.DOFade(1, 1);
+        //yield return new WaitForSeconds(1.5f);
+        //RoamingRawImage.DOFade(0, 1);
+        Bootstrap.Instance.uiManager.HidePanel<UI_RoamingPanel>();
+        GameManager.Instance.CopyObj.SetActive(false);
     }
 
     /// <summary>