Skip to content

C
civilization-iii
Commit ab5a79fd authored by Seungwon Ju's avatar Seungwon Ju
Browse files
Options

Merge Conflict Solved

parents 4dc08df9 f1b5d1d5
Hide whitespace changes
Inline Side-by-side
Showing with 837 additions and 700 deletions
.DS_Store
View file @ ab5a79fd
No preview for this file type
Assets/.DS_Store
View file @ ab5a79fd
No preview for this file type
Assets/Scenes/Game.unity
View file @ ab5a79fd
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Script/UI/UIManager.cs
View file @ ab5a79fd
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using CivModel; using CivModel;
...@@ -32,4 +32,4 @@ public class UIManager : MonoBehaviour ...@@ -32,4 +32,4 @@ public class UIManager : MonoBehaviour
if (go != mapUI) mapUI.SetActive(true); if (go != mapUI) mapUI.SetActive(true);
} }
} }
} }
\ No newline at end of file
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