Merge pull request #1 from LeeHann/hanna

feat. 도시별 경계 색깔 다르게 하기
LeeHann · Oct 24, 2022 · 0452094 · 0452094
2 parents bf72f00 + 37a448d
commit 0452094
Show file tree

Hide file tree

Showing 547 changed files with 20 additions and 110,482 deletions.
diff --git a/Assets/0_Scenes/Loading.unity b/Assets/0_Scenes/Loading.unity
@@ -771,14 +771,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0.33750427, b: 0.3584906, a: 1}
+ m_Color: {r: 0, g: 0.03773582, b: 0.011788026, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
  m_PersistentCalls:
  m_Calls: []
- m_Sprite: {fileID: -2198753249273810656, guid: 157cbc340d2b7e64ab85168e80e95550, type: 3}
+ m_Sprite: {fileID: 0}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1

diff --git a/Assets/0_Scenes/Title.unity b/Assets/0_Scenes/Title.unity
@@ -4509,15 +4509,15 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
- m_Color: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 0.6509804}
+ m_Color: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 0.6509804}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
  m_PersistentCalls:
  m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: b70aaa740141e9b418427744016a2063, type: 3}
+ m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4

diff --git a/Assets/1_Scripts/2_World/City.cs b/Assets/1_Scripts/2_World/City.cs
@@ -33,6 +33,9 @@ public class City : MonoBehaviour
  public void AddCell(HexCell cell)
  {
  cells.Add(cell);
+
+ cell.chunk.features.walls.meshRenderer.material
+ = cell.materials[(int)sit];
  cell.Walled = true;
  }
 }
diff --git a/Assets/1_Scripts/2_World/MapSetter.cs b/Assets/1_Scripts/2_World/MapSetter.cs
@@ -120,7 +120,6 @@ public HexCell SearchValidCityPoint()
 
  public City SetCityProperty(HexCell cell, bool isPlayer)
  {
- // City city = isPlayer ? new PlayerCity() : new AICity();
  City city = isPlayer ? new GameObject(name:"PlayerCity").AddComponent<PlayerCity>() 
  : new GameObject(name:"AICity").AddComponent<AICity>();
  int random = Random.Range(0, sits.Count);

diff --git a/Assets/1_Scripts/Hex/HexCell.cs b/Assets/1_Scripts/Hex/HexCell.cs
@@ -9,6 +9,7 @@ public class HexCell : MonoBehaviour {
  public RectTransform uiRect;
 
  public HexGridChunk chunk;
+ public Material[] materials;
 
  public int Index { get; set; }
 

diff --git a/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props.meta b/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props.meta
diff --git a/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Changelog.txt b/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Changelog.txt
diff --git a/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Changelog.txt.meta b/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Changelog.txt.meta
diff --git a/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Material.meta b/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Material.meta
diff --git a/...eTools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Fire.mat b/...eTools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Fire.mat
diff --git a/...s/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Fire.mat.meta b/...s/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Fire.mat.meta
diff --git a/...eTools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Glow.mat b/...eTools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Glow.mat
diff --git a/...s/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Glow.mat.meta b/...s/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Glow.mat.meta
diff --git a/...Tools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Spark.mat b/...Tools/Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Spark.mat
diff --git a/.../Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Spark.mat.meta b/.../Cainos/Pixel Art Platformer - Village Props/Material/MT FX Particle Torch Spark.mat.meta
diff --git a/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Prefab.meta b/Assets/AssetStoreTools/Cainos/Pixel Art Platformer - Village Props/Prefab.meta