Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat. 도시별 경계 색깔 다르게 하기 #1

Merged
merged 1 commit into from
Oct 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Assets/0_Scenes/Loading.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Assets/0_Scenes/Title.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Assets/1_Scripts/2_World/City.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
1 change: 0 additions & 1 deletion Assets/1_Scripts/2_World/MapSetter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions Assets/1_Scripts/Hex/HexCell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class HexCell : MonoBehaviour {
public RectTransform uiRect;

public HexGridChunk chunk;
public Material[] materials;

public int Index { get; set; }

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading