Skip to content

Commit

Permalink
updt
Browse files Browse the repository at this point in the history
  • Loading branch information
@sharbelf
sharbelf committed Jul 15, 2013
1 parent 3997bd9 commit c483ce6
Show file tree
Hide file tree
Showing 100 changed files with 217 additions and 143 deletions.
1 change: 1 addition & 0 deletions Assembly-CSharp-Editor-vs.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Editor\Editor.cs" />
<None Include="Assets\Data\history1.txt" />
<Reference Include="UnityEditor.Graphs">
<HintPath>C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.Graphs.dll</HintPath>
</Reference>
Expand Down
1 change: 1 addition & 0 deletions Assembly-CSharp-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Editor\Editor.cs" />
<None Include="Assets\Data\history1.txt" />
<Reference Include="UnityEditor.Graphs">
<HintPath>C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.Graphs.dll</HintPath>
</Reference>
Expand Down
225 changes: 112 additions & 113 deletions Assembly-CSharp-vs.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0BE8E511-D506-A1D0-E67D-923A5ED26D39}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>Assembly-CSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0BE8E511-D506-A1D0-E67D-923A5ED26D39}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
<AssemblyName>Assembly-CSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PHYSICS;ENABLE_TERRAIN;ENABLE_CACHING;ENABLE_SUBSTANCE;ENABLE_GENERICS;ENABLE_CLOTH;ENABLE_MOVIES;ENABLE_AUDIO;ENABLE_WWW;ENABLE_SHADOWS;ENABLE_DUCK_TYPING;UNITY_4_1_5;UNITY_4_1;ENABLE_PROFILER;UNITY_EDITOR</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System" />
<Reference Include="System.XML" />
<Reference Include="System.Core" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="UnityEngine">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Scene Fight\Script\BoxAction.cs" />
<Compile Include="Assets\Scene Fight\Script\BoxCharController.cs" />
<Compile Include="Assets\Scene Fight\Script\BoxEnemiesController.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonAction.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonActionController.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonUseSkill.cs" />
<Compile Include="Assets\Scene Fight\Script\CharFightAnimation.cs" />
<Compile Include="Assets\Scene Fight\Script\CharFightController.cs" />
<Compile Include="Assets\Scene Fight\Script\CharacterText.cs" />
<Compile Include="Assets\Scene Fight\Script\FightController.cs" />
<Compile Include="Assets\Scene GameMap\Chat\ChatController.cs" />
<Compile Include="Assets\Scene GameMap\Chat\ChatOption.cs" />
<Compile Include="Assets\Scene GameMap\Hud\HudGameController.cs" />
<Compile Include="Assets\Scene GameMap\Script\ActionCharacter.cs" />
<Compile Include="Assets\Scene GameMap\Script\ActionTile.cs" />
<Compile Include="Assets\Scene GameMap\Script\CharacterInventory.cs" />
<Compile Include="Assets\Scene GameMap\Script\CharacterMovement.cs" />
<Compile Include="Assets\Scene GameMap\Script\GameCharacterController.cs" />
<Compile Include="Assets\Scene GameMap\Script\GameController.cs" />
<Compile Include="Assets\Scene GameMap\Script\ItemBase.cs" />
<Compile Include="Assets\Scene GameMap\Script\Map.cs" />
<Compile Include="Assets\Scene GameMap\Script\MapGenerator.cs" />
<Compile Include="Assets\Scene GameMap\Script\SpriteAnimation.cs" />
<Compile Include="Assets\Scene GameMap\Script\TileChanges.cs" />
<Compile Include="Assets\Scene Inventory\Script\ButtonInventory.cs" />
<Compile Include="Assets\Scene Inventory\Script\InventoryController.cs" />
<Compile Include="Assets\Scene Inventory\Script\ItemDetailController.cs" />
<Compile Include="Assets\Scene Inventory\Script\MenuController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\BoxChangeCharacter.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonBackEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonChangeEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonConfirmChangeEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonRemoveEquipped.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharDetailController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharEquippedController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharItemDetailController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharacterSelector.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ItemSlotController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\WindowCharacterController.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ButonUseItem.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ButtonDeleteItem.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ItemSlotSlider.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ListItensController.cs" />
<Compile Include="Assets\Scene Inventory\WindowSave\SaveController.cs" />
<Compile Include="Assets\Scene Inventory\WindowSave\SaveItemController.cs" />
<Compile Include="Assets\Scene Inventory\windowQuest\QuestController.cs" />
<Compile Include="Assets\Scene Inventory\windowQuest\QuestItemController.cs" />
<Compile Include="Assets\Scene Store\Script\StoreBuy.cs" />
<Compile Include="Assets\Scene Store\Script\StoreSell.cs" />
<Compile Include="Assets\Scene WorldMap\Script\HudController.cs" />
<Compile Include="Assets\Scene WorldMap\Script\WorldMapController.cs" />
<Compile Include="Assets\Scene WorldMap\Script\WorldMapLocation.cs" />
<Compile Include="Assets\Scripts\Core\DatabaseLoader.cs" />
<Compile Include="Assets\Scripts\Game\Enums.cs" />
<Compile Include="Assets\Scripts\Game\Structs.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Assets\Scripts\GUI\ButtonChangeScene.cs" />
<Compile Include="Assets\Scripts\GUI\ListItens.cs" />
<Compile Include="Assets\Scripts\Game\GameAttributes.cs" />
<Compile Include="Assets\Scripts\Game\GameCharacter.cs" />
<Compile Include="Assets\Scripts\Game\GameCity.cs" />
<Compile Include="Assets\Scripts\Game\GameItem.cs" />
<Compile Include="Assets\Scripts\Game\GameMonster.cs" />
<Compile Include="Assets\Scripts\Game\GameNpc.cs" />
<Compile Include="Assets\Scripts\Game\GamePlayer.cs" />
<Compile Include="Assets\Scripts\Game\GameQuest.cs" />
<Compile Include="Assets\Scripts\Game\GameQuestItem.cs" />
<Compile Include="Assets\Scripts\Game\GameSaveItem.cs" />
<Compile Include="Assets\Scripts\Game\GameSkill.cs" />
<Compile Include="Assets\Scripts\Global\GlobalCharacter.cs" />
<Compile Include="Assets\Scripts\Global\GlobalItens.cs" />
<Compile Include="Assets\Scripts\Global\GlobalMap.cs" />
<Compile Include="Assets\Scripts\Global\GlobalQuests.cs" />
<Compile Include="Assets\Scripts\Global\GlobalWorldMap.cs" />
<Compile Include="Assets\Scripts\Utils\SimpleJSON.cs" />
<Compile Include="Assets\Scene Fight\Script\BoxAction.cs" />
<Compile Include="Assets\Scene Fight\Script\BoxCharController.cs" />
<Compile Include="Assets\Scene Fight\Script\BoxEnemiesController.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonAction.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonActionController.cs" />
<Compile Include="Assets\Scene Fight\Script\ButtonUseSkill.cs" />
<Compile Include="Assets\Scene Fight\Script\CharFightAnimation.cs" />
<Compile Include="Assets\Scene Fight\Script\CharFightController.cs" />
<Compile Include="Assets\Scene Fight\Script\CharacterText.cs" />
<Compile Include="Assets\Scene Fight\Script\FightController.cs" />
<Compile Include="Assets\Scene GameMap\Chat\ChatController.cs" />
<Compile Include="Assets\Scene GameMap\Chat\ChatOption.cs" />
<Compile Include="Assets\Scene GameMap\Hud\HudGameController.cs" />
<Compile Include="Assets\Scene GameMap\Script\ActionCharacter.cs" />
<Compile Include="Assets\Scene GameMap\Script\ActionTile.cs" />
<Compile Include="Assets\Scene GameMap\Script\CharacterInventory.cs" />
<Compile Include="Assets\Scene GameMap\Script\CharacterMovement.cs" />
<Compile Include="Assets\Scene GameMap\Script\GameCharacterController.cs" />
<Compile Include="Assets\Scene GameMap\Script\GameController.cs" />
<Compile Include="Assets\Scene GameMap\Script\ItemBase.cs" />
<Compile Include="Assets\Scene GameMap\Script\Map.cs" />
<Compile Include="Assets\Scene GameMap\Script\MapGenerator.cs" />
<Compile Include="Assets\Scene GameMap\Script\SpriteAnimation.cs" />
<Compile Include="Assets\Scene GameMap\Script\TileChanges.cs" />
<Compile Include="Assets\Scene Inventory\Script\ButtonInventory.cs" />
<Compile Include="Assets\Scene Inventory\Script\InventoryController.cs" />
<Compile Include="Assets\Scene Inventory\Script\ItemDetailController.cs" />
<Compile Include="Assets\Scene Inventory\Script\MenuController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\BoxChangeCharacter.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonBackEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonChangeEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonConfirmChangeEquipment.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ButtonRemoveEquipped.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharDetailController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharEquippedController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharItemDetailController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\CharacterSelector.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\ItemSlotController.cs" />
<Compile Include="Assets\Scene Inventory\WindowCharacter\WindowCharacterController.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ButonUseItem.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ButtonDeleteItem.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ItemSlotSlider.cs" />
<Compile Include="Assets\Scene Inventory\WindowItem\ListItensController.cs" />
<Compile Include="Assets\Scene Inventory\WindowSave\SaveController.cs" />
<Compile Include="Assets\Scene Inventory\WindowSave\SaveItemController.cs" />
<Compile Include="Assets\Scene Inventory\windowQuest\QuestController.cs" />
<Compile Include="Assets\Scene Inventory\windowQuest\QuestItemController.cs" />
<Compile Include="Assets\Scene Store\Script\StoreBuy.cs" />
<Compile Include="Assets\Scene Store\Script\StoreSell.cs" />
<Compile Include="Assets\Scene WorldMap\Script\HudController.cs" />
<Compile Include="Assets\Scene WorldMap\Script\WorldMapController.cs" />
<Compile Include="Assets\Scene WorldMap\Script\WorldMapLocation.cs" />
<Compile Include="Assets\Scripts\Core\DatabaseLoader.cs" />
<Compile Include="Assets\Scripts\GUI\ButtonChangeScene.cs" />
<Compile Include="Assets\Scripts\GUI\ListItens.cs" />
<Compile Include="Assets\Scripts\Game\Enums.cs" />
<Compile Include="Assets\Scripts\Game\GameAttributes.cs" />
<Compile Include="Assets\Scripts\Game\GameCharacter.cs" />
<Compile Include="Assets\Scripts\Game\GameCity.cs" />
<Compile Include="Assets\Scripts\Game\GameItem.cs" />
<Compile Include="Assets\Scripts\Game\GameMonster.cs" />
<Compile Include="Assets\Scripts\Game\GameNpc.cs" />
<Compile Include="Assets\Scripts\Game\GamePlayer.cs" />
<Compile Include="Assets\Scripts\Game\GameQuest.cs" />
<Compile Include="Assets\Scripts\Game\GameQuestItem.cs" />
<Compile Include="Assets\Scripts\Game\GameSaveItem.cs" />
<Compile Include="Assets\Scripts\Game\GameSkill.cs" />
<Compile Include="Assets\Scripts\Game\Structs.cs" />
<Compile Include="Assets\Scripts\Global\GlobalCharacter.cs" />
<Compile Include="Assets\Scripts\Global\GlobalItens.cs" />
<Compile Include="Assets\Scripts\Global\GlobalMap.cs" />
<Compile Include="Assets\Scripts\Global\GlobalQuests.cs" />
<Compile Include="Assets\Scripts\Global\GlobalWorldMap.cs" />
<Compile Include="Assets\Scripts\Utils\SimpleJSON.cs" />
<None Include="Assets\Data\history1.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand All @@ -130,4 +128,5 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
2 changes: 2 additions & 0 deletions Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<Compile Include="Assets\Scripts\Core\DatabaseLoader.cs" />
<Compile Include="Assets\Scripts\GUI\ButtonChangeScene.cs" />
<Compile Include="Assets\Scripts\GUI\ListItens.cs" />
<Compile Include="Assets\Scripts\Game\Enums.cs" />
<Compile Include="Assets\Scripts\Game\GameAttributes.cs" />
<Compile Include="Assets\Scripts\Game\GameCharacter.cs" />
<Compile Include="Assets\Scripts\Game\GameCity.cs" />
Expand All @@ -117,6 +118,7 @@
<Compile Include="Assets\Scripts\Global\GlobalQuests.cs" />
<Compile Include="Assets\Scripts\Global\GlobalWorldMap.cs" />
<Compile Include="Assets\Scripts\Utils\SimpleJSON.cs" />
<None Include="Assets\Data\history1.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Binary file added Assets/Assets/char12x32.mat
View file
Binary file not shown.
Binary file added Assets/Assets/her10x30.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Assets/hero12x36.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions Assets/Data/history1.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
-- Sempre o NPC tem uma primeira conversa onde conta historia
-- Após isso sempre tem alguma frase padrão perguntando se o que ele pediu ja foi feito
-- Aparece menu com opção para repetir o texto, fazer alguma pergunta extra ou concluir a missao
-- Ao clicar em concluir missao, verica se a fase está comprida e altera o texto




