Skip to content

Code/rina s/npc example - #47

Open
MSnihurska wants to merge 65 commits into
FitiLsan:code/rina-marina/base-npcfrom
MSnihurska:Code/rina-s/npc-example
Open

Code/rina s/npc example#47
MSnihurska wants to merge 65 commits into
FitiLsan:code/rina-marina/base-npcfrom
MSnihurska:Code/rina-s/npc-example

Conversation

@MSnihurska

@MSnihurska MSnihurska commented Jun 3, 2020

Copy link
Copy Markdown
Contributor

Scene: ITickTest
Folders: To_Refactoring

  • BaseNPC for base scripts & interface
  • Example for example cylinder

To do:

  • Make BaseNpcStruct

MSnihurska and others added 30 commits April 15, 2020 13:54
add task to quest ID4
add dialog- quest  cache
added questsTask cache in QuestRepository
added dialog task filtration in Dialogue Generation
DialogGeneretion start when start dialogue with npc.
Quest Indicators - Done;
EventManager => Services
fix
add events for initialize and open journal
move Events folder to Services
 DialogueAnswerButton  change to IPointerClickHandler
QuestIndicator   updating change to event - QuestUpdated
some errors fixed
{
_context.RabbitModel.IsDead = true;
Debug.Log("You killed a bunny! You monster!");
_context.RabbitModel.Rabbit.GetComponent<Renderer>().material.color = Color.red;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Закешировать

@@ -28,7 +28,12 @@ public void OnAwake()
var RabbitData = Data.RabbitData;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

с маленькой буквы

@@ -0,0 +1,8 @@
namespace BeastHunter
{
public interface IDoSmth

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Что за сокращение

var rabbitBehaviour = trigger as RabbitBehaviour;
rabbitBehaviour.OnTakeDamageHandler += TakeDamage;
rabbitBehaviour.Stats = _context.RabbitModel.RabbitData.RabbitStruct.Stats;
Debug.Log("ActivateRabbit");

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

убрать

{
//_context.RabbitModels.CurrentHealth -= damage.damage;
_context.RabbitModel.CurrentHealth -= damage.PhysicalDamage;
Debug.Log("Rabbit got " + damage.PhysicalDamage + " damage");

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

убрать


namespace BeastHunter
{
public class IOModel : NpcModel

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seald

using System.Collections.Generic;
using UnityEngine;

public class MakeDo : MonoBehaviour

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seald

{
public GameObject target;

void Start()

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

пустой метод

namespace BeastHunter
{
public enum BodyParts
{

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нумерация

@@ -6,7 +6,122 @@ namespace BeastHunter
[CreateAssetMenu(fileName = "NewCloth", menuName = "CreateCloth/New", order = 0)]
public class ClothItem : BaseItem

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seald

ProdavecBurrito and others added 15 commits June 10, 2020 15:56
…eplay' into Code/rina-s/npc-example

# Conflicts:
#	.vs/VanHelsing/v16/Server/sqlite3/storage.ide
#	Assets/Plugins/Editor.meta
#	Assets/Resources/Items.meta
#	Assets/Scenes/CombatTest/CombatTest.unity
#	Assets/Scripts/ContextTest/MVC/Rabbit/RabbitData.cs
#	Assets/Scripts/Contexts/GameContext.cs
#	Assets/Scripts/Controllers/BaseControllers/MainControllers.cs
#	Assets/Scripts/Data/Data.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/To_Refactoring/BaseNPC.meta
#	Assets/Scripts/To_Refactoring/Character/Weapons.meta
#	Assets/Scripts/To_Refactoring/Example.meta
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants