Camera Works! by 진석

Assets/Script/Camera/CameraControl.cs

@@ -9,29 +9,67 @@ public class CameraControl : MonoBehaviour {
 
 	private int screen_height = Screen.height;
 	private int screen_width = Screen.width;
+
+    int MaxHeight = 30; //최대 높이
+    int MinHeight = 10; //최소 높이
+
 	// Use this for initialization
 	void Start () {
 	}
 	
 	// Update is called once per frame
 	void Update () {
-		if (Input.GetAxis("Mouse ScrollWheel") < 0 && Camera.main.transform.position.y < 150) { // 150 은 추후에 적절히 작은 값으로 수정 필요.
+		if (Input.GetAxis("Mouse ScrollWheel") < 0 && Camera.main.transform.position.y < MaxHeight) {
 	        Camera.main.transform.Translate(0, 0, -10);
         }
-		if (Input.GetAxis("Mouse ScrollWheel") > 0 && Camera.main.transform.position.y > 15) {
+        else if (Camera.main.transform.position.y > MaxHeight)
+        {
+            Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, MaxHeight, Camera.main.transform.position.z);
+        }
+
+        if (Input.GetAxis("Mouse ScrollWheel") > 0 && Camera.main.transform.position.y > MinHeight) {
             Camera.main.transform.Translate(0, 0, 10);
         }
+        else if (Camera.main.transform.position.y < MinHeight)
+        {
+            Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, MinHeight, Camera.main.transform.position.z);
+        }
+
+
+
         if (Input.mousePosition.x > screen_width - boundary) {
-			Camera.main.transform.Translate(2 * speed * Time.deltaTime, 0, 0);
+            if (Camera.main.transform.position.x <= 220)
+                Camera.main.transform.Translate(2 * speed * Time.deltaTime * Mathf.Abs(Input.mousePosition.x - (screen_width - boundary)) * (float)0.015 , 0, 0);
+
+            else
+                Camera.main.transform.position = new Vector3(5, Camera.main.transform.position.y, Camera.main.transform.position.z);
         }
+
 		if (Input.mousePosition.x < 0 + boundary) {
-			Camera.main.transform.Translate(-2 * speed * Time.deltaTime, 0, 0);
+            if(Camera.main.transform.position.x >= 0)
+			    Camera.main.transform.Translate(-2 * speed * Time.deltaTime * Mathf.Abs(Input.mousePosition.x - boundary) * (float)0.015 , 0, 0);
+
+            else
+                Camera.main.transform.position = new Vector3(215, Camera.main.transform.position.y, Camera.main.transform.position.z);
         }
+
+
+
+
 		if (Input.mousePosition.y > screen_height - boundary) {
-			Camera.main.transform.Translate(0 , speed * Time.deltaTime * Mathf.Sqrt(3), speed * Time.deltaTime);
+            if(Camera.main.transform.position.z < -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3))
+			    Camera.main.transform.Translate(0 , speed * Time.deltaTime * Mathf.Sqrt(3) * Mathf.Abs(Input.mousePosition.y - (screen_height - boundary)) * (float)0.015, speed * Time.deltaTime * Mathf.Abs(Input.mousePosition.y - (screen_height - boundary)) * (float)0.015);
         }
+        else if(Camera.main.transform.position.z > -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3))
+            Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3));
+
+
+
         if (Input.mousePosition.y < 0 + boundary) {
-			Camera.main.transform.Translate(0, -speed * Time.deltaTime * Mathf.Sqrt(3), -speed * Time.deltaTime);
+            if (Camera.main.transform.position.z > -120)
+                Camera.main.transform.Translate(0, -speed * Time.deltaTime * Mathf.Sqrt(3) * Mathf.Abs(Input.mousePosition.y - boundary) * (float)0.015, -speed * Time.deltaTime * Mathf.Abs(Input.mousePosition.y - boundary) * (float)0.015);
         }
+        else if(Camera.main.transform.position.z < -120)
+            Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -120);
     }
 }

Assets/Script/Tile/HexTile.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using CivModel;
 
 
 public class HexTile : MonoBehaviour

Assets/Script/UI.meta

 fileFormatVersion: 2
-guid: a9a4dbc34bad0dc4eb1302dc4646729d
+guid: d9c203eade061484ea0fe0f615a83955
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Script/UI/UIManager.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using CivModel;
+
+public class UIManager : MonoBehaviour
+{
+    GameObject mapUI;
+
+    // Use this for initialization
+    void Start()
+    {
+        mapUI = GameObject.Find("MapUI");
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+
+    public void onClick(GameObject go)
+    {
+        if (go.activeSelf == false)
+        {
+            go.SetActive(true);
+            if (go != mapUI) mapUI.SetActive(false);
+        }
+        else
+        {
+            go.SetActive(false);
+            if (go != mapUI) mapUI.SetActive(true);
+        }
+    }
+}

Assets/Script/UI/UIManager.cs.meta

+fileFormatVersion: 2
+guid: 022491211cd651a4c92de28671373b2b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Unit/Unit.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using CivModel;
 
 
 public class Unit : MonoBehaviour {

Assets/Script/Unit/UnitEnum.cs

-public enum Units {
+using CivModel;
+
+public enum Units {
 	HwanPioneer,
 	HwanBrainwashedEmuKnight,
 	HwanDecentralizedMilitary,