Commit ded0dcb1 by alsunj

fix shader issues

parent b49f8cea
Showing with 1414 additions and 57 deletions
...@@ -342,6 +342,9 @@ MonoBehaviour: ...@@ -342,6 +342,9 @@ MonoBehaviour:
skyOcclusionIntensityMultiplier: skyOcclusionIntensityMultiplier:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1 m_Value: 1
worldOffset:
m_OverrideState: 1
m_Value: {x: 0, y: 0, z: 0}
--- !u!114 &-1216621516061285780 --- !u!114 &-1216621516061285780
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
...@@ -462,8 +465,6 @@ MonoBehaviour: ...@@ -462,8 +465,6 @@ MonoBehaviour:
- {fileID: -6288072647309666549} - {fileID: -6288072647309666549}
- {fileID: 7518938298396184218} - {fileID: 7518938298396184218}
- {fileID: -1410297666881709256} - {fileID: -1410297666881709256}
- {fileID: -7750755424749557576}
- {fileID: -5139089513906902183}
--- !u!114 &853819529557874667 --- !u!114 &853819529557874667
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
......
...@@ -78,11 +78,11 @@ MonoBehaviour: ...@@ -78,11 +78,11 @@ MonoBehaviour:
m_UseAdaptivePerformance: 1 m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0 m_ColorGradingMode: 0
m_ColorGradingLutSize: 32 m_ColorGradingLutSize: 32
m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 0 m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1 m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1 m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0 m_GPUResidentDrawerMode: 0
m_UseLegacyLightmaps: 0
m_SmallMeshScreenPercentage: 0 m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
m_ShadowType: 1 m_ShadowType: 1
...@@ -109,6 +109,7 @@ MonoBehaviour: ...@@ -109,6 +109,7 @@ MonoBehaviour:
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 0 m_PrefilterWriteRenderingLayers: 0
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 0
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 0
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
......
fileFormatVersion: 2
guid: c85f08cdecae55f46962fda43da5df29
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerAnimatorController
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 6204111156984808888}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &6204111156984808888
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7896560456317152088}
m_Position: {x: 150, y: 250, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 160, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7896560456317152088}
--- !u!1102 &7896560456317152088
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -3100369314251171874, guid: e8747e16efffd7a47afd2563a3a381bd, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
fileFormatVersion: 2
guid: d51e64459114ce740bd0867a7eca5623
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5be01614a46bc2f4da6249a25c04c17b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
fileFormatVersion: 2
guid: a4c238e6419198042a8b42b95b869624
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 32
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Glow
m_Shader: {fileID: -6465566751694194690, guid: 5be01614a46bc2f4da6249a25c04c17b, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: 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}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_d37daf300f7b463db51393321fd34c2d_Texture_1_Texture2D:
m_Texture: {fileID: 10307, guid: 0000000000000000f000000000000000, type: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ComputeMeshIndex: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.59999996
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SkinMatrixIndex: 0
- _Smoothness: 0.59999996
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5697337904137666522
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
fileFormatVersion: 2
guid: f6302e761ef5d1640934bc5d9d008ff2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 21199fcdd2fe5c44baab34a8c8722e13
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 157b48a66b6c1ca41943a6a9a3892ecf
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:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
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: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 32185154b3027a4438dbbd37facffe7a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 381efd3d33bc08849a97e41e0036124e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 32
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: skeleton
m_Shader: {fileID: -6465566751694194690, guid: a4c238e6419198042a8b42b95b869624, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties: _Surface
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Base_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Normal_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BASE_COLOR_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BUMP_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 0e46c32f798ad6a4594d064d33a1242b, type: 3}
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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EMISSION_COLOR_MAP:
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}
- _METALNESS_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 0e46c32f798ad6a4594d064d33a1242b, type: 3}
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}
- _NORMAL_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OPACITY_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _REFLECTIONS_COLOR_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _REFLECTIONS_IOR_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _REFLECTIONS_ROUGHNESS_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SPECULAR_COLOR_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SPECULAR_IOR_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SPECULAR_ROUGHNESS_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_d37daf300f7b463db51393321fd34c2d_Texture_1_Texture2D:
m_Texture: {fileID: 2800000, guid: 381efd3d33bc08849a97e41e0036124e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TRANSPARENCY_MAP:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture2D:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Normal_Blend: 0.5
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _BASE_COLOR_WEIGHT: 1
- _BUMP_MAP_STRENGTH: 0.3
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _ColorMode: 0
- _ComputeMeshIndex: 0
- _Cull: 2
- _Cutoff: 0.5
- _DecalMeshBiasType: 0
- _DecalMeshDepthBias: 0
- _DecalMeshViewBias: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DrawOrder: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EMISSION_WEIGHT: 1
- _EmissionEnabled: 0
- _EnvironmentReflections: 1
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossinessSource: 0
- _GlossyReflections: 1
- _Intensity: 1
- _LightingEnabled: 0
- _METALNESS: 0
- _Metallic: 0
- _Mode: 0
- _OPACITY: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _REFLECTIONS_IOR: 1.52
- _REFLECTIONS_ROUGHNESS: 1
- _REFLECTIONS_WEIGHT: 1
- _ReceiveShadows: 1
- _SPECULAR_IOR: 1.5
- _SPECULAR_ROUGHNESS: 0
- _Shininess: 0
- _SkinMatrixIndex: 0
- _Smoothness: 0.5
- _SmoothnessSource: 0
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _TRANSPARENCY: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BASE_COLOR: {r: 0, g: 0, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1}
- _SPECULAR_COLOR: {r: 1, g: 1, b: 1, a: 0}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6121781474588971534
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
fileFormatVersion: 2
guid: bc07391a2b9d8aa41ba5374abc9bcdc2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
using Unity.Entities;
using UnityEngine;
public class AnimatorReference : MonoBehaviour
{
public Animator animatorReference;
}
public struct AnimatorReferenceComponent : ICleanupComponentData
{
public Animator animatorReference;
}
\ No newline at end of file
fileFormatVersion: 2
guid: 70b14d298a846084abff9ccb30dc1b9a
\ No newline at end of file
using Unity.Entities;
using Unity.Mathematics;
using UnityEngine;
public class CameraFollowAuthoring : MonoBehaviour
{
public float3 Offset = new float3(0, 2, -8);
public class Baker : Baker<CameraFollowAuthoring>
{
public override void Bake(CameraFollowAuthoring authoring)
{
Entity entity = GetEntity(TransformUsageFlags.Dynamic);
AddComponent(entity, new CameraFollow
{
Offset = authoring.Offset
});
}
}
}
public struct CameraFollow : IComponentData
{
public Entity PlayerEntity;
public float3 Offset;
}
\ No newline at end of file
fileFormatVersion: 2
guid: 9a9a9eb6cea0a1842abc3455970d2c7a
\ No newline at end of file
...@@ -12,10 +12,9 @@ public class EntitiesReferencesAuthoring : MonoBehaviour ...@@ -12,10 +12,9 @@ public class EntitiesReferencesAuthoring : MonoBehaviour
{ {
Entity entity = GetEntity(TransformUsageFlags.Dynamic); Entity entity = GetEntity(TransformUsageFlags.Dynamic);
Entity playerPrefabEntity = GetEntity(authoring.playerPrefabGameObject, TransformUsageFlags.Dynamic); Entity playerPrefabEntity = GetEntity(authoring.playerPrefabGameObject, TransformUsageFlags.Dynamic);
AddComponent(entity, new EntititesReferences AddComponent(entity, new EntititesReferences
{ {
playerPrefabEntity = playerPrefabEntity playerPrefabEntity = playerPrefabEntity,
}); });
AddComponent<PhysicsVelocity>(entity); AddComponent<PhysicsVelocity>(entity);
AddComponent<PhysicsMass>(entity, PhysicsMass.CreateDynamic(MassProperties.UnitSphere, 1f)); AddComponent<PhysicsMass>(entity, PhysicsMass.CreateDynamic(MassProperties.UnitSphere, 1f));
...@@ -24,7 +23,8 @@ public class EntitiesReferencesAuthoring : MonoBehaviour ...@@ -24,7 +23,8 @@ public class EntitiesReferencesAuthoring : MonoBehaviour
} }
} }
public struct EntititesReferences : IComponentData public struct EntititesReferences : IComponentData
{ {
public Entity playerPrefabEntity; public Entity playerPrefabEntity;
} }
\ No newline at end of file
...@@ -5,6 +5,15 @@ using UnityEngine; ...@@ -5,6 +5,15 @@ using UnityEngine;
public class NetcodePlayerInputAuthoring : MonoBehaviour public class NetcodePlayerInputAuthoring : MonoBehaviour
{ {
public float sprintRemaining = 5f;
public float sprintDuration = 5f;
public float sprintSpeed = 12f;
public float walkSpeed = 9f;
public float sprintCooldownReset = 2f;
public float sprintFOV = 90f;
public float walkFOV = 60f;
public float sprintFOVStepTime = 0.1f;
public class Baker : Baker<NetcodePlayerInputAuthoring> public class Baker : Baker<NetcodePlayerInputAuthoring>
{ {
public override void Bake(NetcodePlayerInputAuthoring authoring) public override void Bake(NetcodePlayerInputAuthoring authoring)
...@@ -12,25 +21,23 @@ public class NetcodePlayerInputAuthoring : MonoBehaviour ...@@ -12,25 +21,23 @@ public class NetcodePlayerInputAuthoring : MonoBehaviour
Entity entity = GetEntity(TransformUsageFlags.Dynamic); Entity entity = GetEntity(TransformUsageFlags.Dynamic);
AddComponent(entity, new NetcodePlayerInput()); AddComponent(entity, new NetcodePlayerInput());
// Assign initial values to PlayerSprintData
AddComponent(entity, new PlayerSprintData AddComponent(entity, new PlayerSprintData
{ {
isSprinting = false, isSprinting = false,
isSprintCooldown = false, isSprintCooldown = false,
sprintRemaining = 5f, sprintRemaining = authoring.sprintRemaining,
sprintDuration = 5f, sprintDuration = authoring.sprintDuration,
sprintSpeed = 12f, sprintSpeed = authoring.sprintSpeed,
walkSpeed = 9f, walkSpeed = authoring.walkSpeed,
sprintCooldown = 0f, sprintCooldown = 0f,
sprintCooldownReset = 2f, sprintCooldownReset = authoring.sprintCooldownReset,
sprintFOV = 90f, sprintFOV = authoring.sprintFOV,
walkFOV = 60f, walkFOV = authoring.walkFOV,
sprintFOVStepTime = 0.1f sprintFOVStepTime = authoring.sprintFOVStepTime
}); });
AddComponent(entity, new PlayerAttackData()); AddComponent(entity, new PlayerAttackData());
AddComponent(entity, new PlayerDefenceData()); AddComponent(entity, new PlayerDefenceData());
AddComponent(entity, new CameraFollow());
} }
} }
} }
...@@ -63,9 +70,4 @@ public struct PlayerAttackData : IComponentData ...@@ -63,9 +70,4 @@ public struct PlayerAttackData : IComponentData
public struct PlayerDefenceData : IComponentData public struct PlayerDefenceData : IComponentData
{ {
public float defenceCooldownTimer; public float defenceCooldownTimer;
}
public struct CameraFollow : IComponentData
{
public Entity PlayerEntity;
} }
\ No newline at end of file
...@@ -41,10 +41,6 @@ partial struct GoInGameServerSystem : ISystem ...@@ -41,10 +41,6 @@ partial struct GoInGameServerSystem : ISystem
entityCommandBuffer.SetComponent(playerEntity, LocalTransform.FromPosition(new float3( entityCommandBuffer.SetComponent(playerEntity, LocalTransform.FromPosition(new float3(
UnityEngine.Random.Range(-10, +10), 0, 0))); UnityEngine.Random.Range(-10, +10), 0, 0)));
// Instantiate camera entity and set it to follow the player
Entity cameraEntity = entityCommandBuffer.CreateEntity();
entityCommandBuffer.AddComponent(cameraEntity, new CameraFollow { PlayerEntity = playerEntity });
// Add GhostOwner component to connecting player that sent the connection rpc // Add GhostOwner component to connecting player that sent the connection rpc
NetworkId networkId = SystemAPI.GetComponent<NetworkId>(receiveRpcCommandRequest.ValueRO.SourceConnection); NetworkId networkId = SystemAPI.GetComponent<NetworkId>(receiveRpcCommandRequest.ValueRO.SourceConnection);
entityCommandBuffer.AddComponent(playerEntity, new GhostOwner entityCommandBuffer.AddComponent(playerEntity, new GhostOwner
...@@ -57,6 +53,11 @@ partial struct GoInGameServerSystem : ISystem ...@@ -57,6 +53,11 @@ partial struct GoInGameServerSystem : ISystem
{ {
Value = playerEntity Value = playerEntity
}); });
Animator animator = authoring.playerPrefabGameObject.GetComponent<Animator>();
entityCommandBuffer.AddComponent(playerEntity, new AnimatorComponent
{
animatorEntity = animator
});
} }
entityCommandBuffer.Playback(state.EntityManager); entityCommandBuffer.Playback(state.EntityManager);
......
using Unity.Burst;
using Unity.Entities;
using Unity.NetCode;
using Unity.NetCode.Hybrid;
using UnityEngine;
[WorldSystemFilter(WorldSystemFilterFlags.ClientSimulation)]
partial struct ClientCameraSystem : ISystem
{
[BurstCompile]
public void OnCreate(ref SystemState state)
{
state.RequireForUpdate<NetworkId>();
}
[BurstCompile]
public void OnUpdate(ref SystemState state)
{
var ghostPresentationGameObjectSystem =
state.World.GetExistingSystemManaged<GhostPresentationGameObjectSystem>();
var entityManager = state.EntityManager;
foreach (var (cameraFollow, entity) in SystemAPI.Query<RefRO<CameraFollow>>().WithEntityAccess())
{
GameObject cameraGameObject =
ghostPresentationGameObjectSystem.GetGameObjectForEntity(entityManager, entity);
if (cameraGameObject != null)
{
Camera cameraComponent = cameraGameObject.GetComponent<Camera>();
if (cameraComponent != null)
{
// Set the camera's tag to "MainCamera"
cameraComponent.tag = "MainCamera";
}
}
}
}
[BurstCompile]
public void OnDestroy(ref SystemState state)
{
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 82663c2222578814994ce647df9487fd
\ No newline at end of file
...@@ -15,11 +15,10 @@ partial struct NetcodePlayerMovementSystem : ISystem ...@@ -15,11 +15,10 @@ partial struct NetcodePlayerMovementSystem : ISystem
float deltaTime = SystemAPI.Time.DeltaTime; float deltaTime = SystemAPI.Time.DeltaTime;
foreach ((RefRO<NetcodePlayerInput> netcodePlayerInput, RefRW<PhysicsVelocity> physicsVelocity, foreach ((RefRO<NetcodePlayerInput> netcodePlayerInput, RefRW<PhysicsVelocity> physicsVelocity,
RefRW<LocalTransform> localTransform, RefRW<PlayerSprintData> sprintData, RefRW<LocalTransform> localTransform, RefRW<PlayerSprintData> sprintData)
RefRO<CameraFollow> cameraFollow)
in SystemAPI in SystemAPI
.Query<RefRO<NetcodePlayerInput>, RefRW<PhysicsVelocity>, RefRW<LocalTransform>, .Query<RefRO<NetcodePlayerInput>, RefRW<PhysicsVelocity>, RefRW<LocalTransform>,
RefRW<PlayerSprintData>, RefRO<CameraFollow>>() RefRW<PlayerSprintData>>()
.WithAll<Simulate>()) .WithAll<Simulate>())
{ {
Debug.Log("Updating player movement and camera follow"); Debug.Log("Updating player movement and camera follow");
...@@ -65,21 +64,6 @@ partial struct NetcodePlayerMovementSystem : ISystem ...@@ -65,21 +64,6 @@ partial struct NetcodePlayerMovementSystem : ISystem
quaternion targetRotation = quaternion.LookRotationSafe(moveVector, math.up()); quaternion targetRotation = quaternion.LookRotationSafe(moveVector, math.up());
localTransform.ValueRW.Rotation = math.slerp(localTransform.ValueRO.Rotation, targetRotation, 0.1f); localTransform.ValueRW.Rotation = math.slerp(localTransform.ValueRO.Rotation, targetRotation, 0.1f);
} }
// Update camera position and FOV
Entity playerEntity = cameraFollow.ValueRO.PlayerEntity;
if (SystemAPI.HasComponent<LocalTransform>(playerEntity))
{
LocalTransform playerTransform = SystemAPI.GetComponent<LocalTransform>(playerEntity);
float3 cameraPosition = playerTransform.Position + new float3(0, 2, -5);
SystemAPI.SetComponent(cameraFollow.ValueRO.PlayerEntity,
new LocalTransform { Position = cameraPosition });
// Update camera FOV
Camera.main.fieldOfView = math.lerp(Camera.main.fieldOfView,
sprintData.ValueRO.isSprinting ? sprintData.ValueRO.sprintFOV : sprintData.ValueRO.walkFOV,
sprintData.ValueRO.sprintFOVStepTime * deltaTime);
}
} }
} }
} }
\ No newline at end of file
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2376445730206303677
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6741873514663611567}
m_Layer: 0
m_Name: CameraPlaceHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6741873514663611567
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2376445730206303677}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7195082344447918016}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3267308807423638287
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7195082344447918016}
- component: {fileID: 8450112637079469256}
- component: {fileID: 1029725699609957031}
- component: {fileID: 9098028615180694892}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7195082344447918016
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3267308807423638287}
serializedVersion: 2
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalPosition: {x: 0, y: 7, z: -9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6741873514663611567}
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
--- !u!20 &8450112637079469256
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3267308807423638287}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &1029725699609957031
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3267308807423638287}
m_Enabled: 1
--- !u!114 &9098028615180694892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3267308807423638287}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
fileFormatVersion: 2
guid: 4e5cb8aa1739e0e4e9f39ec61f344ee2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -16,6 +16,7 @@ GameObject: ...@@ -16,6 +16,7 @@ GameObject:
- component: {fileID: -202488746562016087} - component: {fileID: -202488746562016087}
- component: {fileID: -6588502853141303043} - component: {fileID: -6588502853141303043}
- component: {fileID: 4663103396279588658} - component: {fileID: 4663103396279588658}
- component: {fileID: 7308881765750536992}
m_Layer: 0 m_Layer: 0
m_Name: Cube m_Name: Cube
m_TagString: Untagged m_TagString: Untagged
...@@ -174,7 +175,7 @@ Rigidbody: ...@@ -174,7 +175,7 @@ Rigidbody:
m_UseGravity: 1 m_UseGravity: 1
m_IsKinematic: 0 m_IsKinematic: 0
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 0 m_Constraints: 84
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!114 &4663103396279588658 --- !u!114 &4663103396279588658
MonoBehaviour: MonoBehaviour:
...@@ -188,3 +189,25 @@ MonoBehaviour: ...@@ -188,3 +189,25 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a82f6d8766908894faabdee547539756, type: 3} m_Script: {fileID: 11500000, guid: a82f6d8766908894faabdee547539756, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
sprintRemaining: 5
sprintDuration: 5
sprintSpeed: 12
walkSpeed: 9
sprintCooldownReset: 2
sprintFOV: 90
walkFOV: 60
sprintFOVStepTime: 0.1
--- !u!114 &7308881765750536992
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2899838405596494908}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 725f443b46fd3448e9c957fb78798883, type: 3}
m_Name:
m_EditorClassIdentifier:
ServerPrefab: {fileID: 0}
ClientPrefab: {fileID: 2376445730206303677, guid: 4e5cb8aa1739e0e4e9f39ec61f344ee2, type: 3}
fileFormatVersion: 2
guid: 7ea025f0d02f62a4b8c0db52b410e781
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -129,7 +129,6 @@ GameObject: ...@@ -129,7 +129,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 330585546} - component: {fileID: 330585546}
- component: {fileID: 330585545} - component: {fileID: 330585545}
- component: {fileID: 330585544}
- component: {fileID: 330585547} - component: {fileID: 330585547}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
...@@ -138,14 +137,6 @@ GameObject: ...@@ -138,14 +137,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!81 &330585544
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
m_Enabled: 1
--- !u!20 &330585545 --- !u!20 &330585545
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -219,7 +219,8 @@ MonoBehaviour: ...@@ -219,7 +219,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2ec9ef53cb793a488a58d261a7220bb, type: 3} m_Script: {fileID: 11500000, guid: c2ec9ef53cb793a488a58d261a7220bb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
playerPrefabGameObject: {fileID: 2899838405596494908, guid: 90328a79d7583f749a2b13d989efcaa8, type: 3} playerPrefabGameObject: {fileID: 5874026590232167095, guid: 7ea025f0d02f62a4b8c0db52b410e781, type: 3}
animatorReference: {fileID: 0}
--- !u!4 &1434796876 --- !u!4 &1434796876
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -551,6 +551,9 @@ PlayerSettings: ...@@ -551,6 +551,9 @@ PlayerSettings:
- serializedVersion: 3 - serializedVersion: 3
m_BuildTarget: Android m_BuildTarget: Android
m_Formats: 03000000 m_Formats: 03000000
- serializedVersion: 3
m_BuildTarget: WebGL
m_Formats: 05000000
playModeTestRunnerEnabled: 0 playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0 runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1 actionOnDotNetUnhandledException: 1
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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 sign in to comment