diff --git a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend b/Assets/Desert/Assets/Models/Desert Portal Entrance.blend deleted file mode 100644 index 5056ab0..0000000 --- a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7443b4d8edb5c7d83707ad2f3b98dccb0d6b3198e807725aa98421ead73ba24b -size 836284 diff --git a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend.meta b/Assets/Desert/Assets/Models/Desert Portal Entrance.blend.meta deleted file mode 100644 index cdfa2aa..0000000 --- a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: a888d535ef5e563418cb8711b9de7c16 -ModelImporter: - serializedVersion: 22103 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - 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/Desert/Assets/Models/Desert Portal Entrance.blend1 b/Assets/Desert/Assets/Models/Desert Portal Entrance.blend1 deleted file mode 100644 index 5d819fe..0000000 Binary files a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend1 and /dev/null differ diff --git a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend1.meta b/Assets/Desert/Assets/Models/Desert Portal Entrance.blend1.meta deleted file mode 100644 index cd3ff1f..0000000 --- a/Assets/Desert/Assets/Models/Desert Portal Entrance.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2f3f769c25a9fc5418ae33af985d27b4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Desert/Assets/Models/Desert Portal.fbx b/Assets/Desert/Assets/Models/Desert Portal Exit.fbx similarity index 100% rename from Assets/Desert/Assets/Models/Desert Portal.fbx rename to Assets/Desert/Assets/Models/Desert Portal Exit.fbx diff --git a/Assets/Desert/Assets/Models/Desert Portal.fbx.meta b/Assets/Desert/Assets/Models/Desert Portal Exit.fbx.meta similarity index 100% rename from Assets/Desert/Assets/Models/Desert Portal.fbx.meta rename to Assets/Desert/Assets/Models/Desert Portal Exit.fbx.meta diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend b/Assets/Desert/Assets/Models/Desert Portal.blend index e2236a9..15766aa 100644 --- a/Assets/Desert/Assets/Models/Desert Portal.blend +++ b/Assets/Desert/Assets/Models/Desert Portal.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1d4006ede0e160fa6ea162935c85fb8ee9267e8abdc51593ac58e9174c2d5a1 -size 833340 +oid sha256:8b33453ef10342c8972321be7c23b10e675632a9935ee9683473a963385cf667 +size 887896 diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend.meta b/Assets/Desert/Assets/Models/Desert Portal.blend.meta index b90aab5..cdfa2aa 100644 --- a/Assets/Desert/Assets/Models/Desert Portal.blend.meta +++ b/Assets/Desert/Assets/Models/Desert Portal.blend.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7eca167732b5f14f8c5a02cd047269e +guid: a888d535ef5e563418cb8711b9de7c16 ModelImporter: serializedVersion: 22103 internalIDToNameTable: [] diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend1 b/Assets/Desert/Assets/Models/Desert Portal.blend1 index cb45b46..5782022 100644 Binary files a/Assets/Desert/Assets/Models/Desert Portal.blend1 and b/Assets/Desert/Assets/Models/Desert Portal.blend1 differ diff --git a/Assets/Desert/Assets/Models/Desert Portal.blend1.meta b/Assets/Desert/Assets/Models/Desert Portal.blend1.meta index 2f4586f..cd3ff1f 100644 --- a/Assets/Desert/Assets/Models/Desert Portal.blend1.meta +++ b/Assets/Desert/Assets/Models/Desert Portal.blend1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 181d9e6374159aa4caa3f10a8766a1e9 +guid: 2f3f769c25a9fc5418ae33af985d27b4 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab index 3afe2d2..4317eec 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab @@ -135,7 +135,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6999744959693749346} - m_Mesh: {fileID: -736705322553183538, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} + m_Mesh: {fileID: -7031481941948737425, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} --- !u!23 &6419237152131296747 MeshRenderer: m_ObjectHideFlags: 0 @@ -409,7 +409,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9139844951969793274} - m_Mesh: {fileID: 9003373353170815796, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} + m_Mesh: {fileID: 8693591594648022221, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} --- !u!23 &4905517471767474057 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab index 4cf6509..2074681 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab @@ -40,7 +40,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698537097821251252} - m_Mesh: {fileID: -736705322553183538, guid: d7eca167732b5f14f8c5a02cd047269e, type: 3} + m_Mesh: {fileID: -6535995738390492784, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} --- !u!23 &3566871879873967933 MeshRenderer: m_ObjectHideFlags: 0 @@ -157,7 +157,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604096967460232748} - m_Mesh: {fileID: 9003373353170815796, guid: d7eca167732b5f14f8c5a02cd047269e, type: 3} + m_Mesh: {fileID: -8872235206753815164, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} --- !u!23 &3208325555222820191 MeshRenderer: m_ObjectHideFlags: 0