Movable Tile highlighted, character information shown

이동 가능한 타일 보임. 캐릭터 정보 보임. F누르면 현재 focus된 캐릭터로 이동 Civmodel 업데이트 Tile과 색상에 1:1 매칭 x,y축 어긋낫던 것 패치 todo : move에 대한 presenter로의 인수 전달 방법

Movable Tile highlighted, character information shown
이동 가능한 타일 보임. 캐릭터 정보 보임. F누르면 현재 focus된 캐릭터로 이동 Civmodel 업데이트 Tile과 색상에 1:1 매칭 x,y축 어긋낫던 것 패치 todo : move에 대한 presenter로의 인수 전달 방법
a28fd775 · redsuncore · dfbc0ae0 · a28fd775 · a28fd775 · a28fd775
Commit a28fd775 authored Jan 24, 2018 by redsuncore
20 changed files
--- a/Assets/Plugins/CivModel.dll
+++ b/Assets/Plugins/CivModel.dll
--- a/Assets/Plugins/CivModel.dll.mdb
+++ b/Assets/Plugins/CivModel.dll.mdb
--- a/Assets/Plugins/CivModel.dll.mdb.meta
+++ b/Assets/Plugins/CivModel.dll.mdb.meta
 fileFormatVersion: 2
 guid: 51a4ccfc53e3bd3489fedcd4adb9e458
-timeCreated: 1516476806
+timeCreated: 1516736761
 licenseType: Free
 DefaultImporter:
  externalObjects: {}

--- a/Assets/Plugins/CivPresenter.dll
+++ b/Assets/Plugins/CivPresenter.dll
--- a/Assets/Plugins/CivPresenter.dll.mdb
+++ b/Assets/Plugins/CivPresenter.dll.mdb
--- a/Assets/Plugins/CivPresenter.dll.mdb.meta
+++ b/Assets/Plugins/CivPresenter.dll.mdb.meta
 fileFormatVersion: 2
 guid: f6fc0c038e7ce6640910e93606bc6076
-timeCreated: 1516476806
+timeCreated: 1516736761
 licenseType: Free
 DefaultImporter:
  externalObjects: {}

--- a/Assets/Resources/Tile_Texture/Darkpurple.png
+++ b/Assets/Resources/Tile_Texture/Darkpurple.png
--- a/Assets/Resources/Tile_Texture/Darkpurple.png.meta
+++ b/Assets/Resources/Tile_Texture/Darkpurple.png.meta
+fileFormatVersion: 2
+guid: ca5230cd6c8beb14c8cc71518e2a9e75
+timeCreated: 1516735962
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Tile_Texture/Gray.png
+++ b/Assets/Resources/Tile_Texture/Gray.png
--- a/Assets/Resources/Tile_Texture/Gray.png.meta
+++ b/Assets/Resources/Tile_Texture/Gray.png.meta
+fileFormatVersion: 2
+guid: 4b7d8b910edb3184b9204fbbdfe71a0a
+timeCreated: 1516735962
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Tile_Texture/IronGreen.png
+++ b/Assets/Resources/Tile_Texture/IronGreen.png
--- a/Assets/Resources/Tile_Texture/IronGreen.png.meta
+++ b/Assets/Resources/Tile_Texture/IronGreen.png.meta
+fileFormatVersion: 2
+guid: ee06ad56b545a884ea2ecbf0cef2c6f2
+timeCreated: 1516735962
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Tile_Texture/Magenta.png
+++ b/Assets/Resources/Tile_Texture/Magenta.png
--- a/Assets/Resources/Tile_Texture/Magenta.png.meta
+++ b/Assets/Resources/Tile_Texture/Magenta.png.meta
+fileFormatVersion: 2
+guid: 633f8dfe3942ee34c8f420e0c874a542
+timeCreated: 1516735962
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Tile_Texture/Orange.png
+++ b/Assets/Resources/Tile_Texture/Orange.png
--- a/Assets/Resources/Tile_Texture/Orange.png.meta
+++ b/Assets/Resources/Tile_Texture/Orange.png.meta
+fileFormatVersion: 2
+guid: 3de364c47e62ce14ea9a581557d4f001
+timeCreated: 1516735962
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@@ -456,6 +456,80 @@ CanvasRenderer:
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 67744650}
+--- !u!1 &79274634
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 79274635}
+  - component: {fileID: 79274637}
+  - component: {fileID: 79274636}
+  m_Layer: 5
+  m_Name: UnitHP
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &79274635
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 79274634}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 0.9999998}
+  m_Children: []
+  m_Father: {fileID: 1474852285}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 112.860855, y: 52.300003}
+  m_SizeDelta: {x: 50, y: 22.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &79274636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 79274634}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: HP/HP
+--- !u!222 &79274637
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 79274634}
 --- !u!1 &109918046
 GameObject:
  m_ObjectHideFlags: 0
