Skip to content

Code/mihail lab/butterfly npc #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Plintocrow wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Code/mihail lab/butterfly npc #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
73ff6c3
Merge pull request #3 from FitiLsan/master
MSnihurska Apr 15, 2020
e72e34a
Merge pull request #8 from FitiLsan/MVP/April
MSnihurska May 8, 2020
74b1f0b
Merge pull request #10 from FitiLsan/code/rina-marina/base-npc
MSnihurska May 15, 2020
b6e8f9c
Added ITakeDamage to rabbit
MSnihurska May 21, 2020
0f4bc5b
Merge branch 'NPC-test' into Code/rina-s/rabbit-killable
MSnihurska May 21, 2020
8f8cb1a
Updated rabbit scripts. Made rabbit killable
MSnihurska May 28, 2020
e287909
Updated rabbit scripts. Made rabbit killable
MSnihurska May 28, 2020
ddbc188
Merge pull request #44 from RinaSatsu/Code/rina-s/rabbit-killable
GameLineEntertainment May 29, 2020
10c25e4
create ButterflyData and ButterflyStruct
Plintocrow Oct 23, 2020
7b7e77c
debug
Plintocrow Oct 23, 2020
a2d8807
create butterfly prefab
Plintocrow Oct 23, 2020
1449cb6
completed butterfly
Plintocrow Oct 23, 2020
d4ff6c4
added to the enum
Plintocrow Oct 23, 2020
411af30
made the butterfly script look like a rabbit script
Plintocrow Oct 23, 2020
d4a4cfc
created ButerflyData
Plintocrow Oct 23, 2020
5f730e8
Working Update Butterfly
Plintocrow Oct 23, 2020
9c9533a
working butterfly
Plintocrow Oct 23, 2020
2d32ca7
delete comments
Plintocrow Oct 23, 2020
2b4fbdf
own logic of for a butterfly
Plintocrow Oct 27, 2020
d6ccf44
Update ButterflyData.cs
Plintocrow Oct 27, 2020
4a0e0f0
cleaning the code
Plintocrow Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .vs/VanHelsing/v16/Server/sqlite3/storage.ide
View file
Open in desktop
Binary file not shown.
436 changes: 436 additions & 0 deletions Assets/Resources/Butterfly.prefab
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Assets/Resources/Butterfly.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Resources/Data/ButterflyData.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: d1a52c3041a0fce4690d25ee2ae8c118, type: 3}
m_Name: ButterflyData
m_EditorClassIdentifier:
ButterflyStruct:
MoveSpeed: 10
Edge: {x: 441, y: -10, z: 591}
Prefab: {fileID: 6917954868609689773, guid: 51073b157933efe4db1adf2e600d384c,
type: 3}
8 changes: 8 additions & 0 deletions Assets/Resources/Data/ButterflyData.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Resources/Data/CharacterData.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MonoBehaviour:
_instanceLayer: 8
_characterAnimator: {fileID: 9100000, guid: 71768c8e0d54fb34396989829cda6ca1,
type: 2}
_instantiatePosition: {x: 489, y: 20, z: 480}
_instantiatePosition: {x: 490, y: 2, z: 480}
_instantiateDirection: -40
_rigitbodyMass: 1
_rigitbodyDrag: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/Resources/Data/Data.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1b31b7596ae2b4a4ab972d36383fc2fb, type: 3}
m_Name: Data
m_EditorClassIdentifier:
_butterflyDataPath: ButterflyData
_sphereDataPath: SphereData
_characterDataPath: CharacterData
_startDialogueDataPath: StartDialogueData
_dialogueSystemDataPath: DialogueSystemData
_giantMudCrabDataPath: GiantMudCrabData
_rabbitDataPath: RabbitData
_feastPath: Weapons/FeastWeapon
_jacketPath: Clothes/Jacket
_cameraDataPath: CameraData
7 changes: 6 additions & 1 deletion Assets/Resources/Data/RabbitData.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ceb64af4fd66c94396e973252896988, type: 3}
m_Script: {fileID: 11500000, guid: 9dea14c6996633c46a662ee466e83b72, type: 3}
m_Name: RabbitData
m_EditorClassIdentifier:
RabbitStruct:
Stats:
_physicalPower: 0
_physicalDamageResistance: 0
_stunProbabilityResistance: 0
MaxHealth: 10
RunningRadius: 10
MoveSpeed: 0.5
JumpHeight: 2
ViewRadius: 3
ViewAngle: 100
CanIdle: 1
IsDead: 0
Prefab: {fileID: 6850293822335465738, guid: 635352c46b7621145938ab221e63e0d1,
type: 3}
2 changes: 1 addition & 1 deletion Assets/Resources/Data/RabbitData.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 29 additions & 1 deletion Assets/Resources/Rabbit.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ GameObject:
- component: {fileID: 6850293822335465743}
- component: {fileID: 6850293822335465736}
- component: {fileID: 6850293822335465740}
- component: {fileID: 6617356163059557074}
- component: {fileID: 2897616843028160248}
m_Layer: 0
m_Name: Rabbit
m_TagString: Rabbit
Expand All @@ -213,7 +215,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6850293822335465738}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalPosition: {x: 490, y: 0.5, z: 490}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 6850293822305603345}
Expand Down Expand Up @@ -294,6 +296,32 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!114 &6617356163059557074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6850293822335465738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 34b41166a398c3542822a812e40941be, type: 3}
m_Name:
m_EditorClassIdentifier:
_type: 8
--- !u!135 &2897616843028160248
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6850293822335465738}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 0
serializedVersion: 2
m_Radius: 0.65
m_Center: {x: 0, y: 0.15, z: 0.1}
--- !u!1 &6850293822786565282
GameObject:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scenes/CombatTest/CombatTest.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12847,7 +12847,7 @@ GameObject:
- component: {fileID: 1597750629}
- component: {fileID: 1597750628}
- component: {fileID: 1597750627}
m_Layer: 0
m_Layer: 9
m_Name: Terrain
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
Loading