CommonParrot/Space-Smash-Out
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: better player models, tackle bug fix

Browse Source
This commit is contained in:
Jakob Feldmann 2024-01-07 18:40:30 +01:00
parent a720ce0e68
commit 092fc57388
30 changed files with 5080 additions and 1117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Models/Materials/FresnelRippleMaterial.mat
View File

@ -145,6 +145,6 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _impact_origin: {r: 1, g: 0, b: -0.3, a: 1}
- _rotation: {r: 0, g: 0, b: 0, a: 1}
- _rotation: {r: 0.05, g: 0, b: 0, a: 1}
- _shield_color: {r: 0, g: 1, b: 0.7743149, a: 1}
m_BuildTextureStacks: []

BIN
Assets/Models/NewPlayerModell.bin
View File

Binary file not shown.

7
Assets/Models/NewPlayerModell.bin.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2c17f0affb402b24badabfa131c9d4d4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Models/NewPlayerModell.gltf
View File

@ -1 +0,0 @@
{"asset":{"generator":"3D Builder","version":"2.0"},"scene":0,"scenes":[{"nodes":[0]}],"nodes":[{"mesh":0,"matrix":[1,0,0,0,0,-1.1920928955078125E-7,-0.99999988079071045,0,0,0.99999988079071045,-1.1920928955078125E-7,0,0,0,0,1]}],"meshes":[{"primitives":[{"attributes":{"POSITION":0},"mode":4,"indices":3,"material":0},{"attributes":{"POSITION":1,"COLOR_0":2},"mode":4,"indices":4}]}],"materials":[{"name":"Regular","pbrMetallicRoughness":{"baseColorFactor":[0.838799238204956,0.010960093699395657,0.016807375475764275,1],"metallicFactor":0,"roughnessFactor":1},"alphaMode":"OPAQUE"}],"accessors":[{"bufferView":0,"byteOffset":0,"count":3809,"componentType":5126,"type":"VEC3","min":[-0.56238114833831787,-1.2120039463043213,-0.55818319320678711],"max":[0.56217849254608154,1.2118673324584961,0.56170278787612915]},{"bufferView":0,"byteOffset":45708,"count":17390,"componentType":5126,"type":"VEC3","min":[-0.5624319314956665,-1.2120039463043213,-0.56239962577819824],"max":[0.56233090162277222,0.96055978536605835,0.56236320734024048]},{"bufferView":1,"byteOffset":0,"count":17390,"componentType":5121,"type":"VEC4","normalized":true},{"bufferView":2,"byteOffset":0,"count":21156,"componentType":5125,"type":"SCALAR"},{"bufferView":2,"byteOffset":84624,"count":113670,"componentType":5125,"type":"SCALAR"}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":254388,"byteStride":12,"target":34962},{"buffer":0,"byteOffset":254388,"byteLength":69560,"byteStride":4,"target":34962},{"buffer":0,"byteOffset":323948,"byteLength":539304,"target":34963}],"buffers":[{"byteLength":863252,"uri":"NewPlayerModell.bin"}]}

30
Assets/Models/NewPlayerModell.gltf.meta
View File

@ -1,30 +0,0 @@
fileFormatVersion: 2
guid: bfd28bc391daa544eb481becddaea5f4
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 1
animationMethod: 2
generateMipMaps: 1
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies:
- type: 0
originalUri: Assets\Models\NewPlayerModell.bin
assetPath: Assets\Models\NewPlayerModell.bin
reportItems: []

BIN
Assets/Models/NewPlayerModellBlue.bin
View File

Binary file not shown.

1
Assets/Models/NewPlayerModellBlue.gltf
View File

@ -1 +0,0 @@
{"asset":{"generator":"3D Builder","version":"2.0"},"scene":0,"scenes":[{"nodes":[0]}],"nodes":[{"mesh":0,"matrix":[1,0,0,0,0,-1.1920928955078125E-7,-0.99999988079071045,0,0,0.99999988079071045,-1.1920928955078125E-7,0,0,0,0,1]}],"meshes":[{"primitives":[{"attributes":{"POSITION":0},"mode":4,"indices":4,"material":0},{"attributes":{"POSITION":1},"mode":4,"indices":5,"material":1},{"attributes":{"POSITION":2,"COLOR_0":3},"mode":4,"indices":6}]}],"materials":[{"name":"Regular","pbrMetallicRoughness":{"baseColorFactor":[0.838799238204956,0.010960093699395657,0.016807375475764275,1],"metallicFactor":0,"roughnessFactor":1},"alphaMode":"OPAQUE"},{"name":"Turquoise","pbrMetallicRoughness":{"baseColorFactor":[0,0.3515326976776123,0.80695247650146484,1],"metallicFactor":0,"roughnessFactor":1},"alphaMode":"OPAQUE"}],"accessors":[{"bufferView":0,"byteOffset":0,"count":277,"componentType":5126,"type":"VEC3","min":[-0.56238925457000732,-1.2120091915130615,-0.55823439359664917],"max":[0.562322735786438,1.211912989616394,0.49774518609046936]},{"bufferView":0,"byteOffset":3324,"count":1992,"componentType":5126,"type":"VEC3","min":[-0.56650406122207642,-0.77787232398986816,-0.5649908185005188],"max":[0.56338953971862793,0.39210250973701477,0.56490284204483032]},{"bufferView":0,"byteOffset":27228,"count":3949,"componentType":5126,"type":"VEC3","min":[-0.56244009733200073,-1.2120091915130615,-0.56245076656341553],"max":[0.56237351894378662,0.96055454015731812,0.56241363286972046]},{"bufferView":1,"byteOffset":0,"count":3949,"componentType":5121,"type":"VEC4","normalized":true},{"bufferView":2,"byteOffset":0,"count":735,"componentType":5125,"type":"SCALAR"},{"bufferView":2,"byteOffset":2940,"count":7467,"componentType":5125,"type":"SCALAR"},{"bufferView":2,"byteOffset":32808,"count":15888,"componentType":5125,"type":"SCALAR"}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":74616,"byteStride":12,"target":34962},{"buffer":0,"byteOffset":74616,"byteLength":15796,"byteStride":4,"target":34962},{"buffer":0,"byteOffset":90412,"byteLength":96360,"target":34963}],"buffers":[{"byteLength":186772,"uri":"NewPlayerModellBlue.bin"}]}

30
Assets/Models/NewPlayerModellBlue.gltf.meta
View File

@ -1,30 +0,0 @@
fileFormatVersion: 2
guid: 9ca8f01fef1156041a4db123b76dcfce
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 1
animationMethod: 2
generateMipMaps: 1
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies:
- type: 0
originalUri: Assets\Models\NewPlayerModellBlue.bin
assetPath: Assets\Models\NewPlayerModellBlue.bin
reportItems: []

BIN
Assets/Models/PlayerModell.bin
View File

Binary file not shown.

7
Assets/Models/PlayerModell.bin.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 985103faa56d39747b519301d8fa57b4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/Models/PlayerModell.gltf
View File

@ -1 +0,0 @@
{"asset":{"generator":"3D Builder","version":"2.0"},"scene":0,"scenes":[{"nodes":[0,1,2]}],"nodes":[{"mesh":0,"matrix":[7.0688209533691406,0,0,0,0,-8.4161018776285346E-7,-7.0599370002746582,0,0,7.0688199996948242,-8.4266912381281145E-7,0,2.0903868675231934,0.92134839296340942,-2.4274301528930664,1]},{"mesh":1,"matrix":[7.0688204765319824,0,0,0,0,-8.4161018776285346E-7,-7.0599370002746582,0,0,7.068819522857666,-8.4266906696939259E-7,0,2.0906772613525391,0.92132937908172607,-2.425809383392334,1]},{"mesh":2,"matrix":[278.30001831054687,0,0,0,0,-3.3134259865619242E-5,-277.95028686523437,0,0,278.29998779296875,-3.3175947464769706E-5,0,2.0905318260192871,0.92132937908172607,-2.4266078472137451,1]}],"meshes":[{"primitives":[{"attributes":{"POSITION":0,"TEXCOORD_0":1},"mode":4,"indices":2,"material":0}]},{"primitives":[{"attributes":{"POSITION":3,"TEXCOORD_0":4},"mode":4,"indices":5,"material":1}]},{"primitives":[{"attributes":{"POSITION":6,"TEXCOORD_0":7},"mode":4,"indices":8,"material":2}]}],"materials":[{"pbrMetallicRoughness":{"baseColorFactor":[1,1,1,1],"metallicFactor":1,"roughnessFactor":1,"baseColorTexture":{"index":0,"texCoord":0},"metallicRoughnessTexture":{"index":1,"texCoord":0}},"alphaMode":"OPAQUE"},{"pbrMetallicRoughness":{"baseColorFactor":[1,1,1,1],"metallicFactor":1,"roughnessFactor":1,"baseColorTexture":{"index":2,"texCoord":0},"metallicRoughnessTexture":{"index":3,"texCoord":0}},"alphaMode":"OPAQUE"},{"pbrMetallicRoughness":{"baseColorFactor":[1,1,1,1],"metallicFactor":1,"roughnessFactor":1,"baseColorTexture":{"index":4,"texCoord":0},"metallicRoughnessTexture":{"index":5,"texCoord":0}},"alphaMode":"OPAQUE"}],"textures":[{"source":0,"sampler":0},{"source":1,"sampler":0},{"source":2,"sampler":0},{"source":3,"sampler":0},{"source":4,"sampler":0},{"source":5,"sampler":0}],"images":[{"uri":"texture_0_6195987693227547908.png"},{"uri":"texture_1_17319628118832143767.png"},{"uri":"texture_4_11563080508590297124.png"},{"uri":"texture_1_17650290037541193437.png"},{"uri":"texture_7_5628616909738884392.png"},{"uri":"texture_1_3010182785424325454.png"}],"samplers":[{"magFilter":9729,"wrapS":10497,"wrapT":10497}],"accessors":[{"bufferView":0,"byteOffset":0,"count":10,"componentType":5126,"type":"VEC3","min":[-0.36640751361846924,-0.41465383768081665,-0.16703909635543823],"max":[-0.22498613595962524,-0.27323246002197266,0.032960891723632813]},{"bufferView":1,"byteOffset":0,"count":10,"componentType":5126,"type":"VEC2"},{"bufferView":2,"byteOffset":0,"count":24,"componentType":5125,"type":"SCALAR"},{"bufferView":3,"byteOffset":0,"count":10,"componentType":5126,"type":"VEC3","min":[-0.36649355292320251,-0.4142012894153595,-0.22352662682533264],"max":[-0.22507220506668091,-0.27277997136116028,-0.023520663380622864]},{"bufferView":4,"byteOffset":0,"count":10,"componentType":5126,"type":"VEC2"},{"bufferView":5,"byteOffset":0,"count":24,"componentType":5125,"type":"SCALAR"},{"bufferView":6,"byteOffset":0,"count":3578,"componentType":5126,"type":"VEC3","min":[-0.0093026114627718925,-0.010510260239243507,-0.0074584018439054489],"max":[-0.005738516803830862,-0.0069461655803024769,-0.0056784935295581818]},{"bufferView":7,"byteOffset":0,"count":3578,"componentType":5126,"type":"VEC2"},{"bufferView":8,"byteOffset":0,"count":19200,"componentType":5125,"type":"SCALAR"}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":120,"byteStride":12,"target":34962},{"buffer":0,"byteOffset":120,"byteLength":80,"byteStride":8,"target":34962},{"buffer":0,"byteOffset":200,"byteLength":96,"target":34963},{"buffer":0,"byteOffset":296,"byteLength":120,"byteStride":12,"target":34962},{"buffer":0,"byteOffset":416,"byteLength":80,"byteStride":8,"target":34962},{"buffer":0,"byteOffset":496,"byteLength":96,"target":34963},{"buffer":0,"byteOffset":592,"byteLength":42936,"byteStride":12,"target":34962},{"buffer":0,"byteOffset":43528,"byteLength":28624,"byteStride":8,"target":34962},{"buffer":0,"byteOffset":72152,"byteLength":76800,"target":34963}],"buffers":[{"byteLength":148952,"uri":"PlayerModell.bin"}]}

48
Assets/Models/PlayerModell.gltf.meta
View File

@ -1,48 +0,0 @@
fileFormatVersion: 2
guid: 2ba271f1ff51354409724fc9b4695638
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 1
animationMethod: 2
generateMipMaps: 1
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies:
- type: 0
originalUri: Assets\Models\PlayerModell.bin
assetPath: Assets\Models\PlayerModell.bin
- type: 1
originalUri: Assets\Models\texture_0_6195987693227547908.png
assetPath: Assets\Models\texture_0_6195987693227547908.png
- type: 1
originalUri: Assets\Models\texture_1_17319628118832143767.png
assetPath: Assets\Models\texture_1_17319628118832143767.png
- type: 1
originalUri: Assets\Models\texture_4_11563080508590297124.png
assetPath: Assets\Models\texture_4_11563080508590297124.png
- type: 1
originalUri: Assets\Models\texture_1_17650290037541193437.png
assetPath: Assets\Models\texture_1_17650290037541193437.png
- type: 1
originalUri: Assets\Models\texture_7_5628616909738884392.png
assetPath: Assets\Models\texture_7_5628616909738884392.png
- type: 1
originalUri: Assets\Models\texture_1_3010182785424325454.png
assetPath: Assets\Models\texture_1_3010182785424325454.png
reportItems: []

BIN
Assets/Models/bluePlayer.fbx Normal file
View File

Binary file not shown.

109
Assets/Models/bluePlayer.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 61dc60d6e44cd9f46bc21aa06f06f92b
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 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: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Models/grayPlayer.fbx Normal file
View File

Binary file not shown.

109
Assets/Models/grayPlayer.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 0314dc2e0a09e6b46809ba485ec101ed
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 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: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

1198
Assets/Prefabs/Player Blue.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Prefabs/Player Blue.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d247a5257c4a6774399dc902f311b653
guid: 65cd4fa5e050652409dd9b062365c7e8
PrefabImporter:
externalObjects: {}
userData:

1342
Assets/Prefabs/Player Gray.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Prefabs/Player Gray.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 105162f72bf50c84aaf92b1ca494ed3b
guid: 46f84e56340e83e4ba7c6abbccd2ae3f
PrefabImporter:
externalObjects: {}
userData:

448
Assets/Scenes/BattleField.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.004074199, g: 0.019367827, b: 0.030757796, a: 1}
m_IndirectSpecularColor: {r: 0.003931217, g: 0.019188203, b: 0.030662213, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -309,75 +309,17 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &688137393
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1813158012165334522, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_Name
value: Player Gray
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalPosition.x
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalPosition.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4137950278346515597, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8932415214367391550, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: cameraOperator
value:
objectReference: {fileID: 963194229}
- target: {fileID: 8932415214367391550, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: normalTacklePowerFactor
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8932415214367391550, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
propertyPath: criticalTacklePowerFactor
value: 25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 105162f72bf50c84aaf92b1ca494ed3b, type: 3}
--- !u!114 &275864068 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
m_PrefabInstance: {fileID: 1491164188991312957}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b6244fd2a6ceee4ab8504fadf75ae20, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &754823974
GameObject:
m_ObjectHideFlags: 0
@ -437,8 +379,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2}
m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -462,8 +404,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28
m_fontSizeBase: 28
m_fontSize: 20
m_fontSizeBase: 20
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -709,75 +651,6 @@ MonoBehaviour:
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!1001 &1119422545
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2111858426991004505, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_Name
value: Player Blue
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalPosition.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalPosition.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5458316571244832082, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7382138887082377466, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: cameraOperator
value:
objectReference: {fileID: 963194229}
- target: {fileID: 7382138887082377466, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: normalTacklePowerFactor
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7382138887082377466, guid: d247a5257c4a6774399dc902f311b653, type: 3}
propertyPath: criticalTacklePowerFactor
value: 25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d247a5257c4a6774399dc902f311b653, type: 3}
--- !u!1 &1185564589
GameObject:
m_ObjectHideFlags: 0
@ -1153,6 +1026,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3}
--- !u!114 &1800793340 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2704141135220834432, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
m_PrefabInstance: {fileID: 6412728625559011621}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b6244fd2a6ceee4ab8504fadf75ae20, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2000082934
GameObject:
m_ObjectHideFlags: 0
@ -1387,6 +1271,280 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
announcementText: {fileID: 754823976}
--- !u!1001 &1491164188991312957
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 523278837762333881, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_text
value: 'Boost Capacity
Gray'
objectReference: {fileID: 0}
- target: {fileID: 523278837762333881, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_HorizontalAlignment
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1372816401649438144, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_Name
value: Player Gray
objectReference: {fileID: 0}
- target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: cameraOperator
value:
objectReference: {fileID: 963194229}
- target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: normalTacklePowerFactor
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: criticalTacklePowerFactor
value: 80
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_SizeDelta.y
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3765618345300295002, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchoredPosition.x
value: 120
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalPosition.x
value: -10
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalPosition.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_NotificationBehavior
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 275864068}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 275864068}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 275864068}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 275864068}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnThrust
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnSteer
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnResetScene
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnBoost
objectReference: {fileID: 0}
- target: {fileID: 5862911224629907877, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5862911224629907877, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5862911224629907877, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_AnchoredPosition.x
value: 32
objectReference: {fileID: 0}
- target: {fileID: 9019135020271586677, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
propertyPath: m_Name
value: PlayerHUDGray
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
--- !u!1001 &6412728625559011621
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 523278837762333881, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_text
value: 'Boost Capacity
Blue'
objectReference: {fileID: 0}
- target: {fileID: 1372816401649438144, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_Name
value: Player Blue
objectReference: {fileID: 0}
- target: {fileID: 2704141135220834432, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: cameraOperator
value:
objectReference: {fileID: 963194229}
- target: {fileID: 2704141135220834432, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: normalTacklePowerFactor
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2704141135220834432, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: criticalTacklePowerFactor
value: 80
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalPosition.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalPosition.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5042970769659716555, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_NotificationBehavior
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1800793340}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1800793340}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1800793340}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1800793340}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnThrust
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnSteer
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnResetScene
objectReference: {fileID: 0}
- target: {fileID: 5169936245223775701, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
propertyPath: m_ActionEvents.Array.data[3].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnBoost
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@ -1398,8 +1556,8 @@ SceneRoots:
- {fileID: 2000082937}
- {fileID: 1185564593}
- {fileID: 1748381166}
- {fileID: 688137393}
- {fileID: 1119422545}
- {fileID: 1491164188991312957}
- {fileID: 6412728625559011621}
- {fileID: 1361581063}
- {fileID: 1659830377}
- {fileID: 201450955}

23
Assets/Scripts/GameManager.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.InputSystem;
using UnityEngine.Rendering;
using UnityEngine.SceneManagement;
@ -16,7 +17,7 @@ public class GameManager : MonoBehaviour
[SerializeField] int minPlayerCount = 2;
public GameState currentState { get; private set; }
private Dictionary<int, PlayerController> players = new Dictionary<int, PlayerController>();
private Dictionary<int, string> playerControlSchemes = new Dictionary<int, string>();
private Dictionary<int, Tuple<string, int>> playerControlSchemes = new Dictionary<int, Tuple<string, int>>();
private float restartMatchTime = 0;
private ControlSchemeDetection controlSchemeDetector;
@ -118,10 +119,10 @@ public class GameManager : MonoBehaviour
{
players[pc.playerId] = pc;
}
DetectPlayerControls(this);
DetectPlayerControls(this, new Tuple<string, int>("New Player", 0));
}
private void DetectPlayerControls(object sender, string controlScheme = "New Player")
private void DetectPlayerControls(object eventCauser, Tuple<string, int> controlScheme)
{
if (players.Count < minPlayerCount)
{
@ -139,7 +140,7 @@ public class GameManager : MonoBehaviour
}
}
private void AssignPlayerControls(string controlScheme = "New Player")
private void AssignPlayerControls(Tuple<string, int> controlScheme)
{
foreach (int playerId in players.Keys)
{
@ -156,15 +157,15 @@ public class GameManager : MonoBehaviour
{
return;
}
if (controlScheme.Contains("Keyboard"))
if (controlScheme.Item1.Contains("Keyboard"))
{
pc.playerInput.SwitchCurrentControlScheme(controlScheme, Keyboard.current);
pc.playerInput.SwitchCurrentControlScheme(controlScheme.Item1, InputSystem.GetDeviceById(controlScheme.Item2));
}
else if (controlScheme.Contains("Controller"))
else if (controlScheme.Item1.Contains("Controller"))
{
pc.playerInput.SwitchCurrentControlScheme(controlScheme, Gamepad.current);
pc.playerInput.SwitchCurrentControlScheme(controlScheme.Item1, InputSystem.GetDeviceById(controlScheme.Item2));
}
if (controlScheme != "New Player")
if (controlScheme.Item1 != "New Player")
{
playerControlSchemes[playerId] = controlScheme;
}
@ -189,7 +190,7 @@ public class GameManager : MonoBehaviour
public class ControlSchemeDetection : IPlayerActions
{
InputActionMaps actionMaps;
public event EventHandler<string> ControlSchemeDetected;
public event EventHandler<Tuple<string, int>> ControlSchemeDetected;
public ControlSchemeDetection()
{
@ -235,6 +236,6 @@ public class ControlSchemeDetection : IPlayerActions
int bindingIndex = context.action.GetBindingIndexForControl(context.control);
InputBinding binding = context.action.bindings[bindingIndex];
string controlScheme = binding.groups.Split(';')[0];
ControlSchemeDetected.Invoke(this, controlScheme);
ControlSchemeDetected.Invoke(this, new Tuple<string, int>(controlScheme, context.control.device.deviceId));
}
}

2
Assets/Scripts/NimbleZoneDetection.cs
View File

@ -35,7 +35,7 @@ public class NimbleZoneDetection : MonoBehaviour
{
int instanceID = collider.gameObject.GetInstanceID();
forcesManager.SetGravityForInstance(instanceID, NoGravity);
forcesManager.SetZoneForInstance(instanceID, Zone.NimbleZone);
forcesManager.SetZoneForInstance(instanceID, zone);
}
private void OnTriggerExit(Collider collider)

2
Assets/Scripts/PlayerController.cs
View File

@ -235,7 +235,7 @@ public class PlayerController : MonoBehaviour
void UpdateTackleResponse(bool gotTackled = false)
{
if (gotTackled)
if (gotTackled && !isTackled)
{
isTackled = true;
tackledTime = isCriticalTackle ? tackleCriticalStunTime : tackleBodyStunTime;

4
Assets/Scripts/TackleDetection.cs
View File

@ -1,7 +1,3 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEditor.AdaptivePerformance.Editor;
using UnityEngine;
using UnityEngine.Events;

BIN
Assets/TextMesh Pro/Fonts/IBMPlexSans-Regular.ttf Normal file
View File

Binary file not shown.

21
Assets/TextMesh Pro/Fonts/IBMPlexSans-Regular.ttf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 02975521774a75440ac31c48b1d52348
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- IBM Plex Sans
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

2799
Assets/TextMesh Pro/Resources/Fonts & Materials/IBMPlexSans-Regular SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

5
Assets/Models/NewPlayerModellBlue.bin.meta → Assets/TextMesh Pro/Resources/Fonts & Materials/IBMPlexSans-Regular SDF.asset.meta
View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 2fa28fdd5851ad743a91748a28662c71
DefaultImporter:
guid: 3a3809aa93488384890eda99d44622af
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

4
ProjectSettings/ProjectSettings.asset
View File

@ -134,7 +134,9 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1
preloadedAssets: []
preloadedAssets:
- {fileID: 7907058041053682329, guid: 4b98f800e99c70140ac675a637d71d3a, type: 2}
- {fileID: 11400000, guid: 7d6dd64b5f2213d4f8cc395ae58ffb43, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1