@@ -1883,6 +1957,13 @@ MonoBehaviour:
  AttackButton: {fileID: 1727812862}
  SkillButton: {fileID: 901706016}
  WaitButton: {fileID: 1126363246}
+  UnitInfo: {fileID: 1474852284}
+  Portrait: {fileID: 109918048}
+  UnitName: {fileID: 1172741147}
+  UnitAttack: {fileID: 1442304659}
+  UnitDefence: {fileID: 500725362}
+  UnitAP: {fileID: 1749593798}
+  UnitHP: {fileID: 79274636}
 --- !u!1 &1115068180
 GameObject:
  m_ObjectHideFlags: 0
@@ -2617,6 +2698,8 @@ RectTransform:
  - {fileID: 1172741146}
  - {fileID: 1442304658}
  - {fileID: 500725361}
+  - {fileID: 79274635}
+  - {fileID: 1749593797}
  m_Father: {fileID: 1096861575}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3143,6 +3226,80 @@ CanvasRenderer:
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1734458425}
+--- !u!1 &1749593796
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1749593797}
+  - component: {fileID: 1749593799}
+  - component: {fileID: 1749593798}
+  m_Layer: 5
+  m_Name: UnitAP
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1749593797
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1749593796}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 0.9999998}
+  m_Children: []
+  m_Father: {fileID: 1474852285}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -84, y: -59.3}
+  m_SizeDelta: {x: 50, y: 22.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1749593798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1749593796}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: AP/AP
+--- !u!222 &1749593799
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1749593796}
 --- !u!1 &1818153440
 GameObject:
  m_ObjectHideFlags: 0

--- a/Assets/Scripts/CIVGameManager.cs
+++ b/Assets/Scripts/CIVGameManager.cs
--- a/Assets/Scripts/CameraUIController.cs
+++ b/Assets/Scripts/CameraUIController.cs
@@ -4,16 +4,27 @@ using UnityEngine;
 using UnityEngine.UI;
 using CivPresenter;
 using CivModel;
