Skip to content

Commit

Permalink
- Some scripts moved to right place
Browse files Browse the repository at this point in the history
  • Loading branch information
dpeter99 committed Dec 21, 2015
1 parent 025b9c4 commit 0386a7c
Show file tree
Hide file tree
Showing 123 changed files with 1,059 additions and 1,490 deletions.
23 changes: 12 additions & 11 deletions Assets/AssetsLoading/AssetsLoader.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine;
using CivMars;

public class AssetsLoader : MonoBehaviour
namespace CivMarsEngine.Registry
{

public void CallRegister()
public class AssetsLoader : MonoBehaviour
{


CivMarsInit.Init();
public void CallRegister()
{

}

}
CivMarsInit.Init();

}

}

}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions Assets/TileMap.meta → Assets/BasicUtility/TileMap.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
using UnityEngine;
using System.Collections;

public class Surface : Tiled {

/*
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
*/
}
using UnityEngine;
using System.Collections;

public class Surface : Tiled {

/*
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
*/
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions Assets/Behaviour.cs

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 39 additions & 36 deletions Assets/CivMarsInit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,55 @@
using System.Text;
using UnityEngine;

[Mod]
public static class CivMarsInit
namespace CivMars
{
public const string ModSpace = "CivMars";
public const string BlockSpace = "CivMars.block";
public const string ItemSpace = "CivMars.item";

[ModInit]
public static void Init()
[Mod]
public static class CivMarsInit
{
GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot());
GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate());
GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane());
GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe());
//GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick());
//GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate());
//GameRegystry.RegisterItem("CivMars.Roof", new Roof());
//GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit());
//GameRegystry.RegisterItem("CuvMars.Piston", new Piston());
//GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank());

GameObject[] goBuild = Resources.LoadAll<GameObject>("Buildings");

foreach (GameObject item in goBuild)
{
IRegystratabe a = item.GetComponent<IRegystratabe>();
public const string ModSpace = "CivMars";
public const string BlockSpace = "CivMars.block";
public const string ItemSpace = "CivMars.item";

if (a != null)
[ModInit]
public static void Init()
{
GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot());
GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate());
GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane());
GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe());
//GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick());
//GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate());
//GameRegystry.RegisterItem("CivMars.Roof", new Roof());
//GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit());
//GameRegystry.RegisterItem("CuvMars.Piston", new Piston());
//GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank());

GameObject[] goBuild = Resources.LoadAll<GameObject>("Buildings");

foreach (GameObject item in goBuild)
{
a.Regystrate();
}
}
IRegystratabe a = item.GetComponent<IRegystratabe>();

GameObject[] goTiles = Resources.LoadAll<GameObject>("GeneratedTiles");
if (a != null)
{
a.Regystrate();
}
}

foreach (GameObject item in goTiles)
{
IRegystratabe a = item.GetComponent<IRegystratabe>();
GameObject[] goTiles = Resources.LoadAll<GameObject>("GeneratedTiles");

if (a != null)
foreach (GameObject item in goTiles)
{
a.Regystrate();
IRegystratabe a = item.GetComponent<IRegystratabe>();

if (a != null)
{
a.Regystrate();
}
}
}
}


}
}

}
13 changes: 0 additions & 13 deletions Assets/Class1.cs

This file was deleted.

Loading

0 comments on commit 0386a7c

Please sign in to comment.