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
cd9fdbb1
Commit
cd9fdbb1
authored
Feb 17, 2018
by
16도재형
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn available: Added ProceedTurn() from CivPresenter.cs (
#7
)
parent
0d91b115
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
GameManager.cs
Assets/Scripts/GameManager.cs
+20
-1
UIManager.cs
Assets/Scripts/UIManager.cs
+1
-1
No files found.
Assets/Scripts/GameManager.cs
View file @
cd9fdbb1
...
@@ -70,7 +70,7 @@ public class GameManager : MonoBehaviour {
...
@@ -70,7 +70,7 @@ public class GameManager : MonoBehaviour {
innerRadius
=
outerRadius
*
Mathf
.
Sqrt
(
3.0f
)
/
2
;
innerRadius
=
outerRadius
*
Mathf
.
Sqrt
(
3.0f
)
/
2
;
DrawMap
();
DrawMap
();
SelectNextUnit
();
ProceedTurn
();
}
}
// Update is called once per frame
// Update is called once per frame
...
@@ -218,6 +218,25 @@ public class GameManager : MonoBehaviour {
...
@@ -218,6 +218,25 @@ public class GameManager : MonoBehaviour {
isThereTodos
=
true
;
isThereTodos
=
true
;
Focus
();
Focus
();
}
}
public
void
ProceedTurn
()
{
if
(
_game
.
IsInsideTurn
)
_game
.
EndTurn
();
_game
.
StartTurn
();
SelectNextUnit
();
if
(
_selectedActor
==
null
)
{
if
(
_game
.
PlayerInTurn
.
Cities
.
FirstOrDefault
()
is
CivModel
.
Common
.
CityCenter
)
{
CivModel
.
Common
.
CityCenter
city
=
_game
.
PlayerInTurn
.
Cities
.
FirstOrDefault
();
if
(
city
.
PlacedPoint
is
CivModel
.
Terrain
.
Point
)
Focus
(
city
.
PlacedPoint
.
Value
);
}
}
NormalStateEnter
();
}
// Camera focus
// Camera focus
void
Focus
()
void
Focus
()
...
...
Assets/Scripts/UIManager.cs
View file @
cd9fdbb1
...
@@ -152,7 +152,7 @@ public class UIManager : MonoBehaviour {
...
@@ -152,7 +152,7 @@ public class UIManager : MonoBehaviour {
}
}
else
else
{
{
GameManager
.
I
.
ProceedTurn
();
}
}
}
}
...
...
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