-Ações
-- Ir de um ponto ao outro do mapa em busca de pistas
-- Cada lugar gasta um certo tempo para chegar, e um tempo no lugar
-- Alguns lugares podem ser mais perigosos, ou ter emboscadas
-- Pessoas podem bloquear você de chegar em certos lugares
-- encontros aleatorios no mapa enquanto caminha pela cidade


-NPC
--Dono do Museu

--- Fala sobre seus problemas
--- Ao ajuda-lo, ele diz detalhes sobre o funcionamento do local
--- (ao contar sobre ter descoberto o ladrao) Diz que precisa de mais informações a repeito (?)
--- (ao contar sobre a familia que deseja rouba-lo) Diz que tem um plano para pegar a familia
--- (ao contar que fez o planejado) Diz quer irá fazer a parte dele



--Familia Roubada



--Ladrões

-Secundarios
--Funcionarios do museu
--Comerciantes de itens
--Visitantes
--Compradores de itens
--Rainha
--Guardas Realeza
--Guardas


-RANDOM
-- Nomes das pessoas
-- Locais no mapa
-- Lugar das pessoas
-- Pistas (?)
-- Item
-- Emboscadas




http://www.4shared.com/office/w4tI0y3g/Edgar_Alan_Poe_-_Obras_Quase_C.htm
http://en.wikipedia.org/wiki/Sheridan_Le_Fanu
http://en.wikipedia.org/wiki/Robert_Louis_Stevenson
https://en.wikipedia.org/wiki/Gothic_fiction
https://en.wikipedia.org/wiki/George_W._M._Reynolds
28 changes: 26 additions & 2 deletions Assets/Data/quest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,32 @@
{
"id": "qi0000",
"npc": "ch00000",
"text": "",
"done": 0,
"action": [
{
"type": "Talk",
"value": "string",
},
{
"type": "Talk",
"x": 0,
"y": 0,
"speed": 0,
},
{
"type": "Animation",
"x1": 0,
"x2": 0,
"speed": 0,
},
],
"response": {
"GoToItem": [
{"npc": "np0001", "value": 1}
],
"GiveItem": "it0001",
"Fight": "ft0001",
"End": true,
},
}
]
}
Expand Down
Binary file modified Assets/Scene GameMap/GameCharacter.prefab
View file
Binary file not shown.
Binary file modified Assets/Scene GameMap/GameMap.unity
View file
Binary file not shown.
Binary file added Assets/Scene GameMap/Hero12x32.prefab
View file
Binary file not shown.
16 changes: 7 additions & 9 deletions Assets/Scripts/Game/GameNpc.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
using UnityEngine;
using System.Collections;

public class GameNpc : MonoBehaviour {
public class GameNpc : GameCharacter {

// Use this for initialization
void Start () {

}

// Update is called once per frame
void Update () {




public GameNpc()
{

}
}
Loading

0 comments on commit c483ce6

Please sign in to comment.