Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
civilization-iii
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
true-history-committee
civilization-iii
Commits
e10f8e1f
Commit
e10f8e1f
authored
Feb 17, 2018
by
16도재형
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fix: variable name changed
parent
61a58c6a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
GameManager.cs
Assets/Scripts/GameManager.cs
+4
-4
UIManager.cs
Assets/Scripts/UIManager.cs
+2
-2
No files found.
Assets/Scripts/GameManager.cs
View file @
e10f8e1f
...
@@ -35,7 +35,7 @@ public class GameManager : MonoBehaviour {
...
@@ -35,7 +35,7 @@ public class GameManager : MonoBehaviour {
private
CivModel
.
Unit
_selectedActor
=
null
;
private
CivModel
.
Unit
_selectedActor
=
null
;
// Variables from Presenter.cs
// Variables from Presenter.cs
public
bool
I
sThereTodos
;
public
bool
i
sThereTodos
;
private
CivModel
.
Unit
[]
_standbyUnits
;
private
CivModel
.
Unit
[]
_standbyUnits
;
private
int
_standbyUnitIndex
=
-
1
;
private
int
_standbyUnitIndex
=
-
1
;
...
@@ -199,7 +199,7 @@ public class GameManager : MonoBehaviour {
...
@@ -199,7 +199,7 @@ public class GameManager : MonoBehaviour {
{
{
_standbyUnitIndex
=
idx
;
_standbyUnitIndex
=
idx
;
_selectedActor
=
_standbyUnits
[
idx
];
_selectedActor
=
_standbyUnits
[
idx
];
I
sThereTodos
=
true
;
i
sThereTodos
=
true
;
Debug
.
Log
(
_selectedActor
.
PlacedPoint
);
Debug
.
Log
(
_selectedActor
.
PlacedPoint
);
Focus
();
Focus
();
return
;
return
;
...
@@ -208,7 +208,7 @@ public class GameManager : MonoBehaviour {
...
@@ -208,7 +208,7 @@ public class GameManager : MonoBehaviour {
_selectedActor
=
null
;
_selectedActor
=
null
;
_standbyUnitIndex
=
-
1
;
_standbyUnitIndex
=
-
1
;
I
sThereTodos
=
false
;
i
sThereTodos
=
false
;
}
}
}
}
void
SelectUnit
(
Unit
unit
)
void
SelectUnit
(
Unit
unit
)
...
@@ -225,7 +225,7 @@ public class GameManager : MonoBehaviour {
...
@@ -225,7 +225,7 @@ public class GameManager : MonoBehaviour {
_standbyUnits
=
units
;
_standbyUnits
=
units
;
_standbyUnitIndex
=
idx
;
_standbyUnitIndex
=
idx
;
I
sThereTodos
=
true
;
i
sThereTodos
=
true
;
Focus
();
Focus
();
}
}
...
...
Assets/Scripts/UIManager.cs
View file @
e10f8e1f
...
@@ -30,7 +30,7 @@ public class UIManager : MonoBehaviour {
...
@@ -30,7 +30,7 @@ public class UIManager : MonoBehaviour {
void
Update
()
void
Update
()
{
{
if
(
GameManager
.
I
.
I
sThereTodos
)
if
(
GameManager
.
I
.
i
sThereTodos
)
{
{
MapUI
.
transform
.
Find
(
"EndTurn"
).
GetComponentInChildren
<
Text
>().
text
=
"유닛이 명령을 기다리고 있습니다"
;
MapUI
.
transform
.
Find
(
"EndTurn"
).
GetComponentInChildren
<
Text
>().
text
=
"유닛이 명령을 기다리고 있습니다"
;
}
}
...
@@ -140,7 +140,7 @@ public class UIManager : MonoBehaviour {
...
@@ -140,7 +140,7 @@ public class UIManager : MonoBehaviour {
public
void
EndTurnActive
()
public
void
EndTurnActive
()
{
{
SkillSet
.
SetActive
(
false
);
SkillSet
.
SetActive
(
false
);
if
(
GameManager
.
I
.
I
sThereTodos
)
if
(
GameManager
.
I
.
i
sThereTodos
)
{
{
GameManager
.
I
.
SelectNextUnit
();
GameManager
.
I
.
SelectNextUnit
();
}
}
...
...
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