Skip to content

G
GalaxySmash
Commit f87de8d7 authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)
Browse files
Options

no message

parent 840b3c08
Show whitespace changes
Inline Side-by-side
Showing with 236 additions and 47 deletions
Assets/OSG Infinity Square Space/Player/Prefabs/Weapons/Destroyer Bullet.prefab
View file @ f87de8d7
...@@ -39,7 +39,7 @@ ParticleSystem: ...@@ -39,7 +39,7 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1077536390215216} m_GameObject: {fileID: 1077536390215216}
serializedVersion: 6 serializedVersion: 7
lengthInSec: 5 lengthInSec: 5
simulationSpeed: 2 simulationSpeed: 2
stopAction: 0 stopAction: 0
...@@ -1999,6 +1999,62 @@ ParticleSystem: ...@@ -1999,6 +1999,62 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -3375,19 +3431,20 @@ ParticleSystem: ...@@ -3375,19 +3431,20 @@ ParticleSystem:
range: {x: 0, y: 1} range: {x: 0, y: 1}
CollisionModule: CollisionModule:
enabled: 0 enabled: 0
serializedVersion: 3 serializedVersion: 4
type: 1 type: 1
collisionMode: 0 collisionMode: 0
colliderForce: 0 colliderForce: 0
multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSize: 0
multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByParticleSpeed: 0
multiplyColliderForceByCollisionAngle: 1 multiplyColliderForceByCollisionAngle: 1
plane0: {fileID: 0} m_Planes:
plane1: {fileID: 0} - {fileID: 0}
plane2: {fileID: 0} - {fileID: 0}
plane3: {fileID: 0} - {fileID: 0}
plane4: {fileID: 0} - {fileID: 0}
plane5: {fileID: 0} - {fileID: 0}
- {fileID: 0}
m_Dampen: m_Dampen:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
...@@ -3561,17 +3618,20 @@ ParticleSystem: ...@@ -3561,17 +3618,20 @@ ParticleSystem:
interiorCollisions: 1 interiorCollisions: 1
TriggerModule: TriggerModule:
enabled: 0 enabled: 0
collisionShape0: {fileID: 0} serializedVersion: 2
collisionShape1: {fileID: 0}
collisionShape2: {fileID: 0}
collisionShape3: {fileID: 0}
collisionShape4: {fileID: 0}
collisionShape5: {fileID: 0}
inside: 1 inside: 1
outside: 0 outside: 0
enter: 0 enter: 0
exit: 0 exit: 0
colliderQueryMode: 0
radiusScale: 1 radiusScale: 1
primitives:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
SubModule: SubModule:
serializedVersion: 2 serializedVersion: 2
enabled: 0 enabled: 0
...@@ -4526,6 +4586,7 @@ ParticleSystemRenderer: ...@@ -4526,6 +4586,7 @@ ParticleSystemRenderer:
m_LightProbeUsage: 0 m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -4568,6 +4629,8 @@ ParticleSystemRenderer: ...@@ -4568,6 +4629,8 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 00010304 m_VertexStreams: 00010304
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -4618,7 +4681,7 @@ CapsuleCollider: ...@@ -4618,7 +4681,7 @@ CapsuleCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
m_Radius: 1 m_Radius: 3
m_Height: 6 m_Height: 6
m_Direction: 2 m_Direction: 2
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
...@@ -4699,7 +4762,7 @@ ParticleSystem: ...@@ -4699,7 +4762,7 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1296868059012022} m_GameObject: {fileID: 1296868059012022}
serializedVersion: 6 serializedVersion: 7
lengthInSec: 5 lengthInSec: 5
simulationSpeed: 1 simulationSpeed: 1
stopAction: 0 stopAction: 0
...@@ -6722,6 +6785,62 @@ ParticleSystem: ...@@ -6722,6 +6785,62 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -8152,19 +8271,20 @@ ParticleSystem: ...@@ -8152,19 +8271,20 @@ ParticleSystem:
range: {x: 0, y: 1} range: {x: 0, y: 1}
CollisionModule: CollisionModule:
enabled: 0 enabled: 0
serializedVersion: 3 serializedVersion: 4
type: 0 type: 0
collisionMode: 0 collisionMode: 0
colliderForce: 0 colliderForce: 0
multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSize: 0
multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByParticleSpeed: 0
multiplyColliderForceByCollisionAngle: 1 multiplyColliderForceByCollisionAngle: 1
plane0: {fileID: 0} m_Planes:
plane1: {fileID: 0} - {fileID: 0}
plane2: {fileID: 0} - {fileID: 0}
plane3: {fileID: 0} - {fileID: 0}
plane4: {fileID: 0} - {fileID: 0}
plane5: {fileID: 0} - {fileID: 0}
- {fileID: 0}
m_Dampen: m_Dampen:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
...@@ -8338,17 +8458,20 @@ ParticleSystem: ...@@ -8338,17 +8458,20 @@ ParticleSystem:
interiorCollisions: 1 interiorCollisions: 1
TriggerModule: TriggerModule:
enabled: 0 enabled: 0
collisionShape0: {fileID: 0} serializedVersion: 2
collisionShape1: {fileID: 0}
collisionShape2: {fileID: 0}
collisionShape3: {fileID: 0}
collisionShape4: {fileID: 0}
collisionShape5: {fileID: 0}
inside: 1 inside: 1
outside: 0 outside: 0
enter: 0 enter: 0
exit: 0 exit: 0
colliderQueryMode: 0
radiusScale: 1 radiusScale: 1
primitives:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
SubModule: SubModule:
serializedVersion: 2 serializedVersion: 2
enabled: 0 enabled: 0
...@@ -9303,6 +9426,7 @@ ParticleSystemRenderer: ...@@ -9303,6 +9426,7 @@ ParticleSystemRenderer:
m_LightProbeUsage: 0 m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -9344,6 +9468,8 @@ ParticleSystemRenderer: ...@@ -9344,6 +9468,8 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 00010304 m_VertexStreams: 00010304
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
...@@ -9422,7 +9548,7 @@ ParticleSystem: ...@@ -9422,7 +9548,7 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4227769870727413559} m_GameObject: {fileID: 4227769870727413559}
serializedVersion: 6 serializedVersion: 7
lengthInSec: 5 lengthInSec: 5
simulationSpeed: 2 simulationSpeed: 2
stopAction: 0 stopAction: 0
...@@ -11382,6 +11508,62 @@ ParticleSystem: ...@@ -11382,6 +11508,62 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
LifetimeByEmitterSpeedModule:
enabled: 0
m_Curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.8
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.2
inSlope: -0.8
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule: ForceModule:
enabled: 0 enabled: 0
x: x:
...@@ -12758,19 +12940,20 @@ ParticleSystem: ...@@ -12758,19 +12940,20 @@ ParticleSystem:
range: {x: 0, y: 1} range: {x: 0, y: 1}
CollisionModule: CollisionModule:
enabled: 0 enabled: 0
serializedVersion: 3 serializedVersion: 4
type: 1 type: 1
collisionMode: 0 collisionMode: 0
colliderForce: 0 colliderForce: 0
multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSize: 0
multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByParticleSpeed: 0
multiplyColliderForceByCollisionAngle: 1 multiplyColliderForceByCollisionAngle: 1
plane0: {fileID: 0} m_Planes:
plane1: {fileID: 0} - {fileID: 0}
plane2: {fileID: 0} - {fileID: 0}
plane3: {fileID: 0} - {fileID: 0}
plane4: {fileID: 0} - {fileID: 0}
plane5: {fileID: 0} - {fileID: 0}
- {fileID: 0}
m_Dampen: m_Dampen:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
...@@ -12944,17 +13127,20 @@ ParticleSystem: ...@@ -12944,17 +13127,20 @@ ParticleSystem:
interiorCollisions: 1 interiorCollisions: 1
TriggerModule: TriggerModule:
enabled: 0 enabled: 0
collisionShape0: {fileID: 0} serializedVersion: 2
collisionShape1: {fileID: 0}
collisionShape2: {fileID: 0}
collisionShape3: {fileID: 0}
collisionShape4: {fileID: 0}
collisionShape5: {fileID: 0}
inside: 1 inside: 1
outside: 0 outside: 0
enter: 0 enter: 0
exit: 0 exit: 0
colliderQueryMode: 0
radiusScale: 1 radiusScale: 1
primitives:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
SubModule: SubModule:
serializedVersion: 2 serializedVersion: 2
enabled: 0 enabled: 0
...@@ -13909,6 +14095,7 @@ ParticleSystemRenderer: ...@@ -13909,6 +14095,7 @@ ParticleSystemRenderer:
m_LightProbeUsage: 0 m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -13951,6 +14138,8 @@ ParticleSystemRenderer: ...@@ -13951,6 +14138,8 @@ ParticleSystemRenderer:
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1 m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 00010304 m_VertexStreams: 00010304
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
......
Assets/OSG Infinity Square Space/Player/Prefabs/Weapons/Laser Bullet.prefab
View file @ f87de8d7
...@@ -43,7 +43,7 @@ CapsuleCollider: ...@@ -43,7 +43,7 @@ CapsuleCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
m_Radius: 2 m_Radius: 50
m_Height: 5 m_Height: 5
m_Direction: 2 m_Direction: 2
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
......
Assets/OSG Infinity Square Space/Player/Scripts/Controller.cs
View file @ f87de8d7
...@@ -804,7 +804,7 @@ public class Controller : MonoBehaviour ...@@ -804,7 +804,7 @@ public class Controller : MonoBehaviour
//} //}
if (Interface.instance.skillSelectionManager.skills[3].CanUse()) if (Interface.instance.skillSelectionManager.skills[3].CanUse())
{ {
Interface.instance.skillSelectionManager.skills[3].CountDown(3f); Interface.instance.skillSelectionManager.skills[3].CountDown(0.5f);
default_attacking = false; default_attacking = false;
homeMissile.LaunchMissle(); homeMissile.LaunchMissle();
...@@ -974,7 +974,7 @@ public class Controller : MonoBehaviour ...@@ -974,7 +974,7 @@ public class Controller : MonoBehaviour
{ {
if (Interface.instance.skillSelectionManager.skills[6].CanUse()) if (Interface.instance.skillSelectionManager.skills[6].CanUse())
{ {
Interface.instance.skillSelectionManager.skills[6].CountDown(4f); Interface.instance.skillSelectionManager.skills[6].CountDown(3f);
default_attacking = false; default_attacking = false;
//----------- //-----------
...@@ -1122,7 +1122,7 @@ public class Controller : MonoBehaviour ...@@ -1122,7 +1122,7 @@ public class Controller : MonoBehaviour
CheckRemainAmmo(8); CheckRemainAmmo(8);
default_attacking = false; default_attacking = false;
homeMissile.LaunchMissle(); homeMissile.LaunchMissle();
Interface.instance.skillSelectionManager.skills[8].CountDown(2f); Interface.instance.skillSelectionManager.skills[8].CountDown(1f);
yield break; yield break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment