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

작업 통합물 #97

Merged
merged 6 commits into from
Jul 26, 2022
Merged
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
994 changes: 951 additions & 43 deletions Project_Blind/Assets/Resources/Materials/Sight/Sight.shadergraph

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &551951293491680953
Rigidbody2D:
Expand Down Expand Up @@ -158,6 +158,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1b5285bb28742954fbcc71e3462b5020, type: 3}
m_Name:
m_EditorClassIdentifier:
_hp: 0
isAttack: 0
layerMask:
serializedVersion: 2
Expand Down
179 changes: 179 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/FieldOfWar.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2712366840166853505
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2712366840166853506}
- component: {fileID: 2712366840166853508}
- component: {fileID: 2712366840166853507}
- component: {fileID: 2712366840166853509}
m_Layer: 0
m_Name: FirstLayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2712366840166853506
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840166853505}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 14.0683, y: -0.5324, z: 8.8}
m_LocalScale: {x: 5.78488, y: 1, z: 3.1063967}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2712366840880342178}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &2712366840166853508
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840166853505}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2712366840166853507
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840166853505}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9b47fcff03ce9495990af23772d735c1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &2712366840166853509
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840166853505}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dbce3b7a53d140d8956223d2b5f5edd1, type: 3}
m_Name:
m_EditorClassIdentifier:
brushSize: 0.05
Offset: 3
--- !u!1 &2712366840880342177
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2712366840880342178}
- component: {fileID: 2712366840880342179}
m_Layer: 0
m_Name: FieldOfWar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2712366840880342178
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840880342177}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -14.250905, y: 0.54990613, z: -10.152108}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2712366840166853506}
- {fileID: 2712366841023644508}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2712366840880342179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366840880342177}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5631adda6e9146a58e71517606909cf, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowGizmos: 1
TileSize: 1
--- !u!1 &2712366841023644507
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2712366841023644508}
m_Layer: 0
m_Name: SecondLayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2712366841023644508
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2712366841023644507}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2712366840880342178}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7 changes: 7 additions & 0 deletions Project_Blind/Assets/Resources/Prefabs/FieldOfWar.prefab.meta

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

8 changes: 5 additions & 3 deletions Project_Blind/Assets/Resources/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ CapsuleCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Size: {x: 1, y: 3.5}
m_Offset: {x: -0.07060051, y: -0.28239965}
m_Size: {x: 2.553196, y: 7.3594656}
m_Direction: 0
--- !u!114 &7138595047812326861
MonoBehaviour:
Expand All @@ -252,6 +252,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3}
m_Name:
m_EditorClassIdentifier:
_hp: 0
maxhp: 0
_jumpSpeed: 0.5
_jumpAbortSpeedReduction: 1
_gravity: 1
Expand Down Expand Up @@ -331,7 +333,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 972683b9027243d281efa06cf3279fd6, type: 3}
m_Name:
m_EditorClassIdentifier:
Range: 3
Range: 10
--- !u!114 &218428938864700062
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Project_Blind/Assets/Scenes/MainScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2084263019677666267, guid: 57e9e6a7f26cde345a49cb6941d31f7d, type: 3}
propertyPath: newSceneName
value: 5
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2084263019677666267, guid: 57e9e6a7f26cde345a49cb6941d31f7d, type: 3}
propertyPath: transitionDestinationTag
Expand Down
Loading