Camera Works! by 진석

4dc08df9 · Seungwon Ju · c7c2d4cd · 4dc08df9 · 4dc08df9 · 4dc08df9
Commit 4dc08df9 authored Jul 05, 2018 by Seungwon Ju
19 changed files
--- a/Assets/Prefabs/hextile.prefab
+++ b/Assets/Prefabs/hextile.prefab
--- a/Assets/Prefabs/unit.prefab
+++ b/Assets/Prefabs/unit.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!1001 &100100000
 Prefab:
  m_ObjectHideFlags: 1
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications: []
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 0}
  m_RootGameObject: {fileID: 1994173042382988}
  m_IsPrefabParent: 1
 --- !u!1 &1994173042382988
 GameObject:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  serializedVersion: 5
  m_Component:
  - component: {fileID: 4164349117385164}
  - component: {fileID: 33675704233413142}
  - component: {fileID: 23430415915558628}
  - component: {fileID: 95116768080365986}
  - component: {fileID: 114555728656525668}
  m_Layer: 0
  m_Name: unit
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!4 &4164349117385164
 Transform:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1994173042382988}
  m_LocalRotation: {x: -0.00000003774895, y: 0, z: -0, w: 1}
  m_LocalPosition: {x: -0, y: 1.4732, z: -0.1016}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &23430415915558628
 MeshRenderer:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1994173042382988}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RenderingLayerMask: 4294967295
  m_Materials:
  - {fileID: 2100000, guid: b30586820caa1de47b0e0ed1aa73c608, type: 3}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
  m_StaticBatchRoot: {fileID: 0}
  m_ProbeAnchor: {fileID: 0}
  m_LightProbeVolumeOverride: {fileID: 0}
  m_ScaleInLightmap: 1
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
  m_StitchLightmapSeams: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
 --- !u!33 &33675704233413142
 MeshFilter:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1994173042382988}
  m_Mesh: {fileID: 4300000, guid: b30586820caa1de47b0e0ed1aa73c608, type: 3}
 --- !u!95 &95116768080365986
 Animator:
  serializedVersion: 3
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1994173042382988}
  m_Enabled: 1
  m_Avatar: {fileID: 9000000, guid: b30586820caa1de47b0e0ed1aa73c608, type: 3}
  m_Controller: {fileID: 0}
  m_CullingMode: 0
  m_UpdateMode: 0
  m_ApplyRootMotion: 0
  m_LinearVelocityBlending: 0
  m_WarningMessage: 
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &114555728656525668
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1994173042382988}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 67add831fd3c2384b9a1363aa1aa1331, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/unit.prefab.meta
+++ b/Assets/Prefabs/unit.prefab.meta
 fileFormatVersion: 2
 guid: d799813cc5de24e418535494923a7dfa
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Scenes/Game.unity
+++ b/Assets/Scenes/Game.unity
--- a/Assets/Script/Camera.meta
+++ b/Assets/Script/Camera.meta
 fileFormatVersion: 2
 guid: d601adbb6e8d5a9468817a2f13b391b1
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Script/Camera/CameraControl.cs
+++ b/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);
+	        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.Translate(0, 0, 10);
+        {
-		}
+            Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, MaxHeight, Camera.main.transform.position.z);
-		if (Input.mousePosition.x > screen_width - boundary) {
+        }
-			Camera.main.transform.Translate(2 * speed * Time.deltaTime, 0, 0);
-		}
+        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) {
+            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);
-		if (Input.mousePosition.y < 0 + boundary) {
+        }
-			Camera.main.transform.Translate(0, -speed * Time.deltaTime * Mathf.Sqrt(3), -speed * Time.deltaTime);
+        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) {
+            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);
+    }
 }
--- a/Assets/Script/Camera/CameraControl.cs.meta
+++ b/Assets/Script/Camera/CameraControl.cs.meta
 fileFormatVersion: 2
 guid: 21f14036de063904c8c26fe4b57a2cfe
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Script/GameManager.cs.meta
+++ b/Assets/Script/GameManager.cs.meta
 fileFormatVersion: 2
 guid: 21eefa2ef0518bc4891057f3f8916cb5
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences:
  - HextilePrefab: {instanceID: 0}
  - UnitPrefab: {instanceID: 0}
  - rend: {instanceID: 0}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Script/Tile/HexTile.cs
+++ b/Assets/Script/Tile/HexTile.cs
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using CivModel;
 public class HexTile : MonoBehaviour

--- a/Assets/Script/UI.meta
+++ b/Assets/Script/UI.meta
 fileFormatVersion: 2
-guid: a9a4dbc34bad0dc4eb1302dc4646729d
+guid: d9c203eade061484ea0fe0f615a83955
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}

--- a/Assets/Script/UI/UIManager.cs
+++ b/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);
+        }
+    }
+}
--- a/Assets/Script/UI/UIManager.cs.meta
+++ b/Assets/Script/UI/UIManager.cs.meta
+fileFormatVersion: 2
+guid: 022491211cd651a4c92de28671373b2b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Script/Unit.meta
+++ b/Assets/Script/Unit.meta
 fileFormatVersion: 2
 guid: d8d29a913d13fb5479a01f02c8d8ef1f
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Script/Unit/Unit.cs
+++ b/Assets/Script/Unit/Unit.cs
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using CivModel;
 public class Unit : MonoBehaviour {

--- a/Assets/Script/Unit/Unit.cs.meta
+++ b/Assets/Script/Unit/Unit.cs.meta
 fileFormatVersion: 2
 guid: 67add831fd3c2384b9a1363aa1aa1331
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Script/Unit/UnitEnum.cs
+++ b/Assets/Script/Unit/UnitEnum.cs
-public enum Units {
+using CivModel;
+public enum Units {
 	HwanPioneer,
 	HwanBrainwashedEmuKnight,
 	HwanDecentralizedMilitary,

--- a/Assets/Script/Unit/UnitEnum.cs.meta
+++ b/Assets/Script/Unit/UnitEnum.cs.meta
 fileFormatVersion: 2
 guid: 3fb7438be05923441b2781bca534ac74
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!310 &1
 UnityConnectSettings:
  m_ObjectHideFlags: 0
  m_Enabled: 0
  m_TestMode: 0
  m_TestEventUrl: 
  m_TestConfigUrl: 
  m_TestInitMode: 0
  CrashReportingSettings:
    m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
    m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
    m_Enabled: 0
    m_CaptureEditorExceptions: 1
  UnityPurchasingSettings:
    m_Enabled: 0
    m_TestMode: 0
  UnityAnalyticsSettings:
    m_Enabled: 1
    m_InitializeOnStartup: 1
    m_TestMode: 0
    m_TestEventUrl: 
    m_TestConfigUrl: 
  UnityAdsSettings:
    m_Enabled: 0
    m_InitializeOnStartup: 1
    m_TestMode: 0
    m_IosGameId: 
    m_AndroidGameId: 
    m_GameIds:
      AndroidPlayer: 
      iPhonePlayer: 
    m_GameId: 
  PerformanceReportingSettings:
    m_Enabled: 0