progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'livingEntitiesVlad'

Browse source
This commit is contained in:
N4K 2023-08-18 05:51:35 +03:00
commit c46c2dceb4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DangerousD/Content/map.tmx
View file

@ -66,13 +66,10 @@
<point/> <point/>
</object> </object>
</objectgroup> </objectgroup>
<<<<<<< HEAD
=======
<objectgroup id="2" name="Слой объектов 1" class="LivingEntities.Monsters.Slime"> <objectgroup id="2" name="Слой объектов 1" class="LivingEntities.Monsters.Slime">
<object id="5" x="1" y="100"> <object id="5" x="1" y="100">
<point/> <point/>
</object> </object>
</objectgroup> </objectgroup>
>>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
</map> </map>

2
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -205,7 +205,7 @@ namespace DangerousD.GameCore
case GameState.Lobby: case GameState.Lobby:
break; break;
case GameState.Game: case GameState.Game:
GameManager.mapManager.LoadLevel("lvl"); GameManager.mapManager.LoadLevel("map");
GameManager.FindBorders(); GameManager.FindBorders();
break; break;
case GameState.Death: case GameState.Death: