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
ad2c8473
Commit
ad2c8473
authored
Feb 11, 2018
by
16홍선우
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Production Selection UI (Management UI) enabled &
Skill set UI enabled (Map UI)
parent
93bd7d89
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16022 additions
and
6730 deletions
+16022
-6730
Materials.meta
Assets/Resources/Materials.meta
+9
-0
defaultMat.mat
Assets/Resources/Materials/defaultMat.mat
+76
-0
defaultMat.mat.meta
Assets/Resources/Materials/defaultMat.mat.meta
+9
-0
MainScene.unity
Assets/Scenes/MainScene.unity
+15900
-6724
UIManager.cs
Assets/Scripts/UIManager.cs
+27
-5
ProjectVersion.txt
ProjectSettings/ProjectVersion.txt
+1
-1
No files found.
Assets/Resources/Materials.meta
0 → 100644
View file @
ad2c8473
fileFormatVersion: 2
guid: f9ebde5d4668c1b4d923e3d7927f1278
folderAsset: yes
timeCreated: 1518327971
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Materials/defaultMat.mat
0 → 100644
View file @
ad2c8473
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!21
&2100000
Material
:
serializedVersion
:
6
m_ObjectHideFlags
:
0
m_PrefabParentObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
defaultMat
m_Shader
:
{
fileID
:
46
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ShaderKeywords
:
m_LightmapFlags
:
4
m_EnableInstancingVariants
:
0
m_DoubleSidedGI
:
0
m_CustomRenderQueue
:
-1
stringTagMap
:
{}
disabledShaderPasses
:
[]
m_SavedProperties
:
serializedVersion
:
3
m_TexEnvs
:
-
_BumpMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_DetailAlbedoMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_DetailMask
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_DetailNormalMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_EmissionMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_MainTex
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_MetallicGlossMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_OcclusionMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_ParallaxMap
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
m_Floats
:
-
_BumpScale
:
1
-
_Cutoff
:
0.5
-
_DetailNormalMapScale
:
1
-
_DstBlend
:
0
-
_GlossMapScale
:
1
-
_Glossiness
:
0.5
-
_GlossyReflections
:
1
-
_Metallic
:
0
-
_Mode
:
0
-
_OcclusionStrength
:
1
-
_Parallax
:
0.02
-
_SmoothnessTextureChannel
:
0
-
_SpecularHighlights
:
1
-
_SrcBlend
:
1
-
_UVSec
:
0
-
_ZWrite
:
1
m_Colors
:
-
_Color
:
{
r
:
0.8
,
g
:
0.8
,
b
:
0.8
,
a
:
1
}
-
_EmissionColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
Assets/Resources/Materials/defaultMat.mat.meta
0 → 100644
View file @
ad2c8473
fileFormatVersion: 2
guid: 5ad4a214ca7f3484484bd04076aa338e
timeCreated: 1518327971
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/MainScene.unity
View file @
ad2c8473
This diff is collapsed.
Click to expand it.
Assets/Scripts/UIManager.cs
View file @
ad2c8473
...
...
@@ -8,24 +8,46 @@ public class UIManager : MonoBehaviour {
public
GameObject
ManagementUI
;
public
GameObject
QuestUI
;
public
void
MapUIActive
()
public
GameObject
SkillSet
;
//** Map UI -> Does it need to be in MapUI.cs?
public
GameObject
UnitSelUI
;
//** Production Selection in Management UI -> Do they need to be in ManagementUI.cs?
public
GameObject
BuildingSelUI
;
// public GameObject Tier1, Tier2, Tier3, Tier4; // for tab under tab
// public GameObject CIty, CityBuilding, NormalBuilding;
public
void
MapUIActive
()
// Map UI tab
{
MapUI
.
SetActive
(
true
);
ManagementUI
.
SetActive
(
false
);
QuestUI
.
SetActive
(
false
);
}
public
void
ManagementUIActive
()
public
void
ManagementUIActive
()
// Management UI tab
{
ManagementUI
.
SetActive
(
true
);
MapUI
.
SetActive
(
false
);
QuestUI
.
SetActive
(
false
);
}
public
void
QuestUIActive
()
public
void
QuestUIActive
()
// Quest UI tab
{
QuestUI
.
SetActive
(
true
);
MapUI
.
SetActive
(
false
);
ManagementUI
.
SetActive
(
false
);
}
public
void
SkillSetActive
()
//** Map UI
{
SkillSet
.
SetActive
(!
SkillSet
.
activeSelf
);
}
public
void
UnitSelUIActive
()
//** Production Selection in Management UI
{
UnitSelUI
.
SetActive
(
true
);
BuildingSelUI
.
SetActive
(
false
);
}
public
void
BuildingSelUIActive
()
{
UnitSelUI
.
SetActive
(
false
);
BuildingSelUI
.
SetActive
(
true
);
}
}
ProjectSettings/ProjectVersion.txt
View file @
ad2c8473
m_EditorVersion: 2017.
3.0f3
m_EditorVersion: 2017.
1.1f1
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