Commit e188efe7 authored by 16도재형's avatar 16도재형

dll importing completed & tiling

parent 276fa256
fileFormatVersion: 2 fileFormatVersion: 2
guid: 14316eefeff7b8c4882dee9cb31df5f1 guid: 14316eefeff7b8c4882dee9cb31df5f1
timeCreated: 1518204165 timeCreated: 1518214576
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: f827a99d5e4488648bcb0d0b5b6a4ed2 guid: f827a99d5e4488648bcb0d0b5b6a4ed2
timeCreated: 1518171196 timeCreated: 1518214574
licenseType: Free licenseType: Free
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 51a4ccfc53e3bd3489fedcd4adb9e458 guid: 51a4ccfc53e3bd3489fedcd4adb9e458
timeCreated: 1518204165 timeCreated: 1518214576
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8deb64f2df3d02a45a45ef02887bb4cc guid: 8deb64f2df3d02a45a45ef02887bb4cc
timeCreated: 1518171196 timeCreated: 1518214574
licenseType: Free licenseType: Free
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2413c1b1e7b93b84a957f43c0249b262 guid: 2413c1b1e7b93b84a957f43c0249b262
timeCreated: 1518204162 timeCreated: 1518214574
licenseType: Free licenseType: Free
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: f6fc0c038e7ce6640910e93606bc6076 guid: f6fc0c038e7ce6640910e93606bc6076
timeCreated: 1518204165 timeCreated: 1518214576
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 816d76721656ca94f9a87f05b54850d8 guid: 816d76721656ca94f9a87f05b54850d8
timeCreated: 1518171195 timeCreated: 1518214573
licenseType: Free licenseType: Free
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: c10ada295d908db498d79b64d9cff2c3 guid: c10ada295d908db498d79b64d9cff2c3
timeCreated: 1518204162 timeCreated: 1518214574
licenseType: Free licenseType: Free
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
......
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -874,7 +874,7 @@ RectTransform: ...@@ -874,7 +874,7 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20} m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -3933,7 +3933,7 @@ RectTransform: ...@@ -3933,7 +3933,7 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20} m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -4171,7 +4171,7 @@ RectTransform: ...@@ -4171,7 +4171,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 580, y: 90}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &480667145 --- !u!114 &480667145
MonoBehaviour: MonoBehaviour:
...@@ -4663,7 +4663,7 @@ RectTransform: ...@@ -4663,7 +4663,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 580, y: 90}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &494962732 --- !u!114 &494962732
MonoBehaviour: MonoBehaviour:
...@@ -7956,7 +7956,7 @@ Camera: ...@@ -7956,7 +7956,7 @@ Camera:
height: 1 height: 1
near clip plane: 0.3 near clip plane: 0.3
far clip plane: 1000 far clip plane: 1000
field of view: 60 field of view: 42
orthographic: 0 orthographic: 0
orthographic size: 5 orthographic size: 5
m_Depth: -1 m_Depth: -1
...@@ -7980,13 +7980,13 @@ Transform: ...@@ -7980,13 +7980,13 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1006940696} m_GameObject: {fileID: 1006940696}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalPosition: {x: 0, y: 6.75, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!1 &1008685727 --- !u!1 &1008685727
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -8369,6 +8369,51 @@ RectTransform: ...@@ -8369,6 +8369,51 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0} m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1056054507
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1056054509}
- component: {fileID: 1056054508}
m_Layer: 0
m_Name: Game Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1056054508
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1056054507}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 112f8b62e41ed9842a4ad52cdb5b87df, type: 3}
m_Name:
m_EditorClassIdentifier:
outerRadius: 1
innerRadius: 0
width: 80
height: 20
cellPrefab: {fileID: 1839775916168536, guid: 900341537233caf489d432cff5440dd3, type: 2}
--- !u!4 &1056054509
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1056054507}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1060029827 --- !u!1001 &1060029827
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9320,7 +9365,7 @@ RectTransform: ...@@ -9320,7 +9365,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 580, y: 90}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1194642868 --- !u!114 &1194642868
MonoBehaviour: MonoBehaviour:
...@@ -10038,7 +10083,7 @@ GameObject: ...@@ -10038,7 +10083,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!114 &1243551244 --- !u!114 &1243551244
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -16496,7 +16541,7 @@ RectTransform: ...@@ -16496,7 +16541,7 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20} m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
......
...@@ -17,6 +17,8 @@ public class CIVGameManager : MonoBehaviour { ...@@ -17,6 +17,8 @@ public class CIVGameManager : MonoBehaviour {
// Use this for initialization // Use this for initialization
void Start() { void Start() {
innerRadius = outerRadius * Mathf.Sqrt(3.0f) / 2; innerRadius = outerRadius * Mathf.Sqrt(3.0f) / 2;
_cells = new GameObject[width, height];
DrawMap();
} }
// Update is called once per frame // Update is called once per frame
...@@ -30,7 +32,7 @@ public class CIVGameManager : MonoBehaviour { ...@@ -30,7 +32,7 @@ public class CIVGameManager : MonoBehaviour {
{ {
for (int j = 0; j < height; j++) for (int j = 0; j < height; j++)
{ {
Vector3 pos = new Vector3(2 * i * innerRadius, -j * outerRadius * 1.5f); Vector3 pos = new Vector3(2 * i * innerRadius, -0.05f, -j * outerRadius * 1.5f);
if (j % 2 != 0) if (j % 2 != 0)
{ {
pos.x -= innerRadius; pos.x -= innerRadius;
......
fileFormatVersion: 2
guid: 7e00ac4430b211b4992dbfe702a49536
folderAsset: yes
timeCreated: 1518212165
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -554,7 +554,7 @@ PlayerSettings: ...@@ -554,7 +554,7 @@ PlayerSettings:
scriptingBackend: {} scriptingBackend: {}
incrementalIl2cppBuild: {} incrementalIl2cppBuild: {}
additionalIl2CppArgs: additionalIl2CppArgs:
scriptingRuntimeVersion: 0 scriptingRuntimeVersion: 1
apiCompatibilityLevelPerPlatform: {} apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1 m_RenderingPath: 1
m_MobileRenderingPath: 1 m_MobileRenderingPath: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment