ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/level-design

This commit is contained in:
Cat Flynn 2021-05-10 15:12:45 +01:00
parent ac26f07288 e3fb789cc3
commit 3302a9adb0
13 changed files with 178 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
game/Assets/3D Assets/TRAPS/Arrow.fbx (Stored with Git LFS) Normal file
View File

Binary file not shown.

107
game/Assets/3D Assets/TRAPS/Arrow.fbx.meta Normal file
View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: c35d572b63b1e1b418b0a1ee9d773370
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: lambert1
second: {fileID: 2100000, guid: a0427cf339e5891468d5f2b433b2d44a, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 100
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

7
game/Assets/3D Assets/TRIM 1/Meshes/Roof_A.fbx.meta
View File

@ -3,7 +3,12 @@ guid: ef7a51de2c5c5c5438ce6fea733533b2
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: blinn2
second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2}
materials:
materialImportMode: 2
materialName: 0

11
game/Assets/Materials/DeathVolume_MAt.mat
View File

@ -8,11 +8,11 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DeathVolume_MAt
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
@ -83,7 +83,7 @@ Material:
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
@ -97,6 +97,7 @@ Material:
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SampleGI: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
@ -105,8 +106,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 0, b: 0, a: 0.8156863}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 1, g: 0, b: 0, a: 0.29803923}
- _Color: {r: 1, g: 1, b: 1, a: 0.30588236}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

18
game/Assets/Prefabs/Traps/ArrowWall.prefab
View File

@ -216,8 +216,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7705893802528651092}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 0, y: 0.945, z: -0.916}
m_LocalScale: {x: 0.96121, y: 0.87204, z: 1}
m_Children: []
m_Father: {fileID: 8768409224895496785}
m_RootOrder: 0
@ -242,7 +242,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b451a052397f03c4f8a04d915d1c0492, type: 3}
- {fileID: 2100004, guid: b451a052397f03c4f8a04d915d1c0492, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -283,7 +283,7 @@ ParticleSystemRenderer:
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 00010304
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 5302568919011541938, guid: c35d572b63b1e1b418b0a1ee9d773370, type: 3}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
@ -361,7 +361,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 2
randomSeed: 0
@ -699,7 +699,7 @@ ParticleSystem:
startRotationX:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: -1.5707963
minScalar: 0
maxCurve:
serializedVersion: 2
@ -856,9 +856,9 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
maxNumParticles: 1000
maxNumParticles: 100
size3D: 0
rotation3D: 0
rotation3D: 1
gravityModifier:
serializedVersion: 2
minMaxState: 0
@ -3931,7 +3931,7 @@ ParticleSystem:
m_Bounce:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0
minScalar: 1
maxCurve:
serializedVersion: 2

1
game/Assets/Scripts/Traps/ArrowWall.cs
View File

@ -35,6 +35,7 @@ public class ArrowWall : MonoBehaviour
if (elapsed > _delay && objectTimeScale!=0)
{
// TODO: arrow whoosh noises
FMODUnity.RuntimeManager.PlayOneShot(_settings.ArrowWall.FMODEvent);
_particles.Play();

3
game/Assets/Scripts/Traps/TrapSettings.cs
View File

@ -42,6 +42,9 @@ public class TrapSettings : ScriptableObject
{
public float SafeResetTime => _safeResetTime;
[SerializeField] private float _safeResetTime;
public string FMODEvent => _fmodEvent;
[SerializeField] private string _fmodEvent;
}
public ArrowWallSettings ArrowWall => _arrowWall;

1
game/Assets/Settings/Traps/Trap Settings.asset
View File

@ -21,3 +21,4 @@ MonoBehaviour:
_popInEase: 27
_arrowWall:
_safeResetTime: 0
_fmodEvent: event:/Environment/Traps/ArrowWall

BIN
game/FMOD Project/Assets/revival_arrow_volleys.wav (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
game/FMOD Project/Build/Desktop/Music.bank (Stored with Git LFS)
View File

Binary file not shown.

BIN
game/FMOD Project/Build/Desktop/SFX.bank (Stored with Git LFS)
View File

Binary file not shown.

20
game/FMOD Project/Metadata/AudioFile/{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}">
<property name="assetPath">
<value>revival_arrow_volleys.wav</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>1</value>
</property>
<property name="length">
<value>2.1797708333333334</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4c43130b-9186-4fb6-9d65-a9acdac70927}</destination>
</relationship>
</object>
</objects>

17
game/FMOD Project/Metadata/Event/{80b1514b-07aa-4a1b-8663-346bf60403f1}.xml
View File

@ -59,11 +59,18 @@
<object class="EventAutomatableProperties" id="{6a3d160f-ac7d-4374-b58f-071e719eaf0f}" />
<object class="MarkerTrack" id="{918afc0a-def0-43f5-ae12-89e741efeae1}" />
<object class="GroupTrack" id="{d6f49fde-191f-4bc3-98be-d14aadbf56ac}">
<relationship name="modules">
<destination>{9154af58-ed0e-4cb2-8fbc-87cd082aa6f1}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{55a5d6dd-434e-43e4-b760-bfe4b26cab38}</destination>
</relationship>
</object>
<object class="Timeline" id="{bdabc080-cb07-4cd2-a038-5aeb746f69b9}" />
<object class="Timeline" id="{bdabc080-cb07-4cd2-a038-5aeb746f69b9}">
<relationship name="modules">
<destination>{9154af58-ed0e-4cb2-8fbc-87cd082aa6f1}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{1ea58401-6147-4eac-af40-824f98eada94}">
<relationship name="effectChain">
<destination>{52bdf8e2-77c5-4c00-bd2c-adc125cfa393}</destination>
@ -81,6 +88,14 @@
</relationship>
</object>
<object class="MixerBusPanner" id="{af436260-76bc-4f04-bd76-dfaccb34f6fc}" />
<object class="SingleSound" id="{9154af58-ed0e-4cb2-8fbc-87cd082aa6f1}">
<property name="length">
<value>2.1797708333333334</value>
</property>
<relationship name="audioFile">
<destination>{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{55a5d6dd-434e-43e4-b760-bfe4b26cab38}">
<property name="name">
<value>Audio 1</value>