Skip to content

Pavel/Code/Character/Fuel #114

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
PavelArbuzov wants to merge 4 commits into
base: ctr-test/september/game-look
Choose a base branch
from
Open

Pavel/Code/Character/Fuel #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f61d1cc
Pavel
PavelArbuzov Mar 22, 2021
32235ee
Merge remote-tracking branch 'upstream/ctr-test/september/game-look'
PavelArbuzov Mar 22, 2021
9644fc4
Pavel
PavelArbuzov Mar 22, 2021
d742ed9
Merge branch 'master' of https://github.com/PavelArbuzov/Snake-box
PavelArbuzov Mar 22, 2021
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
3 changes: 2 additions & 1 deletion Assets/Resources/Data/Character/CharacterData.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ MonoBehaviour:
Armor: 100
RegenerationArmor: 1
SpeedRotation: 8.43
Speed: 11
Speed: 3
Damage: 1
SlowBlockSpeed: 1.5
RamCooldown: 0.1
AngularSpeed: 2.5
Fuel: 100
Curve:
serializedVersion: 2
m_Curve:
Expand Down
230 changes: 230 additions & 0 deletions Assets/Scenes/Game3.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,41 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &446149988 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1887151977354699975, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
m_PrefabInstance: {fileID: 830460918}
m_PrefabAsset: {fileID: 0}
--- !u!65 &446149992
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446149988}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.31, y: 6.3031793, z: 0.39}
m_Center: {x: 0.00901972, y: 3.1515896, z: 0.03231659}
--- !u!54 &446149993
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446149988}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &487732384
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2045,6 +2080,41 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &548572869 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6314077825784720386, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
m_PrefabInstance: {fileID: 830460918}
m_PrefabAsset: {fileID: 0}
--- !u!54 &548572873
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 548572869}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &548572874
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 548572869}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.0132478, y: 1.4922683, z: 1.3009132}
m_Center: {x: 0.0000053942204, y: -0.014782578, z: 0.030665014}
--- !u!1 &561871846
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2799,6 +2869,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81987080822962906, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 139252378680254626, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -2999,11 +3074,21 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1887151977354699975, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1983300598120061600, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2014294320404827544, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2249296156997620030, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -3114,6 +3199,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4873430992714694756, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5441377833488583149, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -3199,6 +3289,16 @@ PrefabInstance:
propertyPath: m_Size.z
value: 0.49
objectReference: {fileID: 0}
- target: {fileID: 6287144367354779512, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6314077825784720386, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6507021202779390834, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand All @@ -3214,6 +3314,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6702631304122245949, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6714482899782334029, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand All @@ -3224,6 +3329,21 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7115692534074498885, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7116112704552941069, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7451296836920866915, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7579020437003168117, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -3259,6 +3379,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8147473666892222394, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8251362010459446936, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
propertyPath: m_StaticEditorFlags
Expand Down Expand Up @@ -4691,6 +4816,41 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &893001405 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2014294320404827544, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
m_PrefabInstance: {fileID: 830460918}
m_PrefabAsset: {fileID: 0}
--- !u!65 &893001409
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 893001405}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.92, y: 0.8273164, z: 1.7423443}
m_Center: {x: -0.042156145, y: 0.4136582, z: 0.0000038146973}
--- !u!54 &893001410
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 893001405}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &893956916
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9314,6 +9474,41 @@ Transform:
m_Father: {fileID: 1799266319}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1733972536 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7115692534074498885, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
m_PrefabInstance: {fileID: 830460918}
m_PrefabAsset: {fileID: 0}
--- !u!54 &1733972540
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733972536}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &1733972541
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733972536}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.1466339, y: 0.7394343, z: 1.0160253}
m_Center: {x: 0.06724797, y: 0.36918005, z: -0.029716857}
--- !u!1 &1734012474 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4132456823511000085, guid: a71fb2586b449a543b8ca607f4537b63,
Expand Down Expand Up @@ -9991,6 +10186,41 @@ Transform:
m_Father: {fileID: 682858159}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1837133182 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6702631304122245949, guid: a71fb2586b449a543b8ca607f4537b63,
type: 3}
m_PrefabInstance: {fileID: 830460918}
m_PrefabAsset: {fileID: 0}
--- !u!54 &1837133186
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837133182}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &1837133187
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837133182}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.987667, y: 1.9229115, z: 1.3321792}
m_Center: {x: -0.000881076, y: 0.9568595, z: 0.004993469}
--- !u!1 &1855084698
GameObject:
m_ObjectHideFlags: 0
Expand Down
8 changes: 5 additions & 3 deletions Assets/Scripts/Data/Character/CharacterData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ public sealed class CharacterData : ScriptableObject
public float RegenerationArmor; //регенирация силового поля
public float SpeedRotation;// скорость поворота
public float Speed;// скорость
public float Damage;
public float Damage;//урон
public float SlowBlockSpeed;
public float RamCooldown;
public float AngularSpeed;
public AnimationCurve Curve;
public float AngularSpeed;//скорость поворота
public float Fuel;//топливо
public float FuelLessSpeed;//скорость расхода
public AnimationCurve Curve;//кривая скорости поворота
}
}
4 changes: 3 additions & 1 deletion Assets/Scripts/Model/Character/BaseCharacter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ public abstract class BaseCharacter : MonoBehaviour
protected float _currentSnakeHp;//Текущее кол-во Здоровья
protected float _damage;//урон
protected float _speed;//скорость
protected float _angularSpeed;
protected float _angularSpeed;
protected Fuel _fuel;
private Direction _direction = Direction.Up;
protected AnimationCurve _animation;
public GameObject ParticleOnDie;
public Image hpbar;


#endregion


Expand Down
Loading