Merge branch 'master' into F/0710_2.1+2.0

Assets/Resources/Template/Prefab/Text.prefab

@@ -441,4 +441,3 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   boundingBox: {fileID: 3735631276721690460}
   manipulationHandler: {fileID: 183926529109974472}
-  obj_BoundingBox: {fileID: 0}

Assets/Resources/UI/LoginPanel.prefab

@@ -4164,6 +4164,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: SNAndVersion
       objectReference: {fileID: 0}
+    - target: {fileID: 1536495084242872656, guid: af35dd847a693ca4d9d6a092c7487e22,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1621527033159262363, guid: af35dd847a693ca4d9d6a092c7487e22,
         type: 3}
       propertyPath: m_Pivot.x

Assets/Script/GongShi2.cs

@@ -84,9 +84,9 @@ public class GongShi2 : MonoBehaviour
         WebPosObj.transform.parent = parent;
         WebPosObj2.transform.parent = parent;
         List<Vector2> lvlist = new List<Vector2>();
-        Vector2 p1 = new Vector2(Mathf.Abs(WebPosObj.transform.localPosition.x / sceneLength * tw  ), Mathf.Abs(th-((WebPosObj.transform.localPosition.z) / sceneWidth * th  )));
+        Vector2 p1 = new Vector2(WebPosObj.transform.localPosition.x / sceneLength * tw  , th-((WebPosObj.transform.localPosition.z) / sceneWidth * th  ));
         lvlist.Add(p1);
-        Vector2 p2 = new Vector2(Mathf.Abs(WebPosObj2.transform.localPosition.x / sceneLength * tw ), Mathf.Abs(th-((WebPosObj2.transform.localPosition.z )/ sceneWidth * th  )));
+        Vector2 p2 = new Vector2(WebPosObj2.transform.localPosition.x / sceneLength * tw , th-((WebPosObj2.transform.localPosition.z )/ sceneWidth * th  ));
         lvlist.Add(p2);
         Debug.Log("Web¶ËPos  :" + p1);
         Debug.Log("Web¶ËPos 2 :" + p2);

Assets/Scripts/UI/EdirPanel/MaterialBtnItem.cs

@@ -108,9 +108,9 @@ public class MaterialBtnItem : MonoBehaviour, EventObserver
         m_ObjectValue = objValue;
         MaterialObj = objValue.Object;
         m_Text.text = string.IsNullOrWhiteSpace(value.name) ? MaterialObj.name : value.name;
-        MaterialObj.transform.localPosition = m_ObjectValue.nowPos;
-        MaterialObj.transform.localEulerAngles = m_ObjectValue.nowRot;
-        MaterialObj.transform.localScale = m_ObjectValue.nowScale;
+        //MaterialObj.transform.localPosition = m_ObjectValue.nowPos;
+        //MaterialObj.transform.localEulerAngles = m_ObjectValue.nowRot;
+        //MaterialObj.transform.localScale = m_ObjectValue.nowScale;
 
         //m_Image.sprite = 
     }

Assets/Scripts/UI/EdirPanel/UIEditorPanel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Blue;
@@ -217,6 +217,8 @@ public class UIEditorPanel : AbstractController, EventObserver
 
         RevocationBtn.onClick.AddListener(() =>
         {
+            GameManager.Instance.SetPosRotScale();
+            
             if (MaterialObj == null)
                 return;
 
@@ -243,6 +245,9 @@ public class UIEditorPanel : AbstractController, EventObserver
             }
             GameManager.Instance.SaveSpoitObjs();
             */
+
+            // TODO 需要再保存一次
+            GameManager.Instance.GetPosRotScale();
             StartCoroutine(SetSpoitInfo());
         });
     }

Assets/Scripts/UI/GameManager.cs

@@ -494,8 +494,8 @@ public class GameManager : MonoSingleton<GameManager>
     //}
 
 
-#region 设置功能
-
+    #region 设置功能
+    public bool needSavePosRotScale = true;
     public void OnEditorBtnValueChanged(bool ison)
     {
         m_EditorCanvas.gameObject.SetActive(ison);
@@ -508,6 +508,11 @@ public class GameManager : MonoSingleton<GameManager>
 
         if (ison)
         {
+            if (needSavePosRotScale)
+            {
+                GetPosRotScale(); // 获取所有物体位置旋转缩放
+                needSavePosRotScale = false;
+            }
             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);
 
@@ -681,7 +686,29 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
     }
-#endregion
+
+    public void GetPosRotScale()
+    {
+        PosRotScale.PosRotScalePatchList.Clear();
+        for (int i = 0; i < GameManager.Instance.ObjsParent.childCount; i++)
+        {
+            if (i != 0)
+            {
+                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++)
+                    {
+                        PosRotScalePatch PosRotScalePatch = new PosRotScalePatch();
+                        PosRotScalePatch.PosPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localPosition;
+                        PosRotScalePatch.RotPatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localEulerAngles;
+                        PosRotScalePatch.ScalePatch = GameManager.Instance.ObjsParent.GetChild(i).GetChild(j).GetChild(k).localScale;
+                        PosRotScale.PosRotScalePatchList.Add(PosRotScalePatch);
+                    }
+                }
+            }
+        }
+    }
+    #endregion
 
 #region 获取景点信息--素材编辑模式下
     /// <summary>
@@ -1064,19 +1091,12 @@ public class GameManager : MonoSingleton<GameManager>
             //素材组物体
             GameObject matObj = new GameObject(material.name);
             matObj.transform.SetParent(spoitValues.Object.transform);
-            if (!material.select)
-            {
-                matObj.transform.localPosition = Vector3.zero;
-                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;
-                matObj.transform.localEulerAngles = material.objectTransform.nowRot;
-                matObj.transform.localScale = material.objectTransform.nowScale;
-            }
+
+            matObj.transform.localPosition = Vector3.zero;
+            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);
+
             //素材组合对应ObjectValue的
             ObjectValue spoitValue = new ObjectValue(i, spoit.id, material.name, matObj);
             //素材组合下的单个素材ObjectValue
@@ -1650,16 +1670,13 @@ public class GameManager : MonoSingleton<GameManager>
                 SpoitIndex = i;
                 ListCrystals[SpoitIndex].gameObject.SetActive(false);
                 m_EditorPanel.SetSpoit(SpoitValues[i]);
-                StartCoroutine(patch());
                 return;
             }
         }
-        StartCoroutine(patch());
     }
 
-    private IEnumerator patch()
+    public void SetPosRotScale()
     {
-        yield return new WaitForSeconds(0.005f);
         if (PosRotScale.PosRotScalePatchList.Count != 0)
         {
             int temp = 0;