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
38668c35
Commit
38668c35
authored
Jan 24, 2018
by
16홍선우
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ManagementUI button added
parent
a28fd775
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
451 additions
and
2385 deletions
+451
-2385
Deployment1.prefab
Assets/Prefabs/Deployment1.prefab
+1
-1
Deployment1.prefab.meta
Assets/Prefabs/Deployment1.prefab.meta
+0
-0
PlacementQueue.prefab
Assets/Prefabs/PlacementQueue.prefab
+0
-844
PlacementQueue.prefab.meta
Assets/Prefabs/PlacementQueue.prefab.meta
+0
-10
Production1.prefab
Assets/Prefabs/Production1.prefab
+114
-114
ProductionQueue.prefab
Assets/Prefabs/ProductionQueue.prefab
+0
-1291
ProductionQueue.prefab.meta
Assets/Prefabs/ProductionQueue.prefab.meta
+0
-10
GameScene.unity
Assets/Scenes/GameScene.unity
+328
-112
ManagementUIController.cs
Assets/Scripts/ManagementUIController.cs
+8
-3
No files found.
Assets/Prefabs/
Place
ment1.prefab
→
Assets/Prefabs/
Deploy
ment1.prefab
View file @
38668c35
...
@@ -56,7 +56,7 @@ GameObject:
...
@@ -56,7 +56,7 @@ GameObject:
-
component
:
{
fileID
:
222753816676270096
}
-
component
:
{
fileID
:
222753816676270096
}
-
component
:
{
fileID
:
114644775417974404
}
-
component
:
{
fileID
:
114644775417974404
}
m_Layer
:
5
m_Layer
:
5
m_Name
:
Place
ment1
m_Name
:
Deploy
ment1
m_TagString
:
Untagged
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_NavMeshLayer
:
0
...
...
Assets/Prefabs/
Place
ment1.prefab.meta
→
Assets/Prefabs/
Deploy
ment1.prefab.meta
View file @
38668c35
File moved
Assets/Prefabs/PlacementQueue.prefab
deleted
100644 → 0
View file @
a28fd775
This diff is collapsed.
Click to expand it.
Assets/Prefabs/PlacementQueue.prefab.meta
deleted
100644 → 0
View file @
a28fd775
fileFormatVersion: 2
guid: 77c6f854b20c9f34ea22469c907e11bc
timeCreated: 1516266566
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Production1.prefab
View file @
38668c35
This diff is collapsed.
Click to expand it.
Assets/Prefabs/ProductionQueue.prefab
deleted
100644 → 0
View file @
a28fd775
This diff is collapsed.
Click to expand it.
Assets/Prefabs/ProductionQueue.prefab.meta
deleted
100644 → 0
View file @
a28fd775
fileFormatVersion: 2
guid: ef8d1e641fc76d24b94738577f2368e0
timeCreated: 1516266566
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/GameScene.unity
View file @
38668c35
This diff is collapsed.
Click to expand it.
Assets/Scripts/ManagementUIController.cs
View file @
38668c35
...
@@ -8,7 +8,7 @@ using CivModel.Common;
...
@@ -8,7 +8,7 @@ using CivModel.Common;
public
class
ManagementUIController
:
MonoBehaviour
{
public
class
ManagementUIController
:
MonoBehaviour
{
public
GameObject
managementUI
;
public
Canvas
managementUI
;
public
Button
managementTab
;
public
Button
managementTab
;
public
LinkedList
<
Production
>
mProduction
;
public
LinkedList
<
Production
>
mProduction
;
...
@@ -30,9 +30,9 @@ public class ManagementUIController : MonoBehaviour {
...
@@ -30,9 +30,9 @@ public class ManagementUIController : MonoBehaviour {
public
void
setControlUI
()
public
void
setControlUI
()
{
{
if
(
managementTab
==
true
)
if
(
managementTab
==
true
)
managementUI
.
gameObject
.
SetActive
(
true
);
managementUI
.
enabled
=
true
;
// managementUI.
gameObject.SetActive(true);
else
else
managementUI
.
gameObject
.
SetActive
(
false
);
managementUI
.
enabled
=
false
;
// managementUI.
gameObject.SetActive(false);
}
}
...
@@ -45,6 +45,11 @@ public class ManagementUIController : MonoBehaviour {
...
@@ -45,6 +45,11 @@ public class ManagementUIController : MonoBehaviour {
void
Update
()
void
Update
()
{
{
if
(
managementTab
==
true
)
managementUI
.
enabled
=
true
;
else
managementUI
.
enabled
=
false
;
mProduction
=
mPlayer
.
Production
;
// The list of the not-finished productions of this player
mProduction
=
mPlayer
.
Production
;
// The list of the not-finished productions of this player
mDeployment
=
mPlayer
.
Deployment
;
// The list of the ready-to-deploy productions of this player
mDeployment
=
mPlayer
.
Deployment
;
// The list of the ready-to-deploy productions of this player
}
}
...
...
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