Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
another world in jucheland
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
nippon culture research center
another world in jucheland
Commits
09ff37d6
Commit
09ff37d6
authored
Mar 06, 2019
by
17주승원
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Character Position & VFX Transition bug
parent
ce48ab18
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
19 deletions
+21
-19
Game.cs
ISEKAI/Assets/ISEKAI_Model/Core/Game.cs
+1
-1
EventManager.cs
ISEKAI/Assets/ISEKAI_VIEW/EventManager.cs
+4
-2
EventScene.unity
ISEKAI/Assets/Scenes/EventScene.unity
+14
-14
TownScene.unity
ISEKAI/Assets/Scenes/TownScene.unity
+2
-2
No files found.
ISEKAI/Assets/ISEKAI_Model/Core/Game.cs
View file @
09ff37d6
...
...
@@ -65,7 +65,7 @@ namespace ISEKAI_Model
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
ReturnWarning
(
this
));
...
...
ISEKAI/Assets/ISEKAI_VIEW/EventManager.cs
View file @
09ff37d6
...
...
@@ -245,6 +245,7 @@ public class EventManager : MonoBehaviour
private
void
_Explanation
(
Explanation
explanation
)
{
Debug
.
Log
(
"explanation"
);
UIScript
.
SetActive
(
true
);
StartCoroutine
(
WaitUntilCharacterLoaded
());
...
...
@@ -288,6 +289,7 @@ public class EventManager : MonoBehaviour
private
void
_Conversation
(
Conversation
conversation
)
{
Debug
.
Log
(
"conversation"
);
UIScript
.
SetActive
(
true
);
StartCoroutine
(
WaitUntilCharacterLoaded
());
...
...
@@ -843,11 +845,11 @@ public class EventManager : MonoBehaviour
IEnumerator
transtionVFXPlay
()
{
UIScript
.
SetActive
(
true
);
yield
return
StartCoroutine
(
fadeOut
());
//UIButton.SetActive(false);
//UIScript.SetActive(false);
ExecuteOneScript
();
...
...
ISEKAI/Assets/Scenes/EventScene.unity
View file @
09ff37d6
...
...
@@ -147,7 +147,7 @@ Transform:
-
{
fileID
:
1227607385
}
-
{
fileID
:
1419722517
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
7
m_RootOrder
:
6
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&54311925
GameObject
:
...
...
@@ -348,7 +348,7 @@ RectTransform:
-
{
fileID
:
54311926
}
-
{
fileID
:
1810580217
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
8
m_RootOrder
:
7
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
0
,
y
:
0
}
...
...
@@ -1454,13 +1454,13 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1227607383
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
0.036040653
,
w
:
-0.99935037
}
m_LocalPosition
:
{
x
:
-16.145115
,
y
:
-1
6.086811
,
z
:
-8.660156
}
m_LocalScale
:
{
x
:
0.9
,
y
:
0.9
,
z
:
1
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-16.145115
,
y
:
-1
5.34
,
z
:
-8.660156
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
50748747
}
m_RootOrder
:
5
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
-4.131
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&1241437449
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1881,7 +1881,7 @@ SpriteRenderer:
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
10.24
,
y
:
10.24
}
m_Size
:
{
x
:
5
,
y
:
10
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
0
...
...
@@ -1895,8 +1895,8 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1419722515
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-11.325115
,
y
:
-15.
97681
,
z
:
-3.6757812
}
m_LocalScale
:
{
x
:
0.9
,
y
:
0.9
,
z
:
1
}
m_LocalPosition
:
{
x
:
-11.325115
,
y
:
-15.
34
,
z
:
-3.6757812
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
50748747
}
m_RootOrder
:
6
...
...
@@ -2339,8 +2339,8 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1793098992
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-20.705116
,
y
:
-1
6.09681
,
z
:
-3.6601562
}
m_LocalScale
:
{
x
:
0.89999986
,
y
:
0.89999986
,
z
:
1
}
m_LocalPosition
:
{
x
:
-20.705116
,
y
:
-1
5.34
,
z
:
-3.6601562
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
50748747
}
m_RootOrder
:
4
...
...
@@ -2420,7 +2420,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
6
m_RootOrder
:
5
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&1809376484
GameObject
:
...
...
@@ -2767,7 +2767,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
5
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&1913951198
MonoBehaviour
:
...
...
@@ -3016,7 +3016,7 @@ RectTransform:
-
{
fileID
:
1140836744
}
-
{
fileID
:
283217336
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
4
m_RootOrder
:
8
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
0
,
y
:
0
}
...
...
ISEKAI/Assets/Scenes/TownScene.unity
View file @
09ff37d6
...
...
@@ -3696,8 +3696,8 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1226834386
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-0.0029999
,
y
:
0.015
,
z
:
6.0625
}
m_LocalScale
:
{
x
:
3.3207483
,
y
:
3.3384979
,
z
:
1.547
7
}
m_LocalPosition
:
{
x
:
0.0327
,
y
:
-0.0056
,
z
:
6.0625
}
m_LocalScale
:
{
x
:
1.5516536
,
y
:
1.5599474
,
z
:
0.723178
7
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment