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.

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

장산범 준비 #148

Merged
merged 6 commits into from
Aug 26, 2022
Merged

장산범 준비 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ecb7f5
feature : 파동 탐지 애니메이션 추가
dongcheolpark Aug 17, 2022
9fb885a
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind…
dongcheolpark Aug 18, 2022
db7afd6
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind…
dongcheolpark Aug 18, 2022
fc62c6a
save
dongcheolpark Aug 23, 2022
58ee627
save
dongcheolpark Aug 23, 2022
129cfe8
feature : 장산범 전체적인 틀 생성
dongcheolpark Aug 26, 2022
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file modified Project_Blind/.DS_Store
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions Project_Blind/Assets/Resources/Materials/BackGround.meta
View file
Open in desktop

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

46 changes: 46 additions & 0 deletions Project_Blind/Assets/Resources/Materials/BackGround/BackGroundDefault.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BackGroundDefault
m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
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}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 2800000, guid: ae8df22eaa06849c1b36b79332ce94fc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Project_Blind/Assets/Resources/Materials/BackGround/BackGroundDefault.mat.meta
View file
Open in desktop

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

0 Project_Blind/Assets/Material/Player.mat → ...ind/Assets/Resources/Materials/Player.mat
View file
Open in desktop
File renamed without changes.
0 ...ect_Blind/Assets/Material/Player.mat.meta → ...ssets/Resources/Materials/Player.mat.meta
View file
Open in desktop
File renamed without changes.
59 changes: 59 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/Enemy/Boss1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2264740123139869621
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 551951293491680949, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_Name
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1951027
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.y
value: -2.3849602
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.z
value: 10.121197
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
7 changes: 7 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/Enemy/Boss1.prefab.meta
View file
Open in desktop

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

Binary file added Project_Blind/Assets/Resources/Prefabs/MapObjects/Object-Forest/바위_Normal.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/MapObjects/Object-Forest/바위_Normal.png.meta
View file
Open in desktop

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

25 changes: 25 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,31 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
fadeAnimation:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.0022779044
value: 0.99233717
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.0068337
value: -0.011494253
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
fadeTime: 0.5
--- !u!114 &5331384102123642232
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
118 changes: 59 additions & 59 deletions Project_Blind/Assets/Scenes/박동철.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,67 +697,10 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6540852046543418591, guid: a1ce373c235fffb488b67c95390b841c, type: 3}
m_PrefabInstance: {fileID: 1899141479}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1948571012
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 522557142}
m_Modifications:
- target: {fileID: 551951293491680949, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_Name
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1951027
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.y
value: -2.3849602
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalPosition.z
value: 10.121197
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
--- !u!4 &1948571013 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 551951293491680955, guid: b1f059db8a09a418ab28447fca3fab10, type: 3}
m_PrefabInstance: {fileID: 1948571012}
m_CorrespondingSourceObject: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
m_PrefabInstance: {fileID: 2264740124417285681}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1985624623
PrefabInstance:
Expand Down Expand Up @@ -1136,3 +1079,60 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2264740124417285681
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 522557142}
m_Modifications:
- target: {fileID: 1784856889770646784, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_Name
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalPosition.x
value: -3.1951027
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalPosition.y
value: -2.3849602
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalPosition.z
value: 10.121197
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1784856889770646798, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f07bf7204839418dae091e017a3be76, type: 3}
Loading