Commit 09ff37d6 authored by 17주승원's avatar 17주승원

Character Position & VFX Transition bug

parent ce48ab18
...@@ -65,7 +65,7 @@ namespace ISEKAI_Model ...@@ -65,7 +65,7 @@ namespace ISEKAI_Model
private void _InitEvents() // should add EVERY events when new event plan comes. private void _InitEvents() // should add EVERY events when new event plan comes.
{ {
// allEventsList.Add(new Prolog_1(this)); allEventsList.Add(new Prolog_1(this));
allEventsList.Add(new Prolog_2(this)); allEventsList.Add(new Prolog_2(this));
allEventsList.Add(new ReturnWarning(this)); allEventsList.Add(new ReturnWarning(this));
......
...@@ -245,6 +245,7 @@ public class EventManager : MonoBehaviour ...@@ -245,6 +245,7 @@ public class EventManager : MonoBehaviour
private void _Explanation(Explanation explanation) private void _Explanation(Explanation explanation)
{ {
Debug.Log("explanation"); Debug.Log("explanation");
UIScript.SetActive(true);
StartCoroutine(WaitUntilCharacterLoaded()); StartCoroutine(WaitUntilCharacterLoaded());
...@@ -288,6 +289,7 @@ public class EventManager : MonoBehaviour ...@@ -288,6 +289,7 @@ public class EventManager : MonoBehaviour
private void _Conversation(Conversation conversation) private void _Conversation(Conversation conversation)
{ {
Debug.Log("conversation"); Debug.Log("conversation");
UIScript.SetActive(true);
StartCoroutine(WaitUntilCharacterLoaded()); StartCoroutine(WaitUntilCharacterLoaded());
...@@ -843,11 +845,11 @@ public class EventManager : MonoBehaviour ...@@ -843,11 +845,11 @@ public class EventManager : MonoBehaviour
IEnumerator transtionVFXPlay() IEnumerator transtionVFXPlay()
{ {
UIScript.SetActive(true);
yield return StartCoroutine(fadeOut()); yield return StartCoroutine(fadeOut());
//UIButton.SetActive(false); //UIButton.SetActive(false);
//UIScript.SetActive(false);
ExecuteOneScript(); ExecuteOneScript();
......
...@@ -147,7 +147,7 @@ Transform: ...@@ -147,7 +147,7 @@ Transform:
- {fileID: 1227607385} - {fileID: 1227607385}
- {fileID: 1419722517} - {fileID: 1419722517}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &54311925 --- !u!1 &54311925
GameObject: GameObject:
...@@ -348,7 +348,7 @@ RectTransform: ...@@ -348,7 +348,7 @@ RectTransform:
- {fileID: 54311926} - {fileID: 54311926}
- {fileID: 1810580217} - {fileID: 1810580217}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -1454,13 +1454,13 @@ Transform: ...@@ -1454,13 +1454,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227607383} m_GameObject: {fileID: 1227607383}
m_LocalRotation: {x: -0, y: -0, z: 0.036040653, w: -0.99935037} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -16.145115, y: -16.086811, z: -8.660156} m_LocalPosition: {x: -16.145115, y: -15.34, z: -8.660156}
m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 50748747} m_Father: {fileID: 50748747}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -4.131} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1241437449 --- !u!1 &1241437449
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1881,7 +1881,7 @@ SpriteRenderer: ...@@ -1881,7 +1881,7 @@ SpriteRenderer:
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 10.24, y: 10.24} m_Size: {x: 5, y: 10}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
...@@ -1895,8 +1895,8 @@ Transform: ...@@ -1895,8 +1895,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1419722515} m_GameObject: {fileID: 1419722515}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -11.325115, y: -15.97681, z: -3.6757812} m_LocalPosition: {x: -11.325115, y: -15.34, z: -3.6757812}
m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 50748747} m_Father: {fileID: 50748747}
m_RootOrder: 6 m_RootOrder: 6
...@@ -2339,8 +2339,8 @@ Transform: ...@@ -2339,8 +2339,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1793098992} m_GameObject: {fileID: 1793098992}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -20.705116, y: -16.09681, z: -3.6601562} m_LocalPosition: {x: -20.705116, y: -15.34, z: -3.6601562}
m_LocalScale: {x: 0.89999986, y: 0.89999986, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 50748747} m_Father: {fileID: 50748747}
m_RootOrder: 4 m_RootOrder: 4
...@@ -2420,7 +2420,7 @@ Transform: ...@@ -2420,7 +2420,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1809376484 --- !u!1 &1809376484
GameObject: GameObject:
...@@ -2767,7 +2767,7 @@ Transform: ...@@ -2767,7 +2767,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1913951198 --- !u!114 &1913951198
MonoBehaviour: MonoBehaviour:
...@@ -3016,7 +3016,7 @@ RectTransform: ...@@ -3016,7 +3016,7 @@ RectTransform:
- {fileID: 1140836744} - {fileID: 1140836744}
- {fileID: 283217336} - {fileID: 283217336}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
......
...@@ -3696,8 +3696,8 @@ Transform: ...@@ -3696,8 +3696,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1226834386} m_GameObject: {fileID: 1226834386}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.0029999, y: 0.015, z: 6.0625} m_LocalPosition: {x: 0.0327, y: -0.0056, z: 6.0625}
m_LocalScale: {x: 3.3207483, y: 3.3384979, z: 1.5477} m_LocalScale: {x: 1.5516536, y: 1.5599474, z: 0.7231787}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment