Skip to content

이채은_11.24_DevQuest #56

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.

Sign up for GitHub

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

Open
chaeeun17 wants to merge 1 commit into
base: 이채은
Choose a base branch
from
Open

이채은_11.24_DevQuest #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Assets/Prefabs/Bullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ SphereCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
Expand Down
3 changes: 2 additions & 1 deletion Assets/Prefabs/Enemy.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ CapsuleCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
Expand Down Expand Up @@ -559,6 +559,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
hpBar: {fileID: 2427864922095432129}
player: {fileID: 0}
--- !u!1 &2540466843666355466
GameObject:
m_ObjectHideFlags: 0
Expand Down
20 changes: 10 additions & 10 deletions Assets/Prefabs/Guns/Pistol 1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3181156925654399557}
Expand Down Expand Up @@ -226,9 +226,9 @@ MonoBehaviour:
m_StartingHoverFilters: []
m_StartingSelectFilters: []
m_StartingInteractionStrengthFilters: []
m_AttachTransform: {fileID: 0}
m_AttachTransform: {fileID: 6885512294752712852}
m_SecondaryAttachTransform: {fileID: 0}
m_UseDynamicAttach: 1
m_UseDynamicAttach: 0
m_MatchAttachPosition: 1
m_MatchAttachRotation: 1
m_SnapToColliderVolume: 1
Expand Down Expand Up @@ -275,7 +275,7 @@ MonoBehaviour:
m_StartingSingleGrabTransformers: []
m_StartingMultipleGrabTransformers: []
m_AddDefaultGrabTransformers: 1
m_FarAttachMode: 0
m_FarAttachMode: 1
--- !u!114 &7648209428267383372
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -293,7 +293,7 @@ MonoBehaviour:
type: 3}
HapticIntensity: 0.7
HapticDuration: 0.15
remainAmmunition: {fileID: 0}
remainAmmunition: {fileID: 102470327427809663}
--- !u!1 &3454284630827025653
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -320,17 +320,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3454284630827025653}
m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: -0.116}
m_LocalRotation: {x: 0.7071068, y: -0, z: 0.7071068, w: 0}
m_LocalPosition: {x: 0, y: 0, z: -0.121}
m_LocalScale: {x: 0.49999988, y: 0.5, z: 0.49999988}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8663852786078703706}
m_Father: {fileID: 3263699454365990613}
m_LocalEulerAnglesHint: {x: 90, y: -90, z: 0}
m_LocalEulerAnglesHint: {x: 180, y: -90, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0.054, y: 0.106}
m_AnchoredPosition: {x: -0.14, y: -0.047}
m_SizeDelta: {x: 0.6524, y: 0.5667}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &1409081377887830116
Expand Down Expand Up @@ -421,7 +421,7 @@ Transform:
m_GameObject: {fileID: 4918656606775223331}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.089, y: -0.06, z: 0}
m_LocalPosition: {x: -0.196, y: 0.071, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down
Loading