diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 3f01468aa..67d3ae8e3 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: bc074d00982114f0388e9c98de91d44f m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: ef672e941747c2eb6b19db828d740a6a m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_SKELETON_Archer_Armor.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_SKELETON_Archer_Armor.mat index 37779eb01..949a186a9 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_SKELETON_Archer_Armor.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_SKELETON_Archer_Armor.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - NOSMap: - m_Texture: {fileID: 2800000, guid: cb93af6693b870d49897e61b1ddfe971, type: 3} + m_Texture: {fileID: 2800000, guid: c80c04498921fd246a72aa77e9f240b7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -118,8 +118,8 @@ Material: - EffectStrenght: 1 - FresnelPower: 4 - Metalness: 1 - - NormalStrength: 1 - - Smoothness: 1 + - NormalStrength: 0.93 + - Smoothness: 0.17 - USEDISSOLVE: 0 - USEDISSOLVEMASK: 0 - USEFRESNEL: 0 diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_Arrow.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_Arrow.mat index 0339b5d45..3d0202977 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_Arrow.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_Arrow.mat @@ -67,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9a0aa9864ba7fb540811ca3a8f2f1746, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_BOW.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_BOW.mat index 29fb08ecb..e02cb9c9e 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_BOW.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/MAT_Skeleton_Archer_BOW.mat @@ -54,7 +54,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f8054e28a9effb148b5d37cd861e87eb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_Black.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_Black.mat index ac9d0a1ab..11f959d51 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_Black.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_Black.mat @@ -67,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4687bd295cf1b594cb3469b8d5f98eff, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_SandMoss.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_SandMoss.mat index 5bb667d1b..a4df7f3a0 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_SandMoss.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skeleton_SandMoss.mat @@ -54,7 +54,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4b8b87b93cfc0b342bb2b5611c17d5a2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_Black.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_Black.mat index 952b2a6da..8f87b2347 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_Black.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_Black.mat @@ -67,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ce5f046f8f05e8d458373b2aa360c22e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -135,7 +135,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_SandMoss.mat b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_SandMoss.mat index 4a4b32337..c6dcb6d6b 100644 --- a/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_SandMoss.mat +++ b/Assets/Meshes/Characters/SkeletonArcher/Materials/M_SK_Skull_SandMoss.mat @@ -67,7 +67,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 758a703bc12fc9a4d886a94d3aa0cb64, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New.meta b/Assets/Meshes/Characters/SkeletonArcher/New.meta new file mode 100644 index 000000000..341f7b26b --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cda90a90ce0bc77458c7c06efe84d9ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx new file mode 100644 index 000000000..81d5411e7 Binary files /dev/null and b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx differ diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx.meta b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx.meta new file mode 100644 index 000000000..731df8975 --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.fbx.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 5c5461e6f4e356840bceaf8d75b6f8a4 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: archer' + second: {fileID: 2100000, guid: a689282590bf32c4baa9c3d0afbfaa53, type: 2} + 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: 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: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat new file mode 100644 index 000000000..299c71069 --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat @@ -0,0 +1,187 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3689412044697197916 +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: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Archer + m_Shader: {fileID: -6465566751694194690, guid: 00a0b3897399f8b42a61a0333dd40ced, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - BASETEXTYPE_ALBEDO_METALNESS + - USEDISSOLVE_DONT_USE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - BaseTex: + m_Texture: {fileID: 2800000, guid: b61d5d487299cb6408b9047c5834be0a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - DissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - NOSMap: + m_Texture: {fileID: 2800000, guid: 58d7b019e50f40047a40418a63ddae01, type: 3} + 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} + - _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} + - _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: + - AOStrength: 3 + - AlphaClipThreshold: 0.5 + - BASETEXTYPE: 1 + - DissolveNoiseScale: 25 + - EffectStrenght: 1 + - FresnelPower: 4 + - Metalness: 0.41 + - NormalStrength: 0.66 + - Smoothness: 1.05 + - USEDISSOLVE: 0 + - USEDISSOLVEMASK: 0 + - USEFRESNEL: 0 + - Vector1_473704f964214ae2bc68475022d1524b: 0 + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BendEffect: 0 + - _BendMaxDistance: 1 + - _BendMaxHeight: 0 + - _BendMinDistance: 0.2 + - _BendMinHeight: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EffectThreshold: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 0 + - _FarFadeDistance: 500 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _InverseFadeRange: 1 + - _InverseFarFadeRange: 0.5 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Threshold: 0.321 + - _USEDISTANCEFADE: 0 + - _USESCANWAVE: 0 + - _WaveTrail: 4 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} + - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BendVector: {r: 0, g: -1, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FresnelColor: {r: 0, g: 0.7294118, b: 1, a: 0} + - _ScanWaveColor: {r: 0, g: 0.5949242, b: 1, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat.meta b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat.meta new file mode 100644 index 000000000..a665020ba --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a689282590bf32c4baa9c3d0afbfaa53 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab new file mode 100644 index 000000000..d36b77d5c --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab @@ -0,0 +1,106 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3553532158861907825 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.1457436 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalPosition.y + value: 39.439903 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalPosition.z + value: -32.382477 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_Name + value: Archer + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.46396932 + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.46396932 + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5336033 + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5336033 + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3406328984311925189, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 97.986 + objectReference: {fileID: 0} + - target: {fileID: 7142933970241471619, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.271 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: -3068240195741245191, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c5461e6f4e356840bceaf8d75b6f8a4, type: 3} diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab.meta b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab.meta new file mode 100644 index 000000000..fc5edba15 --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0f498b915e14cd4782a9f86adb05b2e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga new file mode 100644 index 000000000..c834c879d Binary files /dev/null and b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga differ diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga.meta b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga.meta new file mode 100644 index 000000000..d777b1f10 --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_AM.tga.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: b61d5d487299cb6408b9047c5834be0a +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: 2 + 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: 8192 + 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: 8192 + 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: iOS + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: 51 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 8192 + 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: WindowsStoreApps + maxTextureSize: 8192 + 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: diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga new file mode 100644 index 000000000..5fd66b162 Binary files /dev/null and b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga differ diff --git a/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga.meta b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga.meta new file mode 100644 index 000000000..bd344df5d --- /dev/null +++ b/Assets/Meshes/Characters/SkeletonArcher/New/Archer_Nos.tga.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 58d7b019e50f40047a40418a63ddae01 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 2 + 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: 8192 + 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: 8192 + 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: iOS + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: 49 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 8192 + 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: WindowsStoreApps + maxTextureSize: 8192 + 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: diff --git a/Assets/Scenes/Land_01/Land_01/LightingData.asset b/Assets/Scenes/Land_01/Land_01/LightingData.asset index 76de94d5e..343318623 100644 Binary files a/Assets/Scenes/Land_01/Land_01/LightingData.asset and b/Assets/Scenes/Land_01/Land_01/LightingData.asset differ diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.meta b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.meta new file mode 100644 index 000000000..36fe1f428 --- /dev/null +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f61c9199e4464ab4d91e225e848f4d2d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity index c0156a460..c7c7dd082 100644 --- a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity @@ -1410,7 +1410,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: b4025476296c9fa4a8a580da7413c1fa, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: b4025476296c9fa4a8a580da7413c1fa, type: 3} m_PlayOnAwake: 1 m_Volume: 0.699 @@ -9320,7 +9320,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 1e4b0e071ddb182409a8d3a0d56d4551, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 1e4b0e071ddb182409a8d3a0d56d4551, type: 3} m_PlayOnAwake: 1 m_Volume: 0.393 @@ -19185,6 +19185,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aa8088f81fa59404e9262abeb1733302, type: 3} +--- !u!43 &134296466 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &134573149 PrefabInstance: m_ObjectHideFlags: 0 @@ -37931,171 +38096,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 269125329} m_PrefabAsset: {fileID: 0} ---- !u!43 &269145220 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &269214344 GameObject: m_ObjectHideFlags: 0 @@ -45571,7 +45571,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 49830fd68c192e64b9c958257bdc5ed0, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 49830fd68c192e64b9c958257bdc5ed0, type: 3} m_PlayOnAwake: 1 m_Volume: 0.472 @@ -49138,171 +49138,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!43 &368403705 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &368436484 PrefabInstance: m_ObjectHideFlags: 0 @@ -61856,7 +61691,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 296f99edbd32aa8449c4a735ea8e6a7b, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 296f99edbd32aa8449c4a735ea8e6a7b, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -63600,6 +63435,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1451923769} m_PrefabAsset: {fileID: 0} +--- !u!1001 &463641082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalPosition.x + value: -25.753134 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalPosition.y + value: 39.877434 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalPosition.z + value: -62.646156 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1e669c006f89a7747ac94b4fe77a02a8, + type: 3} + propertyPath: m_Name + value: SM_Skeleton_Archer_Bow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1e669c006f89a7747ac94b4fe77a02a8, type: 3} --- !u!4 &465491641 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -73831,7 +73734,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 25eccea534bbc83469193d59a4095b69, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 25eccea534bbc83469193d59a4095b69, type: 3} m_PlayOnAwake: 1 m_Volume: 0.424 @@ -81484,7 +81387,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 1b777f61fb6ba1e44bcdd484f5acf914, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 1b777f61fb6ba1e44bcdd484f5acf914, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -114246,7 +114149,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3b34a8921a684b74db2296e7a7138d67, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 3b34a8921a684b74db2296e7a7138d67, type: 3} m_PlayOnAwake: 1 m_Volume: 0.951 @@ -121353,7 +121256,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 357d944d4d031954daec21ebdc503313, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 357d944d4d031954daec21ebdc503313, type: 3} m_PlayOnAwake: 1 m_Volume: 0.964 @@ -131805,7 +131708,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 8d525a472463f4640996abe32393313e, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 8d525a472463f4640996abe32393313e, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -139130,7 +139033,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: c5c51116803b87e41905fa25d318dde5, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: c5c51116803b87e41905fa25d318dde5, type: 3} m_PlayOnAwake: 1 m_Volume: 0.806 @@ -149291,6 +149194,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} +--- !u!43 &990119750 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!4 &991198253 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -169605,7 +169673,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: e52f8c067dfcf3a4399db196c2c6d545, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: e52f8c067dfcf3a4399db196c2c6d545, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -171487,7 +171555,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: f93f6a00f5c3c204eb0f3c655519f738, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: f93f6a00f5c3c204eb0f3c655519f738, type: 3} m_PlayOnAwake: 1 m_Volume: 0.559 @@ -173825,7 +173893,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 4a4bd87dd2fc4104ebca6af8a2918a72, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 4a4bd87dd2fc4104ebca6af8a2918a72, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -174515,7 +174583,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 6c3e4871e45bb33419cb5025dd781387, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 6c3e4871e45bb33419cb5025dd781387, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -185871,39 +185939,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cae3332d4415b0942abbb84de23167e9, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1272709387 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!4 &1272806773 stripped Transform: m_CorrespondingSourceObject: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, @@ -196074,7 +196109,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 307a895df619bfc4285d77f4392bd56e, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 307a895df619bfc4285d77f4392bd56e, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -203592,70 +203627,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1429971313} m_PrefabAsset: {fileID: 0} ---- !u!21 &1429978191 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, 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: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1430747139 PrefabInstance: m_ObjectHideFlags: 0 @@ -203975,7 +203946,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: f5949e4ff6da72044bf7898a954ff21e, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: f5949e4ff6da72044bf7898a954ff21e, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -207960,7 +207931,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 357d944d4d031954daec21ebdc503313, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 357d944d4d031954daec21ebdc503313, type: 3} m_PlayOnAwake: 1 m_Volume: 0.699 @@ -226673,7 +226644,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 3020ad8190ce16f419a0f6c4d68f9d04, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 3020ad8190ce16f419a0f6c4d68f9d04, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -236001,7 +235972,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: bbd36ddc1a443964b96aab7ee5d72dfd, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: bbd36ddc1a443964b96aab7ee5d72dfd, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -237884,6 +237855,39 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1681403707} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1681566632 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1681580781 stripped GameObject: m_CorrespondingSourceObject: {fileID: -4399891612035454117, guid: 1b1e6ad5c7db50147a373759a5c99495, @@ -308042,7 +308046,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 1dad2a4f6871c464c93f7660cec8b5aa, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 1dad2a4f6871c464c93f7660cec8b5aa, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -308346,6 +308350,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1368983887} m_PrefabAsset: {fileID: 0} +--- !u!21 &1800962672 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, 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: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &1801754751 PrefabInstance: m_ObjectHideFlags: 0 @@ -313143,7 +313211,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 8b57cdbdc26c0ff4687a14aa72ab330d, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 8b57cdbdc26c0ff4687a14aa72ab330d, type: 3} m_PlayOnAwake: 0 m_Volume: 0.578 @@ -324827,7 +324895,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 1764add594a676549871c78aa7a9de5a, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 1764add594a676549871c78aa7a9de5a, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -338498,7 +338566,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 380248093711829479ed41b346a9e952, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 380248093711829479ed41b346a9e952, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -362188,7 +362256,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 506bcf53549268a4e9b31010481a9988, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 506bcf53549268a4e9b31010481a9988, type: 3} m_PlayOnAwake: 1 m_Volume: 0.45 @@ -362285,7 +362353,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2ad8eae3432ffb34c82e8c651492866a, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2ad8eae3432ffb34c82e8c651492866a, type: 3} m_PlayOnAwake: 1 m_Volume: 0.3 @@ -427272,7 +427340,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 4de10fe946c94ba468c8c1bfe7b699d6, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 4de10fe946c94ba468c8c1bfe7b699d6, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -427369,7 +427437,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: a4ba3bee30c6b8c438c9f04d8183f62b, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: a4ba3bee30c6b8c438c9f04d8183f62b, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -427466,7 +427534,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: fe3b797ec81f61d4daf3032fd0980b1e, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: fe3b797ec81f61d4daf3032fd0980b1e, type: 3} m_PlayOnAwake: 1 m_Volume: 0.5 @@ -427563,7 +427631,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 970310f055326d448b6a2820a0e5f346, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 970310f055326d448b6a2820a0e5f346, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -429378,7 +429446,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1272709387} + - {fileID: 1681566632} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -429471,7 +429539,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1429978191} + overrideMaterial: {fileID: 1800962672} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -446731,6 +446799,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8521783974209190824} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8542954578330113211 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.1457436 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.y + value: 39.439903 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.z + value: -32.382477 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4436546435523619360, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_Name + value: Archer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d0f498b915e14cd4782a9f86adb05b2e, type: 3} --- !u!1001 &8581452079231753833 PrefabInstance: m_ObjectHideFlags: 0 @@ -447338,3 +447474,5 @@ SceneRoots: - {fileID: 2003764685} - {fileID: 1479116614} - {fileID: 782184311} + - {fileID: 463641082} + - {fileID: 8542954578330113211} diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr new file mode 100644 index 000000000..7d5794bd0 Binary files /dev/null and b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr differ diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr.meta b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr.meta new file mode 100644 index 000000000..d944062e2 --- /dev/null +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02/ReflectionProbe-30.exr.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: e24a308f2b96b874aa37f8033e8a3389 +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: 2 + 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: 8192 + 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: 8192 + 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: iOS + maxTextureSize: 8192 + 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: Android + maxTextureSize: 8192 + 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: WindowsStoreApps + maxTextureSize: 8192 + 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: diff --git a/Assets/Scenes/Temple/Temple.unity b/Assets/Scenes/Temple/Temple.unity index 649d8f6ce..0ab7e40f0 100644 --- a/Assets/Scenes/Temple/Temple.unity +++ b/Assets/Scenes/Temple/Temple.unity @@ -15644,7 +15644,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 6c01d9cc1b49f3142880339ee1dd92e6, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 6c01d9cc1b49f3142880339ee1dd92e6, type: 3} m_PlayOnAwake: 1 m_Volume: 0.7 @@ -24332,6 +24332,127 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121983614} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &123449935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 123449938} + - component: {fileID: 123449937} + - component: {fileID: 123449936} + m_Layer: 0 + m_Name: Point Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &123449936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123449935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &123449937 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123449935} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 0.75 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &123449938 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123449935} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 110.488, y: 31.739, z: 85.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &123615071 PrefabInstance: m_ObjectHideFlags: 0 @@ -51480,7 +51601,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 7b7cb8cc5a1480645be677cfdecbdf6e, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 7b7cb8cc5a1480645be677cfdecbdf6e, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -58751,7 +58872,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 49830fd68c192e64b9c958257bdc5ed0, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 49830fd68c192e64b9c958257bdc5ed0, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -76540,7 +76661,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2ef67440dfb33de458d8099ace3decc8, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2ef67440dfb33de458d8099ace3decc8, type: 3} m_PlayOnAwake: 1 m_Volume: 0.513 @@ -80899,7 +81020,7 @@ MonoBehaviour: m_triggersToFire: [] m_delay: -1 m_actionResponse: - barkText: + barkConversation: audioClip: {fileID: 0} responseEvent: m_PersistentCalls: @@ -157625,7 +157746,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: af172dc77da16724c8e95be6424779b4, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: af172dc77da16724c8e95be6424779b4, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -158049,6 +158170,171 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &484523815 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 020001000000030001000200 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 192 + _typelessdata: 000000bf000000bf000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f000000000000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &484586245 GameObject: m_ObjectHideFlags: 0 @@ -158247,7 +158533,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 6c01d9cc1b49f3142880339ee1dd92e6, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 6c01d9cc1b49f3142880339ee1dd92e6, type: 3} m_PlayOnAwake: 1 m_Volume: 0.7 @@ -158344,7 +158630,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: ac34990831054984d9d97419823c3045, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: ac34990831054984d9d97419823c3045, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -158553,7 +158839,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.06333333 + m_VoxelSize: 0.17666666 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 1f7f236e0c53c0148bbe08dc49f3790d, type: 2} m_BuildHeightMesh: 0 @@ -202887,7 +203173,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 8ed4a708262d2144ab52600f7e4de6bc, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 8ed4a708262d2144ab52600f7e4de6bc, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -206004,6 +206290,70 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 741335021} m_PrefabAsset: {fileID: 0} +--- !u!21 &742949013 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, 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: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &744579679 GameObject: m_ObjectHideFlags: 0 @@ -234388,7 +234738,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} m_PlayOnAwake: 1 m_Volume: 0.2 @@ -235248,39 +235598,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d08d71a791dc804da55a32c223b70a8, type: 3} ---- !u!21 &833416910 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &833506579 PrefabInstance: m_ObjectHideFlags: 0 @@ -256017,70 +256334,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 927f89aaaa69590449d08aa5447f6cc2, type: 3} ---- !u!21 &921587923 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, 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: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &922792414 GameObject: m_ObjectHideFlags: 0 @@ -374984,171 +375237,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1419015360} m_PrefabAsset: {fileID: 0} ---- !u!43 &1419576513 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 020001000000030001000200 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 192 - _typelessdata: 000000bf000000bf000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000003f000000bf000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f00000000000000bf0000003f000000000000000000000000000080bf0000803f0000000000000000000080bf000000000000803f0000003f0000003f000000000000000000000000000080bf0000803f0000000000000000000080bf0000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!4 &1419822682 stripped Transform: m_CorrespondingSourceObject: {fileID: 5237531794545035538, guid: b93af48373966ec42930bab7e5559c91, @@ -383185,6 +383273,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 + fireOnce: 1 condition: luaConditions: [] questConditions: [] @@ -402869,7 +402958,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2afda35ffd508dd4f9558c28d7b44e49, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2afda35ffd508dd4f9558c28d7b44e49, type: 3} m_PlayOnAwake: 0 m_Volume: 0.951 @@ -410790,7 +410879,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 78b4f2d36eb9fc54bb9153fd8b3bb03a, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 78b4f2d36eb9fc54bb9153fd8b3bb03a, type: 3} m_PlayOnAwake: 1 m_Volume: 0.758 @@ -466678,7 +466767,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2fb705de38038134b828d7361b9d5654, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2fb705de38038134b828d7361b9d5654, type: 3} m_PlayOnAwake: 0 m_Volume: 0.482 @@ -497086,7 +497175,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: f1b96dbab465bee4cb2af393e2447df4, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: f1b96dbab465bee4cb2af393e2447df4, type: 3} m_PlayOnAwake: 1 m_Volume: 0.258 @@ -498919,7 +499008,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5b72172a1aa0d4346b63bbde3510071c, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5b72172a1aa0d4346b63bbde3510071c, type: 3} m_PlayOnAwake: 1 m_Volume: 0.3 @@ -499845,6 +499934,89 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1001 &1889710331 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1768 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2099859 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1768 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.x + value: 112.16 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.y + value: 30.159075 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalPosition.z + value: 85.85 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.24944055 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9683901 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -208.889 + objectReference: {fileID: 0} + - target: {fileID: 3952497833887232154, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4436546435523619360, guid: d0f498b915e14cd4782a9f86adb05b2e, + type: 3} + propertyPath: m_Name + value: Archer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d0f498b915e14cd4782a9f86adb05b2e, type: 3} --- !u!1001 &1890433586 PrefabInstance: m_ObjectHideFlags: 0 @@ -528657,7 +528829,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: ac34990831054984d9d97419823c3045, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: ac34990831054984d9d97419823c3045, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -542560,7 +542732,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} m_PlayOnAwake: 1 m_Volume: 0.5 @@ -544709,6 +544881,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 23a159559436b754a8829a1c7244eb31, type: 3} +--- !u!21 &2032237968 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3001 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &2032401913 GameObject: m_ObjectHideFlags: 0 @@ -558098,6 +558303,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c94132541291a1a47a416e2c4ba2be3c, type: 3} m_Name: m_EditorClassIdentifier: + _cameraToLookAt: {fileID: 0} + _rotationSpeed: 20 + _lockXAxis: 0 --- !u!64 &2106045602 MeshCollider: m_ObjectHideFlags: 0 @@ -570478,7 +570686,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2fb705de38038134b828d7361b9d5654, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2fb705de38038134b828d7361b9d5654, type: 3} m_PlayOnAwake: 0 m_Volume: 0.482 @@ -570968,7 +571176,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, type: 2} - m_audioClip: {fileID: 8300000, guid: 81b5d0c5c1fca2f4eb3b3bd0ee1dd0d6, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 81b5d0c5c1fca2f4eb3b3bd0ee1dd0d6, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -573338,7 +573546,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} m_PlayOnAwake: 1 m_Volume: 0.5 @@ -573435,7 +573643,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5b72172a1aa0d4346b63bbde3510071c, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5b72172a1aa0d4346b63bbde3510071c, type: 3} m_PlayOnAwake: 1 m_Volume: 0.3 @@ -573532,7 +573740,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 5d5b941cfce04954f989fd6741e2c47f, type: 3} m_PlayOnAwake: 1 m_Volume: 0.2 @@ -607776,7 +607984,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 2afda35ffd508dd4f9558c28d7b44e49, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 2afda35ffd508dd4f9558c28d7b44e49, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -607873,7 +608081,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 6632b24a705d37d46863cddc8a84f80a, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 6632b24a705d37d46863cddc8a84f80a, type: 3} m_PlayOnAwake: 1 m_Volume: 0.4 @@ -799908,3 +800116,5 @@ SceneRoots: - {fileID: 1951776215} - {fileID: 311087917} - {fileID: 2049879729} + - {fileID: 1889710331} + - {fileID: 123449938} diff --git a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat index 9740a57b1..0d5d08ae0 100644 --- a/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat +++ b/Assets/ThirdParty/PARTICLES/EffectExamples/Fire & Explosion Effects/Materials/SmokeDark.mat @@ -130,7 +130,7 @@ Material: - _BaseColor: {r: 1, g: 0.524691, b: 0.07075471, a: 0.48235294} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 0.5246909, b: 0.070754685, a: 0.48235294} + - _Color: {r: 1, g: 0.524691, b: 0.070754685, a: 0.48235294} - _EmisColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.030037379, g: 0.045851335, b: 0.14150941, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0}