diff --git a/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab b/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab index f511f5b..d54df46 100644 --- a/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab +++ b/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2763078377617042940 +--- !u!1 &1118150052885959608 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,12 +8,12 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2763078377617042941} - - component: {fileID: 2763078377617042936} - - component: {fileID: 2763078377617042939} - - component: {fileID: 2763078377617042938} - - component: {fileID: 4101253799477182592} - - component: {fileID: 7280382694225085970} + - component: {fileID: 346679452638005506} + - component: {fileID: 3702096012129945255} + - component: {fileID: 1478460495176774253} + - component: {fileID: -8347697100571044502} + - component: {fileID: -2855454304570459421} + - component: {fileID: -2137533537657027190} m_Layer: 0 m_Name: Bullet m_TagString: Untagged @@ -21,35 +21,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2763078377617042941 +--- !u!4 &346679452638005506 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2.93} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_GameObject: {fileID: 1118150052885959608} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -7.5313153, y: 0.5072369, z: -1.2482693} + m_LocalScale: {x: 0.05, y: 0.05, z: 0.025} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2763078377617042936 +--- !u!33 &3702096012129945255 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2763078377617042939 + m_GameObject: {fileID: 1118150052885959608} + m_Mesh: {fileID: 2534964839176971238, guid: 8c9e038b7b34187728966dfb4d91b06d, type: 3} +--- !u!23 &1478460495176774253 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} + m_GameObject: {fileID: 1118150052885959608} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 3f7376d2d82da6e1ca4b056559b15dd3, type: 2} + - {fileID: 5547744084930128649, guid: 8c9e038b7b34187728966dfb4d91b06d, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,26 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &2763078377617042938 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.1, y: 0.1, z: 0.1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &4101253799477182592 +--- !u!54 &-8347697100571044502 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} + m_GameObject: {fileID: 1118150052885959608} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -113,13 +100,26 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &7280382694225085970 +--- !u!65 &-2855454304570459421 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118150052885959608} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.1, y: 0.1, z: 0.1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &-2137533537657027190 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2763078377617042940} + m_GameObject: {fileID: 1118150052885959608} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 988bd908f593572fdb7ab22f4890693f, type: 3} diff --git a/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab.meta b/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab.meta index 71d7715..89ccba2 100644 --- a/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab.meta +++ b/G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 783a62976afd1ff31a09c2d8de7a1a9a +guid: 9badee2be61d9d67b85e6d66faa3f5d8 PrefabImporter: externalObjects: {} userData: diff --git a/G-Loop/Assets/Scenes/BloodyTest/ExplosionTest.unity b/G-Loop/Assets/Scenes/BloodyTest/ExplosionTest.unity index 75e8e84..3ac30ee 100644 --- a/G-Loop/Assets/Scenes/BloodyTest/ExplosionTest.unity +++ b/G-Loop/Assets/Scenes/BloodyTest/ExplosionTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641222, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -636,6 +636,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fc4d6ad86a98b40bcbe934539dd935e3, type: 3} m_Name: m_EditorClassIdentifier: - gun: {fileID: 2763078377617042940, guid: 783a62976afd1ff31a09c2d8de7a1a9a, type: 3} + gun: {fileID: 1118150052885959608, guid: 9badee2be61d9d67b85e6d66faa3f5d8, type: 3} spawn: {fileID: 27831961} bullets: 3 diff --git a/G-Loop/Assets/Scenes/BloodyTest/bullet.blend b/G-Loop/Assets/Scenes/BloodyTest/bullet.blend new file mode 100644 index 0000000..5d92086 Binary files /dev/null and b/G-Loop/Assets/Scenes/BloodyTest/bullet.blend differ diff --git a/G-Loop/Assets/Scenes/BloodyTest/bullet.blend.meta b/G-Loop/Assets/Scenes/BloodyTest/bullet.blend.meta new file mode 100644 index 0000000..e3668e3 --- /dev/null +++ b/G-Loop/Assets/Scenes/BloodyTest/bullet.blend.meta @@ -0,0 +1,102 @@ +fileFormatVersion: 2 +guid: 8c9e038b7b34187728966dfb4d91b06d +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png b/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png new file mode 100644 index 0000000..9dcbc7f Binary files /dev/null and b/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png differ diff --git a/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png.meta b/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png.meta new file mode 100644 index 0000000..d9e7bf3 --- /dev/null +++ b/G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 7f45f83cbda92988cae63e5e194cac25 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/G-Loop/Assets/goose/Goose.blend1.meta b/G-Loop/Assets/goose/Goose.blend1.meta deleted file mode 100644 index ba2112f..0000000 --- a/G-Loop/Assets/goose/Goose.blend1.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 90bbdefd1f6453b81822dd580396262b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: