Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bullet obj #19

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2763078377617042940
--- !u!1 &1118150052885959608
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
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
m_Icon: {fileID: 0}
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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion G-Loop/Assets/Scenes/BloodyTest/Bullet.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions G-Loop/Assets/Scenes/BloodyTest/ExplosionTest.unity
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Binary file added G-Loop/Assets/Scenes/BloodyTest/bullet.blend
Binary file not shown.
102 changes: 102 additions & 0 deletions G-Loop/Assets/Scenes/BloodyTest/bullet.blend.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions G-Loop/Assets/Scenes/BloodyTest/bulletbottom.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions G-Loop/Assets/goose/Goose.blend1.meta

This file was deleted.