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

Merge branch 'Development2' into GraphicsComponent-refactor

Browse source
This commit is contained in:
SergoDobro 2024-08-18 13:05:09 +03:00 • committed by GitHub
commit 8e66435fe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AnimationsFileCreator/Program.cs
View file

@ -1,13 +1,11 @@
using DangerousD.GameCore.Graphics; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using NativeFileDialogSharp; using NativeFileDialogSharp;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection.Metadata; using System.Reflection.Metadata;
using Zofo.GameCore.ZoFo_grafics; using ZoFo.GameCore.Graphics;
namespace AnimationsFileCreator namespace AnimationsFileCreator
{ {
class Program class Program

2
ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs
View file

@ -12,7 +12,9 @@ namespace ZoFo.GameCore.GameObjects.Entities
{ {
//public override GraphicsComponent graphicsComponent { get; } = new GraphicsComponent(new List<string> { "тут пишите название анимации" }, "сдублируйте " + //public override GraphicsComponent graphicsComponent { get; } = new GraphicsComponent(new List<string> { "тут пишите название анимации" }, "сдублируйте " +
public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_idle_rotate_weapon" }, "player_idle_rotate_weapon"); public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_idle_rotate_weapon" }, "player_idle_rotate_weapon");
public EntittyForAnimationTests(Vector2 position) : base(position) public EntittyForAnimationTests(Vector2 position) : base(position)
{ {
graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0,16*12, 16 * 16); graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0,16*12, 16 * 16);

1
ZoFo/GameCore/Server.cs
View file

@ -128,6 +128,7 @@ namespace ZoFo.GameCore
AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(0, 0))); AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(0, 0)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(740, 140))); AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(740, 140)));
AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(140, 440))); AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(140, 440)));
AppManager.Instance.server.RegisterGameObject(new Ammo(new Vector2(240, 440)));
} }
/// <summary> /// <summary>