Compare commits
No commits in common. "a0c10fec3e4c4f76d157e0bdcdc40486d0053906" and "1773acb3ef11ccdaee31f9d45c50ebae0902b3ee" have entirely different histories.
a0c10fec3e
...
1773acb3ef
File diff suppressed because one or more lines are too long
|
@ -1,108 +0,0 @@
|
||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!21 &2100000
|
|
||||||
Material:
|
|
||||||
serializedVersion: 8
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: trail
|
|
||||||
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
m_Parent: {fileID: 0}
|
|
||||||
m_ModifiedSerializedProperties: 0
|
|
||||||
m_ValidKeywords:
|
|
||||||
- _ALPHAPREMULTIPLY_ON
|
|
||||||
- _COLORADDSUBDIFF_ON
|
|
||||||
m_InvalidKeywords:
|
|
||||||
- _FLIPBOOKBLENDING_OFF
|
|
||||||
m_LightmapFlags: 0
|
|
||||||
m_EnableInstancingVariants: 0
|
|
||||||
m_DoubleSidedGI: 0
|
|
||||||
m_CustomRenderQueue: 3000
|
|
||||||
stringTagMap:
|
|
||||||
RenderType: Transparent
|
|
||||||
disabledShaderPasses:
|
|
||||||
- GRABPASS
|
|
||||||
m_LockedProperties:
|
|
||||||
m_SavedProperties:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_TexEnvs:
|
|
||||||
- _AlphaTex:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _BaseMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _BumpMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _EmissionMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _MainTex:
|
|
||||||
m_Texture: {fileID: 2800000, guid: 10c49fcd9c64421db7c0133e61e55f97, type: 3}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _MaskTex:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _MetallicGlossMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
- _NormalMap:
|
|
||||||
m_Texture: {fileID: 0}
|
|
||||||
m_Scale: {x: 1, y: 1}
|
|
||||||
m_Offset: {x: 0, y: 0}
|
|
||||||
m_Ints: []
|
|
||||||
m_Floats:
|
|
||||||
- _AlphaClip: 0
|
|
||||||
- _AlphaToMask: 0
|
|
||||||
- _Blend: 0
|
|
||||||
- _BlendOp: 0
|
|
||||||
- _BumpScale: 1
|
|
||||||
- _CameraFadingEnabled: 0
|
|
||||||
- _CameraFarFadeDistance: 2
|
|
||||||
- _CameraNearFadeDistance: 1
|
|
||||||
- _ColorMode: 1
|
|
||||||
- _Cull: 2
|
|
||||||
- _Cutoff: 0.5
|
|
||||||
- _DistortionBlend: 0.5
|
|
||||||
- _DistortionEnabled: 0
|
|
||||||
- _DistortionStrength: 1
|
|
||||||
- _DistortionStrengthScaled: 0.1
|
|
||||||
- _DstBlend: 10
|
|
||||||
- _DstBlendAlpha: 0
|
|
||||||
- _EmissionEnabled: 0
|
|
||||||
- _EnableExternalAlpha: 0
|
|
||||||
- _FlipbookBlending: 0
|
|
||||||
- _FlipbookMode: 0
|
|
||||||
- _Glossiness: 0.5
|
|
||||||
- _LightingEnabled: 0
|
|
||||||
- _Metallic: 0
|
|
||||||
- _Mode: 3
|
|
||||||
- _QueueOffset: 0
|
|
||||||
- _SoftParticlesEnabled: 0
|
|
||||||
- _SoftParticlesFarFadeDistance: 1
|
|
||||||
- _SoftParticlesNearFadeDistance: 0
|
|
||||||
- _SrcBlend: 1
|
|
||||||
- _SrcBlendAlpha: 1
|
|
||||||
- _Surface: 0
|
|
||||||
- _ZWrite: 0
|
|
||||||
m_Colors:
|
|
||||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
|
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
|
||||||
- _Flip: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
m_BuildTextureStacks: []
|
|
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 0c2a3048d122d8c48807f52a864f5bee
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 2100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -163,8 +163,8 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 10
|
time: 0
|
||||||
value: 0
|
value: 0.14138794
|
||||||
inSlope: 16.652266
|
inSlope: 16.652266
|
||||||
outSlope: 16.652266
|
outSlope: 16.652266
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
|
@ -318,7 +318,6 @@ GameObject:
|
||||||
- component: {fileID: 3389629528887116870}
|
- component: {fileID: 3389629528887116870}
|
||||||
- component: {fileID: 1160419468000791564}
|
- component: {fileID: 1160419468000791564}
|
||||||
- component: {fileID: 1691493459240420355}
|
- component: {fileID: 1691493459240420355}
|
||||||
- component: {fileID: 1963191815529894269}
|
|
||||||
m_Layer: 7
|
m_Layer: 7
|
||||||
m_Name: Player1
|
m_Name: Player1
|
||||||
m_TagString: Player
|
m_TagString: Player
|
||||||
|
@ -428,7 +427,6 @@ MonoBehaviour:
|
||||||
locked: 0
|
locked: 0
|
||||||
playerInput: {fileID: 1949941092232239315}
|
playerInput: {fileID: 1949941092232239315}
|
||||||
playerAnimationHandler: {fileID: 3878447480781341932}
|
playerAnimationHandler: {fileID: 3878447480781341932}
|
||||||
trailRenderer: {fileID: 1963191815529894269}
|
|
||||||
--- !u!114 &3878447480781341932
|
--- !u!114 &3878447480781341932
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -532,110 +530,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
StepInterval: 0.8
|
StepInterval: 0.8
|
||||||
Volume: 0.25
|
Volume: 0.25
|
||||||
--- !u!96 &1963191815529894269
|
|
||||||
TrailRenderer:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3120938410244321186}
|
|
||||||
m_Enabled: 0
|
|
||||||
m_CastShadows: 1
|
|
||||||
m_ReceiveShadows: 1
|
|
||||||
m_DynamicOccludee: 1
|
|
||||||
m_StaticShadowCaster: 0
|
|
||||||
m_MotionVectors: 0
|
|
||||||
m_LightProbeUsage: 0
|
|
||||||
m_ReflectionProbeUsage: 0
|
|
||||||
m_RayTracingMode: 0
|
|
||||||
m_RayTraceProcedural: 0
|
|
||||||
m_RenderingLayerMask: 1
|
|
||||||
m_RendererPriority: 0
|
|
||||||
m_Materials:
|
|
||||||
- {fileID: 2100000, guid: 0c2a3048d122d8c48807f52a864f5bee, type: 2}
|
|
||||||
m_StaticBatchInfo:
|
|
||||||
firstSubMesh: 0
|
|
||||||
subMeshCount: 0
|
|
||||||
m_StaticBatchRoot: {fileID: 0}
|
|
||||||
m_ProbeAnchor: {fileID: 0}
|
|
||||||
m_LightProbeVolumeOverride: {fileID: 0}
|
|
||||||
m_ScaleInLightmap: 1
|
|
||||||
m_ReceiveGI: 1
|
|
||||||
m_PreserveUVs: 0
|
|
||||||
m_IgnoreNormalsForChartDetection: 0
|
|
||||||
m_ImportantGI: 0
|
|
||||||
m_StitchLightmapSeams: 1
|
|
||||||
m_SelectedEditorRenderState: 3
|
|
||||||
m_MinimumChartSize: 4
|
|
||||||
m_AutoUVMaxDistance: 0.5
|
|
||||||
m_AutoUVMaxAngle: 89
|
|
||||||
m_LightmapParameters: {fileID: 0}
|
|
||||||
m_SortingLayerID: 0
|
|
||||||
m_SortingLayer: 0
|
|
||||||
m_SortingOrder: 0
|
|
||||||
m_Time: 5
|
|
||||||
m_PreviewTimeScale: 1
|
|
||||||
m_Parameters:
|
|
||||||
serializedVersion: 3
|
|
||||||
widthMultiplier: 1
|
|
||||||
widthCurve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0.13777733
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 0
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
colorGradient:
|
|
||||||
serializedVersion: 2
|
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
ctime0: 0
|
|
||||||
ctime1: 65535
|
|
||||||
ctime2: 0
|
|
||||||
ctime3: 0
|
|
||||||
ctime4: 0
|
|
||||||
ctime5: 0
|
|
||||||
ctime6: 0
|
|
||||||
ctime7: 0
|
|
||||||
atime0: 0
|
|
||||||
atime1: 65535
|
|
||||||
atime2: 0
|
|
||||||
atime3: 0
|
|
||||||
atime4: 0
|
|
||||||
atime5: 0
|
|
||||||
atime6: 0
|
|
||||||
atime7: 0
|
|
||||||
m_Mode: 0
|
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
|
||||||
m_NumAlphaKeys: 2
|
|
||||||
numCornerVertices: 0
|
|
||||||
numCapVertices: 0
|
|
||||||
alignment: 0
|
|
||||||
textureMode: 0
|
|
||||||
textureScale: {x: 1, y: 1}
|
|
||||||
shadowBias: 0.5
|
|
||||||
generateLightingData: 0
|
|
||||||
m_MinVertexDistance: 0.1
|
|
||||||
m_MaskInteraction: 0
|
|
||||||
m_Autodestruct: 0
|
|
||||||
m_Emitting: 1
|
|
||||||
m_ApplyActiveColorSpace: 1
|
|
||||||
--- !u!1001 &6225877037457186740
|
--- !u!1001 &6225877037457186740
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -163,8 +163,8 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Curve:
|
m_Curve:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 10
|
time: 0
|
||||||
value: 0
|
value: 0.14138794
|
||||||
inSlope: 16.652266
|
inSlope: 16.652266
|
||||||
outSlope: 16.652266
|
outSlope: 16.652266
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
|
@ -174,11 +174,11 @@ MonoBehaviour:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 29.937866
|
time: 29.937866
|
||||||
value: 150
|
value: 150
|
||||||
inSlope: 0.82769793
|
inSlope: 0.98160595
|
||||||
outSlope: 0.82769793
|
outSlope: 0.98160595
|
||||||
tangentMode: 0
|
tangentMode: 0
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.13692878
|
inWeight: 0.067287885
|
||||||
outWeight: 0
|
outWeight: 0
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
|
@ -234,7 +234,6 @@ GameObject:
|
||||||
- component: {fileID: 5108819328747686001}
|
- component: {fileID: 5108819328747686001}
|
||||||
- component: {fileID: 8956099385762146752}
|
- component: {fileID: 8956099385762146752}
|
||||||
- component: {fileID: 5150961666696654592}
|
- component: {fileID: 5150961666696654592}
|
||||||
- component: {fileID: 9132641508251950069}
|
|
||||||
m_Layer: 7
|
m_Layer: 7
|
||||||
m_Name: Player2
|
m_Name: Player2
|
||||||
m_TagString: Player
|
m_TagString: Player
|
||||||
|
@ -344,7 +343,6 @@ MonoBehaviour:
|
||||||
locked: 0
|
locked: 0
|
||||||
playerInput: {fileID: 1949941092232239315}
|
playerInput: {fileID: 1949941092232239315}
|
||||||
playerAnimationHandler: {fileID: 3878447480781341932}
|
playerAnimationHandler: {fileID: 3878447480781341932}
|
||||||
trailRenderer: {fileID: 9132641508251950069}
|
|
||||||
--- !u!114 &3878447480781341932
|
--- !u!114 &3878447480781341932
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -448,110 +446,6 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
StepInterval: 0.8
|
StepInterval: 0.8
|
||||||
Volume: 0.25
|
Volume: 0.25
|
||||||
--- !u!96 &9132641508251950069
|
|
||||||
TrailRenderer:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3120938410244321186}
|
|
||||||
m_Enabled: 0
|
|
||||||
m_CastShadows: 1
|
|
||||||
m_ReceiveShadows: 1
|
|
||||||
m_DynamicOccludee: 1
|
|
||||||
m_StaticShadowCaster: 0
|
|
||||||
m_MotionVectors: 0
|
|
||||||
m_LightProbeUsage: 0
|
|
||||||
m_ReflectionProbeUsage: 0
|
|
||||||
m_RayTracingMode: 0
|
|
||||||
m_RayTraceProcedural: 0
|
|
||||||
m_RenderingLayerMask: 1
|
|
||||||
m_RendererPriority: 0
|
|
||||||
m_Materials:
|
|
||||||
- {fileID: 2100000, guid: 0c2a3048d122d8c48807f52a864f5bee, type: 2}
|
|
||||||
m_StaticBatchInfo:
|
|
||||||
firstSubMesh: 0
|
|
||||||
subMeshCount: 0
|
|
||||||
m_StaticBatchRoot: {fileID: 0}
|
|
||||||
m_ProbeAnchor: {fileID: 0}
|
|
||||||
m_LightProbeVolumeOverride: {fileID: 0}
|
|
||||||
m_ScaleInLightmap: 1
|
|
||||||
m_ReceiveGI: 1
|
|
||||||
m_PreserveUVs: 0
|
|
||||||
m_IgnoreNormalsForChartDetection: 0
|
|
||||||
m_ImportantGI: 0
|
|
||||||
m_StitchLightmapSeams: 1
|
|
||||||
m_SelectedEditorRenderState: 3
|
|
||||||
m_MinimumChartSize: 4
|
|
||||||
m_AutoUVMaxDistance: 0.5
|
|
||||||
m_AutoUVMaxAngle: 89
|
|
||||||
m_LightmapParameters: {fileID: 0}
|
|
||||||
m_SortingLayerID: 0
|
|
||||||
m_SortingLayer: 0
|
|
||||||
m_SortingOrder: 0
|
|
||||||
m_Time: 5
|
|
||||||
m_PreviewTimeScale: 1
|
|
||||||
m_Parameters:
|
|
||||||
serializedVersion: 3
|
|
||||||
widthMultiplier: 1
|
|
||||||
widthCurve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: 0.13777733
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 0
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
colorGradient:
|
|
||||||
serializedVersion: 2
|
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
ctime0: 0
|
|
||||||
ctime1: 65535
|
|
||||||
ctime2: 0
|
|
||||||
ctime3: 0
|
|
||||||
ctime4: 0
|
|
||||||
ctime5: 0
|
|
||||||
ctime6: 0
|
|
||||||
ctime7: 0
|
|
||||||
atime0: 0
|
|
||||||
atime1: 65535
|
|
||||||
atime2: 0
|
|
||||||
atime3: 0
|
|
||||||
atime4: 0
|
|
||||||
atime5: 0
|
|
||||||
atime6: 0
|
|
||||||
atime7: 0
|
|
||||||
m_Mode: 0
|
|
||||||
m_ColorSpace: -1
|
|
||||||
m_NumColorKeys: 2
|
|
||||||
m_NumAlphaKeys: 2
|
|
||||||
numCornerVertices: 0
|
|
||||||
numCapVertices: 0
|
|
||||||
alignment: 0
|
|
||||||
textureMode: 0
|
|
||||||
textureScale: {x: 1, y: 1}
|
|
||||||
shadowBias: 0.5
|
|
||||||
generateLightingData: 0
|
|
||||||
m_MinVertexDistance: 0.1
|
|
||||||
m_MaskInteraction: 0
|
|
||||||
m_Autodestruct: 0
|
|
||||||
m_Emitting: 1
|
|
||||||
m_ApplyActiveColorSpace: 1
|
|
||||||
--- !u!1 &7787472247078384126
|
--- !u!1 &7787472247078384126
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -605,70 +605,6 @@ PrefabInstance:
|
||||||
propertyPath: otherPlayerAttack
|
propertyPath: otherPlayerAttack
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 1232208433}
|
objectReference: {fileID: 1232208433}
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Time
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.size
|
|
||||||
value: 3
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].time
|
|
||||||
value: 0.5816401
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].time
|
|
||||||
value: 0.9745941
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].value
|
|
||||||
value: 0.33777618
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].value
|
|
||||||
value: 0.07111359
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].inSlope
|
|
||||||
value: 0.07054916
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].inSlope
|
|
||||||
value: 0.79239726
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].inSlope
|
|
||||||
value: 0.4423178
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].outSlope
|
|
||||||
value: 0.07054916
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].inWeight
|
|
||||||
value: 0.3712629
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].outSlope
|
|
||||||
value: 0.79239726
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].inWeight
|
|
||||||
value: 0.52421325
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].outSlope
|
|
||||||
value: 0.4423178
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].outWeight
|
|
||||||
value: 0.37911436
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 9132641508251950069, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].outWeight
|
|
||||||
value: 0.33333334
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
|
@ -783,74 +719,6 @@ PrefabInstance:
|
||||||
propertyPath: m_IncludeLayers.m_Bits
|
propertyPath: m_IncludeLayers.m_Bits
|
||||||
value: 4294967295
|
value: 4294967295
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Time
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.size
|
|
||||||
value: 3
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].time
|
|
||||||
value: 0.5816401
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].time
|
|
||||||
value: 0.9745941
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].value
|
|
||||||
value: 0.33777618
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].value
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].value
|
|
||||||
value: 0.07111359
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].inSlope
|
|
||||||
value: 0.07054916
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].inSlope
|
|
||||||
value: 0.79239726
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].inSlope
|
|
||||||
value: 0.4423178
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].outSlope
|
|
||||||
value: 0.07054916
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].inWeight
|
|
||||||
value: 0.3712629
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].outSlope
|
|
||||||
value: 0.79239726
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].inWeight
|
|
||||||
value: 0.52421325
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[2].outSlope
|
|
||||||
value: 0.4423178
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[0].outWeight
|
|
||||||
value: 0.37911436
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1963191815529894269, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
|
||||||
propertyPath: m_Parameters.widthCurve.m_Curve.Array.data[1].outWeight
|
|
||||||
value: 0.33333334
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
- target: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Player1
|
value: Player1
|
||||||
|
|
|
@ -30,8 +30,6 @@ public class RopeWhipAttack : MonoBehaviour
|
||||||
|
|
||||||
if (playerInput.whipAttack)
|
if (playerInput.whipAttack)
|
||||||
{
|
{
|
||||||
otherPlayerAttack.joint.trailRenderer.enabled = true;
|
|
||||||
|
|
||||||
// reset local scale so rotations match up
|
// reset local scale so rotations match up
|
||||||
transform.localScale = transform.localScale.With(x: 1f);
|
transform.localScale = transform.localScale.With(x: 1f);
|
||||||
|
|
||||||
|
@ -61,7 +59,6 @@ public class RopeWhipAttack : MonoBehaviour
|
||||||
animationHandler.animator.speed = 1f;
|
animationHandler.animator.speed = 1f;
|
||||||
animationHandler.animator.StopPlayback();
|
animationHandler.animator.StopPlayback();
|
||||||
joint.locked = false;
|
joint.locked = false;
|
||||||
otherPlayerAttack.joint.trailRenderer.enabled = false;
|
|
||||||
otherPlayerAttack.joint.body.drag = otherPlayerAttack.initialDrag;
|
otherPlayerAttack.joint.body.drag = otherPlayerAttack.initialDrag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@ public class RopeJoint : MonoBehaviour
|
||||||
public bool locked = false;
|
public bool locked = false;
|
||||||
public PlayerInput playerInput;
|
public PlayerInput playerInput;
|
||||||
public PlayerAnimationHandler playerAnimationHandler;
|
public PlayerAnimationHandler playerAnimationHandler;
|
||||||
public TrailRenderer trailRenderer;
|
|
||||||
|
|
||||||
public Vector3 position => anchor.position;
|
public Vector3 position => anchor.position;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,11 @@ using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Unity.VisualScripting;
|
||||||
|
using UnityEditor.ShaderGraph.Drawing;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Analytics;
|
||||||
|
using UnityEngine.Rendering;
|
||||||
using UnityUtils;
|
using UnityUtils;
|
||||||
|
|
||||||
public class RopeSimulator : MonoBehaviour
|
public class RopeSimulator : MonoBehaviour
|
||||||
|
|
|
@ -20,7 +20,7 @@ MonoBehaviour:
|
||||||
m_EnableRaycastTarget: 1
|
m_EnableRaycastTarget: 1
|
||||||
m_GetFontFeaturesAtRuntime: 1
|
m_GetFontFeaturesAtRuntime: 1
|
||||||
m_missingGlyphCharacter: 0
|
m_missingGlyphCharacter: 0
|
||||||
m_warningsDisabled: 1
|
m_warningsDisabled: 0
|
||||||
m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
m_defaultFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
m_defaultFontAssetPath: Fonts & Materials/
|
m_defaultFontAssetPath: Fonts & Materials/
|
||||||
m_defaultFontSize: 36
|
m_defaultFontSize: 36
|
||||||
|
@ -29,16 +29,18 @@ MonoBehaviour:
|
||||||
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
|
m_defaultTextMeshProTextContainerSize: {x: 20, y: 5}
|
||||||
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
|
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
|
||||||
m_autoSizeTextContainer: 0
|
m_autoSizeTextContainer: 0
|
||||||
m_IsTextObjectScaleStatic: 0
|
|
||||||
m_fallbackFontAssets: []
|
m_fallbackFontAssets: []
|
||||||
m_matchMaterialPreset: 1
|
m_matchMaterialPreset: 1
|
||||||
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
|
m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
|
||||||
|
type: 2}
|
||||||
m_defaultSpriteAssetPath: Sprite Assets/
|
m_defaultSpriteAssetPath: Sprite Assets/
|
||||||
m_enableEmojiSupport: 1
|
m_enableEmojiSupport: 1
|
||||||
m_MissingCharacterSpriteUnicode: 0
|
m_MissingCharacterSpriteUnicode: 0
|
||||||
m_defaultColorGradientPresetsPath: Color Gradient Presets/
|
m_defaultColorGradientPresetsPath: Color Gradient Presets/
|
||||||
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
|
m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
|
||||||
|
type: 2}
|
||||||
m_StyleSheetsResourcePath:
|
m_StyleSheetsResourcePath:
|
||||||
m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
|
m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
|
||||||
m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
|
m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
|
||||||
|
type: 3}
|
||||||
m_UseModernHangulLineBreakingRules: 0
|
m_UseModernHangulLineBreakingRules: 0
|
||||||
|
|
Loading…
Reference in New Issue