This commit is contained in:
taosuqi 2026-02-26 16:30:56 +08:00
parent a73b0830ec
commit e05a17262b
3 changed files with 44 additions and 31 deletions

View File

@ -12653,14 +12653,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 159621351} m_GameObject: {fileID: 159621351}
m_LocalRotation: {x: -0, y: -0.965455, z: -0, w: 0.26057005} m_LocalRotation: {x: -0, y: 0.95937717, z: -0, w: 0.28212652}
m_LocalPosition: {x: 4.412, y: 0, z: 1.841999} m_LocalPosition: {x: -5.752, y: 0, z: 5.609}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1246553323} m_Father: {fileID: 1246553323}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: -149.792, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 147.226, z: 0}
--- !u!114 &160353286 --- !u!114 &160353286
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -83418,14 +83418,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1079299700} m_GameObject: {fileID: 1079299700}
m_LocalRotation: {x: -0, y: -0.965455, z: -0, w: 0.26057005} m_LocalRotation: {x: -0, y: 0.95937717, z: -0, w: 0.28212652}
m_LocalPosition: {x: 4.412, y: 0, z: 1.841999} m_LocalPosition: {x: -5.752, y: 0, z: 5.609}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 20 m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: -149.792, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 147.226, z: 0}
--- !u!114 &1079457029 --- !u!114 &1079457029
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -106937,19 +106937,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -1.559 value: -2.117
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.284 value: -0.1949194
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.296 value: 3.352
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0 value: -0.007854545
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@ -106957,7 +106957,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 1 value: 0.9999692
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
@ -110838,14 +110838,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1489201652} m_GameObject: {fileID: 1489201652}
m_LocalRotation: {x: -0, y: 0.45455757, z: -0, w: 0.8907174} m_LocalRotation: {x: -0, y: -0.13137257, z: -0, w: 0.9913331}
m_LocalPosition: {x: 3.39, y: 0, z: 1.841999} m_LocalPosition: {x: 8.408, y: 0, z: -1.0900002}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1246553323} m_Father: {fileID: 1246553323}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 54.073, z: 0} m_LocalEulerAnglesHint: {x: 0, y: -15.098, z: 0}
--- !u!114 &1491686039 --- !u!114 &1491686039
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -130092,7 +130092,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683453268} m_GameObject: {fileID: 1683453268}
m_LocalRotation: {x: -0, y: 0.45455757, z: -0, w: 0.8907174} m_LocalRotation: {x: -0, y: 0.45455757, z: -0, w: 0.8907174}
m_LocalPosition: {x: -3.08, y: 0, z: 1.841999} m_LocalPosition: {x: -3.08, y: 0, z: -0.254}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -136048,7 +136048,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1769954189} m_GameObject: {fileID: 1769954189}
m_LocalRotation: {x: -0, y: -0.965455, z: -0, w: 0.26057005} m_LocalRotation: {x: -0, y: -0.965455, z: -0, w: 0.26057005}
m_LocalPosition: {x: -3.08, y: 0, z: 1.841999} m_LocalPosition: {x: -5.814, y: 0, z: -0.54}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []

View File

@ -5,6 +5,7 @@ using UnityEngine.UI;
public class UI_LoadingPanel : BasePanel public class UI_LoadingPanel : BasePanel
{ {
public static UI_LoadingPanel instance;
public Slider loadSlider; public Slider loadSlider;
private float currentProgress = 0; private float currentProgress = 0;
@ -12,6 +13,7 @@ public class UI_LoadingPanel : BasePanel
public bool isLoading = false; public bool isLoading = false;
protected override void Awake() protected override void Awake()
{ {
instance = this;
base.Awake(); base.Awake();
loadSlider = GetControl<Slider>("loadSlider"); loadSlider = GetControl<Slider>("loadSlider");
} }

View File

@ -53,21 +53,32 @@ public class UI_RoamingPanel : BasePanel
/// <returns></returns> /// <returns></returns>
private IEnumerator RoamingIE() private IEnumerator RoamingIE()
{ {
yield return new WaitForSeconds(0.5f); if (UI_LoadingPanel.instance.loadSlider.value >= 0)
GameManager.Instance.MoveCamera.transform. {
DOMove(GameManager.Instance.MoveAndRotatePonit[1].position, 3f); yield return new WaitForSeconds(7f);
GameManager.Instance.MoveCamera.transform.SetLocalPositionAndRotation(GameManager.Instance.MoveAndRotatePonit[1].position,
GameManager.Instance.MoveAndRotatePonit[2].rotation);
GameManager.Instance.MoveCamera.transform.position = GameManager.Instance.MoveAndRotatePonit[1].position;
////GameManager.Instance.MoveCamera.transform.
//// DOMove(GameManager.Instance.MoveAndRotatePonit[1].position, 3f);
// yield return new WaitForSeconds(3.1f);
// GameManager.Instance.MoveCamera.transform.rotation = GameManager.Instance.MoveAndRotatePonit[2].rotation;
//GameManager.Instance.MoveCamera.transform.
// DORotateQuaternion(GameManager.Instance.MoveAndRotatePonit[2].rotation, 3f);
yield return new WaitForSeconds(3.1f); yield return new WaitForSeconds(3.1f);
GameManager.Instance.MoveCamera.transform. //GameManager.Instance.MoveCamera.transform.position = GameManager.Instance.MoveAndRotatePonit[3].position;
DORotateQuaternion(GameManager.Instance.MoveAndRotatePonit[2].rotation, 1f); GameManager.Instance.MoveCamera.transform.SetLocalPositionAndRotation(GameManager.Instance.MoveAndRotatePonit[3].position,
yield return new WaitForSeconds(1f); GameManager.Instance.MoveAndRotatePonit[3].rotation);
GameManager.Instance.MoveCamera.transform. //GameManager.Instance.MoveCamera.transform.
DOMove(GameManager.Instance.MoveAndRotatePonit[3].transform.position, 3f); // DOMove(GameManager.Instance.MoveAndRotatePonit[3].transform.position, 3.5f);
yield return new WaitForSeconds(3.5f); yield return new WaitForSeconds(3.6f);
//RoamingRawImage.DOFade(1, 1); //RoamingRawImage.DOFade(1, 1);
//yield return new WaitForSeconds(1.5f); //yield return new WaitForSeconds(1.5f);
//RoamingRawImage.DOFade(0, 1); //RoamingRawImage.DOFade(0, 1);
Bootstrap.Instance.uiManager.HidePanel<UI_RoamingPanel>(); Bootstrap.Instance.uiManager.HidePanel<UI_RoamingPanel>();
GameManager.Instance.CopyObj.SetActive(false); //GameManager.Instance.CopyObj.SetActive(false);
}
} }
/// <summary> /// <summary>