Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

mettre tout le stock dans la scene Game

Browse Source 
problème :

- la scène game n'avait pas toute les dernières features créées

solution :

- ajouté LevelManager, boutons d'ajout d'unités, labels de resources
This commit is contained in:
Felix Boucher 2023-06-30 16:30:50 -04:00
parent e08f59d8a3
commit f682972e0c
11 changed files with 4185 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Prefabs/UI/BuyableUnitsView/GameObjectPlacementButton.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6291074865804911655
CanvasRenderer:
@ -118,7 +118,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 50}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652127959947831
CanvasRenderer:
@ -298,7 +298,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652128235033335
CanvasRenderer:
@ -387,7 +387,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652129260736054
CanvasRenderer:
@ -444,7 +444,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -535,7 +535,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 18, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4100105604388853805
@ -615,7 +615,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 18, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4741796700644535934
@ -695,7 +695,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8779984673163102974
CanvasRenderer:
@ -752,7 +752,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -842,7 +842,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6975577339164885956
CanvasRenderer:
@ -918,7 +918,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &651097448331064931
CanvasRenderer:
@ -996,7 +996,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 1}
--- !u!114 &6181393584221671793
MonoBehaviour:
@ -1061,7 +1061,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7720087843626117068
CanvasRenderer:
@ -1118,7 +1118,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -1209,7 +1209,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 18, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5791630491435835906

30
Assets/Prefabs/UI/BuyableUnitsView/TilePlacementButton.prefab
View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 15, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6291074865804911655
CanvasRenderer:
@ -118,7 +118,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 50}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652127959947831
CanvasRenderer:
@ -298,7 +298,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652128235033335
CanvasRenderer:
@ -387,7 +387,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652129260736054
CanvasRenderer:
@ -444,7 +444,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -535,7 +535,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 19.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4100105604388853805
@ -615,7 +615,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 19.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4741796700644535934
@ -695,7 +695,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8779984673163102974
CanvasRenderer:
@ -752,7 +752,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -842,7 +842,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 15, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6975577339164885956
CanvasRenderer:
@ -918,7 +918,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 15}
m_SizeDelta: {x: 15, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &651097448331064931
CanvasRenderer:
@ -996,7 +996,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 1}
--- !u!114 &6181393584221671793
MonoBehaviour:
@ -1061,7 +1061,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 15}
m_SizeDelta: {x: 24, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7720087843626117068
CanvasRenderer:
@ -1118,7 +1118,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 13.4
m_fontSize: 10.7
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@ -1209,7 +1209,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 22.5, y: 0}
m_AnchoredPosition: {x: 19.5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5791630491435835906

2157
Assets/Prefabs/baseArcher.prefab
View File

File diff suppressed because it is too large Load Diff

2866
Assets/Scenes/Game.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/LevelManager/LevelTile.cs
View File

@ -76,6 +76,7 @@ public abstract class LevelTile : TileBase, ILevelObject
}
public override void RefreshTile(Vector3Int position, ITilemap tilemap)
{
base.RefreshTile(position, tilemap);
if (!Application.isPlaying) return;
//this will check if tile was removed from tilemap
@ -83,7 +84,6 @@ public abstract class LevelTile : TileBase, ILevelObject
{
LevelManager.Instance.Remove(this);
}
base.RefreshTile(position, tilemap);
}
public virtual Dictionary<string, object> ToDictionary()
{

58
Assets/Tilemaps/LevelEditorPalette.prefab
View File

@ -87,11 +87,31 @@ Tilemap:
m_GameObject: {fileID: 5890485537825364348}
m_Enabled: 1
m_Tiles:
- first: {x: -1, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 4
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 0
- first: {x: 0, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 5
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 0
- first: {x: -1, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -101,7 +121,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -111,7 +131,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 2
m_TileSpriteIndex: 2
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -121,7 +141,17 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 0
- first: {x: 1, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 6
m_TileSpriteIndex: 4294967295
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -137,7 +167,17 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: ccca3e050cb082b45af0a099790463f6, type: 3}
- m_RefCount: 1
@ -147,7 +187,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 21300000, guid: b85a4b2ec6433d04895612d791edc260, type: 3}
m_TileMatrixArray:
- m_RefCount: 4
- m_RefCount: 7
m_Data:
e00: 1
e01: 0
@ -166,13 +206,13 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 4
- m_RefCount: 7
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -1, y: 0, z: 0}
m_Size: {x: 2, y: 2, z: 1}
m_Origin: {x: -1, y: -1, z: 0}
m_Size: {x: 3, y: 3, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@ -241,7 +281,7 @@ TilemapRenderer:
m_Mode: 0
m_DetectChunkCullingBounds: 0
m_MaskInteraction: 0
--- !u!114 &2473294596980876743
--- !u!114 &4236727698057346379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

3
Assets/Tiles/Forest.asset
View File

@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: Forest
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3}
_isCollidable: 0
_yieldPrefab: {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3}
_yieldSpeed: 0.5
_yieldSpeed: 0.1
_randomPositionConfig: 0.5

19
Assets/Tiles/Meat.asset Normal file
View File

@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3}
m_Name: Meat
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: b1e6b8ebeb2e25f4f8c5de93a31dd6a2, type: 3}
_isCollidable: 0
_yieldPrefab: {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3}
_yieldSpeed: 0.1
_randomPositionConfig: 0.5

3
Assets/Tiles/Mountain.asset
View File

@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: Mountain
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3}
_isCollidable: 0
_yieldPrefab: {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3}
_yieldSpeed: 0.5
_yieldSpeed: 0.1
_randomPositionConfig: 0.5

2
Assets/Tiles/StickSpawner.asset
View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: 77a39e873655d3c4b93d0b7696397b83, type: 3}
_isCollidable: 1
_prefab: {fileID: 6962989255644195630, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
_prefab: {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
_spawnOnStart: 1
_spawnSpeed: 0
_spawnCounter: 0

3
ProjectSettings/TagManager.asset
View File

@ -41,6 +41,9 @@ TagManager:
-
-
m_SortingLayers:
- name: paysage
uniqueID: 436725303
locked: 0
- name: Default
uniqueID: 0
locked: 0