+using CivModel.Common;
 public class CameraUIController : MonoBehaviour {
    public Canvas CameraCanvas;
    public Canvas tempManagementUI;
    public Button MoveButton;
    public Button AttackButton;
    public Button SkillButton;
    public Button WaitButton;
+    public GameObject UnitInfo;
+    public Image Portrait;
+    public Text UnitName;
+    public Text UnitAttack;
+    public Text UnitDefence;
+    public Text UnitAP;
+    public Text UnitHP;
    private GameObject gameManagerObject;
    private CIVGameManager gameManager;
@@ -28,36 +39,72 @@ public class CameraUIController : MonoBehaviour {
    public void SkillButtonMethod()
    {
+        Debug.Log("SkillButton");
+        if (mPresenter.SelectedActor.GetType() == typeof(Pioneer))
+        {
+            mPresenter.SelectedActor.SpecialActs[0].Act(mPresenter.SelectedActor.PlacedPoint);
+            Debug.Log("Pioneer set City");
+        }
    }
    public void WaitButtonMethod()
    {
+        Debug.Log("WaitButton");
+        mPresenter.CommandSkip();
    }
    public void AttackButtonMethod()
    {
+        Debug.Log("AttackButton");
+        /*if(caseA)
+            mPresenter.CommandMovingAttack();
+           else(caseA)
+            mPresenter.CommandHoldingAttack
+        */
    }
    // Use this for initialization
-	void Start () {
+    void Start ()
+    {
        gameManagerObject = CIVGameManager.GetGameManager();
        gameManager = gameManagerObject.GetComponent<CIVGameManager>();
        mPresenter = gameManager.GetPresenter();
        tempManagementUI.enabled = false;
+    }
-	}
 	// Update is called once per frame
-	void Update () {
+	void Update ()
-		if(!gameManager.pointSelected.HasValue)
+    {
+		if(mPresenter.SelectedActor == null)
        {
            MoveButton.enabled = false;
        }
        else
        {
-            MoveButton.enabled = true;
+            if (mPresenter.SelectedActor.RemainAP == 0)
+            {
+                MoveButton.enabled = false;
+            }
+            else
+            {
+                MoveButton.enabled = true;
+            }
+        }
+        if(mPresenter.SelectedActor == null)
+        {
+            UnitInfo.SetActive(false);
+            UnitName.text = "공허";
+            UnitAttack.text = "공격력 : 무한";
+            UnitDefence.text = "방어력 : 무한";
+            UnitAP.text = "어디든지";
+        }
+        else
+        {
+            UnitInfo.SetActive(true);
+            UnitName.text = mPresenter.SelectedActor.GetType().ToString().Replace("CivModel.Common.","");
+            UnitAttack.text = "공격력 : " + mPresenter.SelectedActor.AttackPower.ToString();
+            UnitDefence.text = "방어력 : " + mPresenter.SelectedActor.DefencePower.ToString();
+            UnitAP.text = mPresenter.SelectedActor.RemainAP + "/" + mPresenter.SelectedActor.MaxAP;
+            UnitHP.text = mPresenter.SelectedActor.RemainHP + "/" + mPresenter.SelectedActor.MaxHP;
        }
+    }
-	}
 }
--- a/Assets/Scripts/TilePrefab.cs
+++ b/Assets/Scripts/TilePrefab.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.Sprites;
+using CivModel;
 public class TilePrefab : MonoBehaviour {
    [SerializeField]
@@ -21,17 +22,48 @@ public class TilePrefab : MonoBehaviour {
 	// Update is called once per frame
 	void Update () {
-	}
+    }
+    public void MovableTile()
+    {
+        string color = "Magenta";
+        ChangeTile(color);
+    }
    public void ChangeTile(CivModel.Terrain.Point terrainPoint)
    {
-        var t1 = terrainPoint.Type1;
+        var t1 = terrainPoint.Type;
-        var t2 = terrainPoint.Type2;
        string color = "None";
-        string[] colors = new string[]{ "Blue", "Green", "Yellow", "Red", "None" };
+        string[] colors = new string[]{ "Blue", "Green", "Yellow", "Red", "Orange","Magenta", "Gray", "IronGreen", "DarkPurple", "None" };
-        color = colors[((int)t1 + (int)t2) % 5];
+        switch (t1)
+        {
+            case TerrainType.Plain:
+                color = colors[1];
+                break;
+            case TerrainType.Ocean:
+                color = colors[0];
+                break;
+            case TerrainType.Mount:
+                color = colors[4];
+                break;
+            case TerrainType.Forest:
+                color = colors[8];
+                break;
+            case TerrainType.Swamp:
+                color = colors[7];
+                break;
+            case TerrainType.Tundra:
+                color = colors[6];
+                break;
+            case TerrainType.Ice:
+                color = colors[9];
+                break;
+            case TerrainType.Hill:
+                color = colors[2];
+                break;
+                //3 , 5 not used (RED, MAGENTA) - prototype
+        }
        ChangeTile(color);
    }
    public void ChangeTile(string tile)