Commit e0c39c5a authored by redsuncore's avatar redsuncore

JediKnight Sample added

제다이 나이트를 1플레이어가 생산가능하도록 테스트코드. 생산/배치/전투/승리 구현
parent 2059eb23
...@@ -8,7 +8,7 @@ TextureImporter: ...@@ -8,7 +8,7 @@ TextureImporter:
serializedVersion: 4 serializedVersion: 4
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 0
sRGBTexture: 1 sRGBTexture: 1
linearTexture: 0 linearTexture: 0
fadeOut: 0 fadeOut: 0
...@@ -34,13 +34,13 @@ TextureImporter: ...@@ -34,13 +34,13 @@ TextureImporter:
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -1
wrapU: -1 wrapU: 1
wrapV: -1 wrapV: 1
wrapW: -1 wrapW: -1
nPOTScale: 1 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 0 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
...@@ -48,9 +48,9 @@ TextureImporter: ...@@ -48,9 +48,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0 textureType: 8
textureShape: 1 textureShape: 1
maxTextureSizeSet: 0 maxTextureSizeSet: 0
compressionQualitySet: 0 compressionQualitySet: 0
...@@ -66,6 +66,26 @@ TextureImporter: ...@@ -66,6 +66,26 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
- buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
......
...@@ -270,7 +270,7 @@ RectTransform: ...@@ -270,7 +270,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.000015258789, y: 0} m_AnchoredPosition: {x: 0.000015258789, y: 0.000015258789}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &42516959 --- !u!114 &42516959
...@@ -3708,7 +3708,7 @@ MonoBehaviour: ...@@ -3708,7 +3708,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1218335426} m_TargetGraphic: {fileID: 1218335426}
m_HandleRect: {fileID: 1218335425} m_HandleRect: {fileID: 1218335425}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 0
m_Size: 0.99999994 m_Size: 0.99999994
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
......
...@@ -16,7 +16,7 @@ public class CIVGameManager : MonoBehaviour, IView { ...@@ -16,7 +16,7 @@ public class CIVGameManager : MonoBehaviour, IView {
public static Sprite[] DistrictSprites => districtSprites; public static Sprite[] DistrictSprites => districtSprites;
private static Sprite[] districtSprites; private static Sprite[] districtSprites;
public enum UnitSprite { None, Pioneer } public enum UnitSprite { None, Pioneer, JediKnight}
public static Sprite[] UnitSprites => unitSprites; public static Sprite[] UnitSprites => unitSprites;
private static Sprite[] unitSprites; private static Sprite[] unitSprites;
...@@ -258,6 +258,10 @@ public class CIVGameManager : MonoBehaviour, IView { ...@@ -258,6 +258,10 @@ public class CIVGameManager : MonoBehaviour, IView {
labnum = Convert.ToInt32(game.PlayerInTurn.Labor); labnum = Convert.ToInt32(game.PlayerInTurn.Labor);
technum = 0; // not Implemented technum = 0; // not Implemented
ultnum = 0; //not Implemented ultnum = 0; //not Implemented
//test Code
mPresenter.Game.PlayerInTurn.AdditionalAvailableProduction.Add(CivModel.Common.JediKnightProductionFactory.Instance);
ButtonSetup(); ButtonSetup();
} }
......
...@@ -63,6 +63,7 @@ public class ManagementUIController : MonoBehaviour { ...@@ -63,6 +63,7 @@ public class ManagementUIController : MonoBehaviour {
} }
SQlist.Clear(); SQlist.Clear();
facList = mPresenter.AvailableProduction; facList = mPresenter.AvailableProduction;
Debug.Log(mPresenter.AvailableProduction + " " + mPresenter.AvailableProduction.Count);
Debug.Log("facList : " + facList.Count); Debug.Log("facList : " + facList.Count);
Debug.Log("SelectList Updated"); Debug.Log("SelectList Updated");
foreach (IProductionFactory fac in facList) foreach (IProductionFactory fac in facList)
......
...@@ -114,6 +114,7 @@ public class TilePrefab : MonoBehaviour { ...@@ -114,6 +114,7 @@ public class TilePrefab : MonoBehaviour {
} }
public void DrawUnit(string unit) public void DrawUnit(string unit)
{ {
Debug.Log(">>>>>>>>>>>>>>>>>>"+unit);
CIVGameManager.UnitSprite us = CIVGameManager.UnitSprite.None; CIVGameManager.UnitSprite us = CIVGameManager.UnitSprite.None;
Enum.TryParse(unit, out us); Enum.TryParse(unit, out us);
unitSprite = CIVGameManager.UnitSprites[(int)us]; unitSprite = CIVGameManager.UnitSprites[(int)us];
......
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