Skip to content

Commit

Permalink
Last commit?
Browse files Browse the repository at this point in the history
  • Loading branch information
VictorTirado committed Jun 1, 2021
1 parent 4b21f9b commit 595ac39
Show file tree
Hide file tree
Showing 17 changed files with 2,757 additions and 2,593 deletions.
4 changes: 2 additions & 2 deletions RTSGame/Assets/Resources/Animators/Enemy_1.controller
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9234694
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -320,7 +320,7 @@ AnimatorStateMachine:
m_Position: {x: 70, y: 560, z: 0}
- serializedVersion: 1
m_State: {fileID: -3422782500995079083}
m_Position: {x: 30, y: 420, z: 0}
m_Position: {x: -90, y: 420, z: 0}
- serializedVersion: 1
m_State: {fileID: -858419336174434022}
m_Position: {x: 350, y: 420, z: 0}
Expand Down
10 changes: 5 additions & 5 deletions RTSGame/Assets/Resources/Animators/Enemy_melee.controller
Original file line number Diff line number Diff line change
Expand Up @@ -197,19 +197,19 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: isWalking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: isShooting
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 9100000}
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -320,7 +320,7 @@ AnimatorStateMachine:
m_Position: {x: 70, y: 560, z: 0}
- serializedVersion: 1
m_State: {fileID: -3422782500995079083}
m_Position: {x: 30, y: 420, z: 0}
m_Position: {x: -160, y: 420, z: 0}
- serializedVersion: 1
m_State: {fileID: -858419336174434022}
m_Position: {x: 350, y: 420, z: 0}
Expand Down
32 changes: 27 additions & 5 deletions RTSGame/Assets/Resources/Prefabs/People/Sazed.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_Constraints: 14
m_CollisionDetection: 0
--- !u!65 &500807010
BoxCollider:
Expand All @@ -285,7 +285,7 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 214273049801139910}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.49, y: 2.03, z: 0.31}
Expand Down Expand Up @@ -317,14 +317,36 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b042bae8f8b82e498ba80959039a249, type: 3}
m_Name:
m_EditorClassIdentifier:
work_type: 0
work_type: 7
gender: 2
HP: 100
alive: 1
agent: {fileID: 0}
update_work: 0
m_Animator: {fileID: 0}
has_to_move: 0
--- !u!195 &2037573342
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 214273049801139910}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 0.5
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 2
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!1001 &214273049801254150
PrefabInstance:
m_ObjectHideFlags: 0
Expand All @@ -342,15 +364,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 495996, guid: 5ad43ee3802caa04ab0928a13c462a56, type: 3}
propertyPath: m_LocalPosition.x
value: -6.9827023
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 495996, guid: 5ad43ee3802caa04ab0928a13c462a56, type: 3}
propertyPath: m_LocalPosition.y
value: 0.188
objectReference: {fileID: 0}
- target: {fileID: 495996, guid: 5ad43ee3802caa04ab0928a13c462a56, type: 3}
propertyPath: m_LocalPosition.z
value: 22.715601
value: 17.5
objectReference: {fileID: 0}
- target: {fileID: 495996, guid: 5ad43ee3802caa04ab0928a13c462a56, type: 3}
propertyPath: m_LocalRotation.x
Expand Down
25 changes: 24 additions & 1 deletion RTSGame/Assets/Resources/Prefabs/People/Vin.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -3571,6 +3571,7 @@ GameObject:
- component: {fileID: 1878474821}
- component: {fileID: 1878474819}
- component: {fileID: 1878474820}
- component: {fileID: 1647726753}
m_Layer: 0
m_Name: Vin
m_TagString: Commander
Expand Down Expand Up @@ -3666,7 +3667,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b042bae8f8b82e498ba80959039a249, type: 3}
m_Name:
m_EditorClassIdentifier:
work_type: 0
work_type: 7
gender: 2
HP: 100
alive: 1
Expand All @@ -3689,6 +3690,28 @@ MonoBehaviour:
cm: {fileID: 0}
m_Animator: {fileID: 0}
timer_1: 0
--- !u!195 &1647726753
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 164680606104928925}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 0.5
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 2
m_BaseOffset: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!1 &164680606104929323
GameObject:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion RTSGame/Assets/Resources/Skybox/Skybox_02.mat
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotation: 9.792722
- _Rotation: 8.451904
- _RotationSpeed: 1
- _Rotationn: 1
- _SkyboxExtended: 1
Expand Down
Binary file added RTSGame/Assets/Resources/right_final2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions RTSGame/Assets/Resources/right_final2.png.meta

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

Loading

0 comments on commit 595ac39

Please sign in to comment.