서원석

3차면담확인서+코드진행

Showing 62 changed files with 361 additions and 239 deletions
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -9,7 +9,7 @@ GameObject: ...@@ -9,7 +9,7 @@ GameObject:
9 serializedVersion: 6 9 serializedVersion: 6
10 m_Component: 10 m_Component:
11 - component: {fileID: 7968454459159073808} 11 - component: {fileID: 7968454459159073808}
12 - m_Layer: 0 12 + m_Layer: 8
13 m_Name: Bird_RightWing_Pivot 13 m_Name: Bird_RightWing_Pivot
14 m_TagString: Untagged 14 m_TagString: Untagged
15 m_Icon: {fileID: 0} 15 m_Icon: {fileID: 0}
...@@ -40,7 +40,7 @@ GameObject: ...@@ -40,7 +40,7 @@ GameObject:
40 serializedVersion: 6 40 serializedVersion: 6
41 m_Component: 41 m_Component:
42 - component: {fileID: 7968454459159073810} 42 - component: {fileID: 7968454459159073810}
43 - m_Layer: 0 43 + m_Layer: 8
44 m_Name: Bird_RightWing_Tip 44 m_Name: Bird_RightWing_Tip
45 m_TagString: Untagged 45 m_TagString: Untagged
46 m_Icon: {fileID: 0} 46 m_Icon: {fileID: 0}
...@@ -70,7 +70,7 @@ GameObject: ...@@ -70,7 +70,7 @@ GameObject:
70 serializedVersion: 6 70 serializedVersion: 6
71 m_Component: 71 m_Component:
72 - component: {fileID: 7968454459159073812} 72 - component: {fileID: 7968454459159073812}
73 - m_Layer: 0 73 + m_Layer: 8
74 m_Name: Bird_Root 74 m_Name: Bird_Root
75 m_TagString: Untagged 75 m_TagString: Untagged
76 m_Icon: {fileID: 0} 76 m_Icon: {fileID: 0}
...@@ -102,7 +102,7 @@ GameObject: ...@@ -102,7 +102,7 @@ GameObject:
102 m_Component: 102 m_Component:
103 - component: {fileID: 7968454459159073814} 103 - component: {fileID: 7968454459159073814}
104 - component: {fileID: 7968454459172504888} 104 - component: {fileID: 7968454459172504888}
105 - m_Layer: 0 105 + m_Layer: 8
106 m_Name: BirdRetop:polySurface1 106 m_Name: BirdRetop:polySurface1
107 m_TagString: Untagged 107 m_TagString: Untagged
108 m_Icon: {fileID: 0} 108 m_Icon: {fileID: 0}
...@@ -190,7 +190,7 @@ GameObject: ...@@ -190,7 +190,7 @@ GameObject:
190 - component: {fileID: 7968454459168340984} 190 - component: {fileID: 7968454459168340984}
191 - component: {fileID: 7968454459967997015} 191 - component: {fileID: 7968454459967997015}
192 - component: {fileID: 7968454459967997014} 192 - component: {fileID: 7968454459967997014}
193 - m_Layer: 0 193 + m_Layer: 8
194 m_Name: Bird_Asset (1) 194 m_Name: Bird_Asset (1)
195 m_TagString: Untagged 195 m_TagString: Untagged
196 m_Icon: {fileID: 0} 196 m_Icon: {fileID: 0}
...@@ -266,7 +266,7 @@ GameObject: ...@@ -266,7 +266,7 @@ GameObject:
266 serializedVersion: 6 266 serializedVersion: 6
267 m_Component: 267 m_Component:
268 - component: {fileID: 7968454459159073818} 268 - component: {fileID: 7968454459159073818}
269 - m_Layer: 0 269 + m_Layer: 8
270 m_Name: Bird_Body 270 m_Name: Bird_Body
271 m_TagString: Untagged 271 m_TagString: Untagged
272 m_Icon: {fileID: 0} 272 m_Icon: {fileID: 0}
...@@ -298,7 +298,7 @@ GameObject: ...@@ -298,7 +298,7 @@ GameObject:
298 serializedVersion: 6 298 serializedVersion: 6
299 m_Component: 299 m_Component:
300 - component: {fileID: 7968454459159073820} 300 - component: {fileID: 7968454459159073820}
301 - m_Layer: 0 301 + m_Layer: 8
302 m_Name: Bird_LeftWing_Pivot 302 m_Name: Bird_LeftWing_Pivot
303 m_TagString: Untagged 303 m_TagString: Untagged
304 m_Icon: {fileID: 0} 304 m_Icon: {fileID: 0}
...@@ -329,7 +329,7 @@ GameObject: ...@@ -329,7 +329,7 @@ GameObject:
329 serializedVersion: 6 329 serializedVersion: 6
330 m_Component: 330 m_Component:
331 - component: {fileID: 7968454459159073822} 331 - component: {fileID: 7968454459159073822}
332 - m_Layer: 0 332 + m_Layer: 8
333 m_Name: Bird_LeftWing_Tip 333 m_Name: Bird_LeftWing_Tip
334 m_TagString: Untagged 334 m_TagString: Untagged
335 m_Icon: {fileID: 0} 335 m_Icon: {fileID: 0}
......
This diff could not be displayed because it is too large.
1 +fileFormatVersion: 2
2 +guid: f5554435a61f247a8b071dfcc6599327
3 +PrefabImporter:
4 + externalObjects: {}
5 + userData:
6 + assetBundleName:
7 + assetBundleVariant:
This diff could not be displayed because it is too large.
1 +fileFormatVersion: 2
2 +guid: a9a99613656194a809e3228115ef4f64
3 +PrefabImporter:
4 + externalObjects: {}
5 + userData:
6 + assetBundleName:
7 + assetBundleVariant:
...@@ -121,12 +121,36 @@ NavMeshSettings: ...@@ -121,12 +121,36 @@ NavMeshSettings:
121 debug: 121 debug:
122 m_Flags: 0 122 m_Flags: 0
123 m_NavMeshData: {fileID: 0} 123 m_NavMeshData: {fileID: 0}
124 ---- !u!4 &10207263 stripped 124 +--- !u!1 &31799392
125 +GameObject:
126 + m_ObjectHideFlags: 0
127 + m_CorrespondingSourceObject: {fileID: 0}
128 + m_PrefabInstance: {fileID: 0}
129 + m_PrefabAsset: {fileID: 0}
130 + serializedVersion: 6
131 + m_Component:
132 + - component: {fileID: 31799393}
133 + m_Layer: 0
134 + m_Name: gunFlashTarget
135 + m_TagString: Untagged
136 + m_Icon: {fileID: 0}
137 + m_NavMeshLayer: 0
138 + m_StaticEditorFlags: 0
139 + m_IsActive: 1
140 +--- !u!4 &31799393
125 Transform: 141 Transform:
126 - m_CorrespondingSourceObject: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818, 142 + m_ObjectHideFlags: 0
127 - type: 3} 143 + m_CorrespondingSourceObject: {fileID: 0}
128 - m_PrefabInstance: {fileID: 6416379245616237737} 144 + m_PrefabInstance: {fileID: 0}
129 m_PrefabAsset: {fileID: 0} 145 m_PrefabAsset: {fileID: 0}
146 + m_GameObject: {fileID: 31799392}
147 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
148 + m_LocalPosition: {x: -4.832, y: 0.648, z: 0}
149 + m_LocalScale: {x: 1, y: 1, z: 1}
150 + m_Children: []
151 + m_Father: {fileID: 1744868746}
152 + m_RootOrder: 1
153 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
130 --- !u!1 &74101033 154 --- !u!1 &74101033
131 GameObject: 155 GameObject:
132 m_ObjectHideFlags: 0 156 m_ObjectHideFlags: 0
...@@ -310,7 +334,7 @@ Transform: ...@@ -310,7 +334,7 @@ Transform:
310 m_PrefabAsset: {fileID: 0} 334 m_PrefabAsset: {fileID: 0}
311 m_GameObject: {fileID: 217397915} 335 m_GameObject: {fileID: 217397915}
312 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 336 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
313 - m_LocalPosition: {x: 0, y: 10, z: 0} 337 + m_LocalPosition: {x: 0, y: 7.74, z: -3.63}
314 m_LocalScale: {x: 1, y: 1, z: 1} 338 m_LocalScale: {x: 1, y: 1, z: 1}
315 m_Children: 339 m_Children:
316 - {fileID: 1744868746} 340 - {fileID: 1744868746}
...@@ -547,7 +571,18 @@ MonoBehaviour: ...@@ -547,7 +571,18 @@ MonoBehaviour:
547 m_TargetGraphic: {fileID: 573870763} 571 m_TargetGraphic: {fileID: 573870763}
548 m_OnClick: 572 m_OnClick:
549 m_PersistentCalls: 573 m_PersistentCalls:
550 - m_Calls: [] 574 + m_Calls:
575 + - m_Target: {fileID: 1596863777}
576 + m_MethodName: Fire
577 + m_Mode: 1
578 + m_Arguments:
579 + m_ObjectArgument: {fileID: 0}
580 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
581 + m_IntArgument: 0
582 + m_FloatArgument: 0
583 + m_StringArgument:
584 + m_BoolArgument: 0
585 + m_CallState: 2
551 --- !u!114 &573870763 586 --- !u!114 &573870763
552 MonoBehaviour: 587 MonoBehaviour:
553 m_ObjectHideFlags: 0 588 m_ObjectHideFlags: 0
...@@ -1041,7 +1076,7 @@ Transform: ...@@ -1041,7 +1076,7 @@ Transform:
1041 m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} 1076 m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
1042 m_Children: [] 1077 m_Children: []
1043 m_Father: {fileID: 1958785023} 1078 m_Father: {fileID: 1958785023}
1044 - m_RootOrder: 2 1079 + m_RootOrder: 1
1045 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 1080 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1046 --- !u!1 &1163981035 1081 --- !u!1 &1163981035
1047 GameObject: 1082 GameObject:
...@@ -1410,6 +1445,7 @@ GameObject: ...@@ -1410,6 +1445,7 @@ GameObject:
1410 m_Component: 1445 m_Component:
1411 - component: {fileID: 1596863776} 1446 - component: {fileID: 1596863776}
1412 - component: {fileID: 1596863777} 1447 - component: {fileID: 1596863777}
1448 + - component: {fileID: 1596863778}
1413 m_Layer: 0 1449 m_Layer: 0
1414 m_Name: Raycast 1450 m_Name: Raycast
1415 m_TagString: Untagged 1451 m_TagString: Untagged
...@@ -1429,7 +1465,7 @@ Transform: ...@@ -1429,7 +1465,7 @@ Transform:
1429 m_LocalScale: {x: 1, y: 1, z: 1} 1465 m_LocalScale: {x: 1, y: 1, z: 1}
1430 m_Children: [] 1466 m_Children: []
1431 m_Father: {fileID: 1958785023} 1467 m_Father: {fileID: 1958785023}
1432 - m_RootOrder: 3 1468 + m_RootOrder: 2
1433 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 1469 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1434 --- !u!114 &1596863777 1470 --- !u!114 &1596863777
1435 MonoBehaviour: 1471 MonoBehaviour:
...@@ -1444,96 +1480,113 @@ MonoBehaviour: ...@@ -1444,96 +1480,113 @@ MonoBehaviour:
1444 m_Name: 1480 m_Name:
1445 m_EditorClassIdentifier: 1481 m_EditorClassIdentifier:
1446 maxDistanceRay: 100 1482 maxDistanceRay: 100
1447 - birdName: {fileID: 0} 1483 + birdName: {fileID: 74101035}
1448 - gunFlashTarget: {fileID: 0} 1484 + gunFlashTarget: {fileID: 31799393}
1449 fireRate: 1.6 1485 fireRate: 1.6
1450 ---- !u!4 &1744868746 stripped 1486 + clips: []
1451 -Transform: 1487 +--- !u!82 &1596863778
1452 - m_CorrespondingSourceObject: {fileID: 400002, guid: e870f12990348ad4b94b4cdb8f09b7a0, 1488 +AudioSource:
1453 - type: 3}
1454 - m_PrefabInstance: {fileID: 658341998}
1455 - m_PrefabAsset: {fileID: 0}
1456 ---- !u!1 &1766949924
1457 -GameObject:
1458 - m_ObjectHideFlags: 0
1459 - m_CorrespondingSourceObject: {fileID: 0}
1460 - m_PrefabInstance: {fileID: 0}
1461 - m_PrefabAsset: {fileID: 0}
1462 - serializedVersion: 6
1463 - m_Component:
1464 - - component: {fileID: 1766949925}
1465 - - component: {fileID: 1766949927}
1466 - - component: {fileID: 1766949926}
1467 - m_Layer: 5
1468 - m_Name: shell1
1469 - m_TagString: Untagged
1470 - m_Icon: {fileID: 0}
1471 - m_NavMeshLayer: 0
1472 - m_StaticEditorFlags: 0
1473 - m_IsActive: 1
1474 ---- !u!224 &1766949925
1475 -RectTransform:
1476 - m_ObjectHideFlags: 0
1477 - m_CorrespondingSourceObject: {fileID: 0}
1478 - m_PrefabInstance: {fileID: 0}
1479 - m_PrefabAsset: {fileID: 0}
1480 - m_GameObject: {fileID: 1766949924}
1481 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1482 - m_LocalPosition: {x: 0, y: 0, z: 0}
1483 - m_LocalScale: {x: 0.43, y: 0.43, z: 0.43}
1484 - m_Children: []
1485 - m_Father: {fileID: 1325452419}
1486 - m_RootOrder: 5
1487 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1488 - m_AnchorMin: {x: 0, y: 1}
1489 - m_AnchorMax: {x: 0, y: 1}
1490 - m_AnchoredPosition: {x: 45, y: -99}
1491 - m_SizeDelta: {x: 72.1875, y: 168}
1492 - m_Pivot: {x: 0, y: 1}
1493 ---- !u!114 &1766949926
1494 -MonoBehaviour:
1495 m_ObjectHideFlags: 0 1489 m_ObjectHideFlags: 0
1496 m_CorrespondingSourceObject: {fileID: 0} 1490 m_CorrespondingSourceObject: {fileID: 0}
1497 m_PrefabInstance: {fileID: 0} 1491 m_PrefabInstance: {fileID: 0}
1498 m_PrefabAsset: {fileID: 0} 1492 m_PrefabAsset: {fileID: 0}
1499 - m_GameObject: {fileID: 1766949924} 1493 + m_GameObject: {fileID: 1596863775}
1500 m_Enabled: 1 1494 m_Enabled: 1
1501 - m_EditorHideFlags: 0 1495 + serializedVersion: 4
1502 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} 1496 + OutputAudioMixerGroup: {fileID: 0}
1503 - m_Name: 1497 + m_audioClip: {fileID: 0}
1504 - m_EditorClassIdentifier: 1498 + m_PlayOnAwake: 1
1505 - m_Material: {fileID: 0} 1499 + m_Volume: 1
1506 - m_Color: {r: 1, g: 1, b: 1, a: 1} 1500 + m_Pitch: 1
1507 - m_RaycastTarget: 1 1501 + Loop: 0
1508 - m_Maskable: 1 1502 + Mute: 0
1509 - m_OnCullStateChanged: 1503 + Spatialize: 0
1510 - m_PersistentCalls: 1504 + SpatializePostEffects: 0
1511 - m_Calls: [] 1505 + Priority: 128
1512 - m_Sprite: {fileID: 21300000, guid: 0edc375888d8a44debbd40b406c18e26, type: 3} 1506 + DopplerLevel: 1
1513 - m_Type: 0 1507 + MinDistance: 1
1514 - m_PreserveAspect: 0 1508 + MaxDistance: 500
1515 - m_FillCenter: 1 1509 + Pan2D: 0
1516 - m_FillMethod: 4 1510 + rolloffMode: 0
1517 - m_FillAmount: 1 1511 + BypassEffects: 0
1518 - m_FillClockwise: 1 1512 + BypassListenerEffects: 0
1519 - m_FillOrigin: 0 1513 + BypassReverbZones: 0
1520 - m_UseSpriteMesh: 0 1514 + rolloffCustomCurve:
1521 - m_PixelsPerUnitMultiplier: 1 1515 + serializedVersion: 2
1522 ---- !u!222 &1766949927 1516 + m_Curve:
1523 -CanvasRenderer: 1517 + - serializedVersion: 3
1524 - m_ObjectHideFlags: 0 1518 + time: 0
1525 - m_CorrespondingSourceObject: {fileID: 0} 1519 + value: 1
1526 - m_PrefabInstance: {fileID: 0} 1520 + inSlope: 0
1527 - m_PrefabAsset: {fileID: 0} 1521 + outSlope: 0
1528 - m_GameObject: {fileID: 1766949924} 1522 + tangentMode: 0
1529 - m_CullTransparentMesh: 0 1523 + weightedMode: 0
1530 ---- !u!43 &1827296636 1524 + inWeight: 0.33333334
1525 + outWeight: 0.33333334
1526 + - serializedVersion: 3
1527 + time: 1
1528 + value: 0
1529 + inSlope: 0
1530 + outSlope: 0
1531 + tangentMode: 0
1532 + weightedMode: 0
1533 + inWeight: 0.33333334
1534 + outWeight: 0.33333334
1535 + m_PreInfinity: 2
1536 + m_PostInfinity: 2
1537 + m_RotationOrder: 4
1538 + panLevelCustomCurve:
1539 + serializedVersion: 2
1540 + m_Curve:
1541 + - serializedVersion: 3
1542 + time: 0
1543 + value: 0
1544 + inSlope: 0
1545 + outSlope: 0
1546 + tangentMode: 0
1547 + weightedMode: 0
1548 + inWeight: 0.33333334
1549 + outWeight: 0.33333334
1550 + m_PreInfinity: 2
1551 + m_PostInfinity: 2
1552 + m_RotationOrder: 4
1553 + spreadCustomCurve:
1554 + serializedVersion: 2
1555 + m_Curve:
1556 + - serializedVersion: 3
1557 + time: 0
1558 + value: 0
1559 + inSlope: 0
1560 + outSlope: 0
1561 + tangentMode: 0
1562 + weightedMode: 0
1563 + inWeight: 0.33333334
1564 + outWeight: 0.33333334
1565 + m_PreInfinity: 2
1566 + m_PostInfinity: 2
1567 + m_RotationOrder: 4
1568 + reverbZoneMixCustomCurve:
1569 + serializedVersion: 2
1570 + m_Curve:
1571 + - serializedVersion: 3
1572 + time: 0
1573 + value: 1
1574 + inSlope: 0
1575 + outSlope: 0
1576 + tangentMode: 0
1577 + weightedMode: 0
1578 + inWeight: 0.33333334
1579 + outWeight: 0.33333334
1580 + m_PreInfinity: 2
1581 + m_PostInfinity: 2
1582 + m_RotationOrder: 4
1583 +--- !u!43 &1684273375
1531 Mesh: 1584 Mesh:
1532 m_ObjectHideFlags: 0 1585 m_ObjectHideFlags: 0
1533 m_CorrespondingSourceObject: {fileID: 0} 1586 m_CorrespondingSourceObject: {fileID: 0}
1534 m_PrefabInstance: {fileID: 0} 1587 m_PrefabInstance: {fileID: 0}
1535 m_PrefabAsset: {fileID: 0} 1588 m_PrefabAsset: {fileID: 0}
1536 - m_Name: ImageTargetMesh30166 1589 + m_Name: ImageTargetMesh14830
1537 serializedVersion: 10 1590 serializedVersion: 10
1538 m_SubMeshes: 1591 m_SubMeshes:
1539 - serializedVersion: 2 1592 - serializedVersion: 2
...@@ -1690,6 +1743,86 @@ Mesh: ...@@ -1690,6 +1743,86 @@ Mesh:
1690 offset: 0 1743 offset: 0
1691 size: 0 1744 size: 0
1692 path: 1745 path:
1746 +--- !u!4 &1744868746 stripped
1747 +Transform:
1748 + m_CorrespondingSourceObject: {fileID: 400002, guid: e870f12990348ad4b94b4cdb8f09b7a0,
1749 + type: 3}
1750 + m_PrefabInstance: {fileID: 658341998}
1751 + m_PrefabAsset: {fileID: 0}
1752 +--- !u!1 &1766949924
1753 +GameObject:
1754 + m_ObjectHideFlags: 0
1755 + m_CorrespondingSourceObject: {fileID: 0}
1756 + m_PrefabInstance: {fileID: 0}
1757 + m_PrefabAsset: {fileID: 0}
1758 + serializedVersion: 6
1759 + m_Component:
1760 + - component: {fileID: 1766949925}
1761 + - component: {fileID: 1766949927}
1762 + - component: {fileID: 1766949926}
1763 + m_Layer: 5
1764 + m_Name: shell1
1765 + m_TagString: Untagged
1766 + m_Icon: {fileID: 0}
1767 + m_NavMeshLayer: 0
1768 + m_StaticEditorFlags: 0
1769 + m_IsActive: 1
1770 +--- !u!224 &1766949925
1771 +RectTransform:
1772 + m_ObjectHideFlags: 0
1773 + m_CorrespondingSourceObject: {fileID: 0}
1774 + m_PrefabInstance: {fileID: 0}
1775 + m_PrefabAsset: {fileID: 0}
1776 + m_GameObject: {fileID: 1766949924}
1777 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1778 + m_LocalPosition: {x: 0, y: 0, z: 0}
1779 + m_LocalScale: {x: 0.43, y: 0.43, z: 0.43}
1780 + m_Children: []
1781 + m_Father: {fileID: 1325452419}
1782 + m_RootOrder: 5
1783 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1784 + m_AnchorMin: {x: 0, y: 1}
1785 + m_AnchorMax: {x: 0, y: 1}
1786 + m_AnchoredPosition: {x: 45, y: -99}
1787 + m_SizeDelta: {x: 72.1875, y: 168}
1788 + m_Pivot: {x: 0, y: 1}
1789 +--- !u!114 &1766949926
1790 +MonoBehaviour:
1791 + m_ObjectHideFlags: 0
1792 + m_CorrespondingSourceObject: {fileID: 0}
1793 + m_PrefabInstance: {fileID: 0}
1794 + m_PrefabAsset: {fileID: 0}
1795 + m_GameObject: {fileID: 1766949924}
1796 + m_Enabled: 1
1797 + m_EditorHideFlags: 0
1798 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
1799 + m_Name:
1800 + m_EditorClassIdentifier:
1801 + m_Material: {fileID: 0}
1802 + m_Color: {r: 1, g: 1, b: 1, a: 1}
1803 + m_RaycastTarget: 1
1804 + m_Maskable: 1
1805 + m_OnCullStateChanged:
1806 + m_PersistentCalls:
1807 + m_Calls: []
1808 + m_Sprite: {fileID: 21300000, guid: 0edc375888d8a44debbd40b406c18e26, type: 3}
1809 + m_Type: 0
1810 + m_PreserveAspect: 0
1811 + m_FillCenter: 1
1812 + m_FillMethod: 4
1813 + m_FillAmount: 1
1814 + m_FillClockwise: 1
1815 + m_FillOrigin: 0
1816 + m_UseSpriteMesh: 0
1817 + m_PixelsPerUnitMultiplier: 1
1818 +--- !u!222 &1766949927
1819 +CanvasRenderer:
1820 + m_ObjectHideFlags: 0
1821 + m_CorrespondingSourceObject: {fileID: 0}
1822 + m_PrefabInstance: {fileID: 0}
1823 + m_PrefabAsset: {fileID: 0}
1824 + m_GameObject: {fileID: 1766949924}
1825 + m_CullTransparentMesh: 0
1693 --- !u!1 &1861739300 1826 --- !u!1 &1861739300
1694 GameObject: 1827 GameObject:
1695 m_ObjectHideFlags: 0 1828 m_ObjectHideFlags: 0
...@@ -1813,7 +1946,7 @@ MeshFilter: ...@@ -1813,7 +1946,7 @@ MeshFilter:
1813 m_PrefabInstance: {fileID: 0} 1946 m_PrefabInstance: {fileID: 0}
1814 m_PrefabAsset: {fileID: 0} 1947 m_PrefabAsset: {fileID: 0}
1815 m_GameObject: {fileID: 1958785017} 1948 m_GameObject: {fileID: 1958785017}
1816 - m_Mesh: {fileID: 1827296636} 1949 + m_Mesh: {fileID: 1684273375}
1817 --- !u!23 &1958785019 1950 --- !u!23 &1958785019
1818 MeshRenderer: 1951 MeshRenderer:
1819 m_ObjectHideFlags: 0 1952 m_ObjectHideFlags: 0
...@@ -1917,7 +2050,6 @@ Transform: ...@@ -1917,7 +2050,6 @@ Transform:
1917 m_LocalScale: {x: 1, y: 1, z: 1} 2050 m_LocalScale: {x: 1, y: 1, z: 1}
1918 m_Children: 2051 m_Children:
1919 - {fileID: 1105346297} 2052 - {fileID: 1105346297}
1920 - - {fileID: 10207263}
1921 - {fileID: 1127113271} 2053 - {fileID: 1127113271}
1922 - {fileID: 1596863776} 2054 - {fileID: 1596863776}
1923 m_Father: {fileID: 0} 2055 m_Father: {fileID: 0}
...@@ -2084,87 +2216,3 @@ Transform: ...@@ -2084,87 +2216,3 @@ Transform:
2084 m_Father: {fileID: 0} 2216 m_Father: {fileID: 0}
2085 m_RootOrder: 4 2217 m_RootOrder: 4
2086 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 2218 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2087 ---- !u!1001 &6416379245616237737
2088 -PrefabInstance:
2089 - m_ObjectHideFlags: 0
2090 - serializedVersion: 2
2091 - m_Modification:
2092 - m_TransformParent: {fileID: 1958785023}
2093 - m_Modifications:
2094 - - target: {fileID: 6416379245625954454, guid: e683a6ad571eb428dafae22b623b7818,
2095 - type: 3}
2096 - propertyPath: m_Name
2097 - value: Bird_Asset (1)
2098 - objectReference: {fileID: 0}
2099 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2100 - type: 3}
2101 - propertyPath: m_LocalPosition.x
2102 - value: -0.049
2103 - objectReference: {fileID: 0}
2104 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2105 - type: 3}
2106 - propertyPath: m_LocalPosition.y
2107 - value: 0.924
2108 - objectReference: {fileID: 0}
2109 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2110 - type: 3}
2111 - propertyPath: m_LocalPosition.z
2112 - value: -1.293
2113 - objectReference: {fileID: 0}
2114 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2115 - type: 3}
2116 - propertyPath: m_LocalRotation.x
2117 - value: 0
2118 - objectReference: {fileID: 0}
2119 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2120 - type: 3}
2121 - propertyPath: m_LocalRotation.y
2122 - value: 0
2123 - objectReference: {fileID: 0}
2124 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2125 - type: 3}
2126 - propertyPath: m_LocalRotation.z
2127 - value: 0
2128 - objectReference: {fileID: 0}
2129 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2130 - type: 3}
2131 - propertyPath: m_LocalRotation.w
2132 - value: 1
2133 - objectReference: {fileID: 0}
2134 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2135 - type: 3}
2136 - propertyPath: m_RootOrder
2137 - value: 1
2138 - objectReference: {fileID: 0}
2139 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2140 - type: 3}
2141 - propertyPath: m_LocalEulerAnglesHint.x
2142 - value: 0
2143 - objectReference: {fileID: 0}
2144 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2145 - type: 3}
2146 - propertyPath: m_LocalEulerAnglesHint.y
2147 - value: 0
2148 - objectReference: {fileID: 0}
2149 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2150 - type: 3}
2151 - propertyPath: m_LocalEulerAnglesHint.z
2152 - value: 0
2153 - objectReference: {fileID: 0}
2154 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2155 - type: 3}
2156 - propertyPath: m_LocalScale.x
2157 - value: 5
2158 - objectReference: {fileID: 0}
2159 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2160 - type: 3}
2161 - propertyPath: m_LocalScale.y
2162 - value: 5
2163 - objectReference: {fileID: 0}
2164 - - target: {fileID: 6416379245626313910, guid: e683a6ad571eb428dafae22b623b7818,
2165 - type: 3}
2166 - propertyPath: m_LocalScale.z
2167 - value: 5
2168 - objectReference: {fileID: 0}
2169 - m_RemovedComponents: []
2170 - m_SourcePrefab: {fileID: 100100000, guid: e683a6ad571eb428dafae22b623b7818, type: 3}
......
...@@ -15,12 +15,18 @@ public class RaycastController : MonoBehaviour ...@@ -15,12 +15,18 @@ public class RaycastController : MonoBehaviour
15 private string objName = ""; 15 private string objName = "";
16 16
17 AudioSource audio; 17 AudioSource audio;
18 - 18 + public AudioClip[] clips;
19 void Awake() { 19 void Awake() {
20 if (instance == null) { 20 if (instance == null) {
21 instance = this; 21 instance = this;
22 } 22 }
23 } 23 }
24 +
25 + public void playSound(int sound) {
26 + audio.clip = clips[sound];
27 + audio.Play();
28 + }
29 +
24 // Start is called before the first frame update 30 // Start is called before the first frame update
25 void Start() 31 void Start()
26 { 32 {
...@@ -32,6 +38,48 @@ public class RaycastController : MonoBehaviour ...@@ -32,6 +38,48 @@ public class RaycastController : MonoBehaviour
32 { 38 {
33 39
34 } 40 }
41 +
42 + public void Fire() {
43 + if(nextShot) {
44 + StartCoroutine(takeShot());
45 + nextShot = false;
46 + }
47 + }
48 +
49 + private IEnumerator takeShot() {
50 + Ray ray = Camera.main.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
51 + RaycastHit hit;
52 +
53 + int layer_mask = LayerMask.GetMask("birdLayer");
54 + if(Physics.Raycast(ray, out hit, maxDistanceRay, layer_mask)) {
55 + //debug
56 + objName = hit.collider.gameObject.name;
57 + birdName.text = objName;
58 + Vector3 birdPosition = hit.collider.gameObject.transform.position;
59 +
60 + if(objName == "Bird_Asset(Clone)") {
61 + GameObject Boom = Instantiate(Resources.Load("boom", typeof(GameObject))) as GameObject;
62 + Boom.transform.position = birdPosition;
63 +
64 + Destroy(hit.collider.gameObject);
65 + StartCoroutine(spawnNewBird());
66 + StartCoroutine(clearBoom());
67 + }
68 + }
69 +
70 + GameObject gunFlash = Instantiate(Resources.Load("gunFlashSmoke", typeof(GameObject))) as GameObject;
71 + gunFlash.transform.position = gunFlashTarget.position;
72 +
73 + yield return new WaitForSeconds(fireRate);
74 + nextShot = true;
75 + }
76 + private IEnumerator clearBoom() {
77 + yield return new WaitForSeconds(1.5f);
78 + GameObject[] smokeGroup = GameObject.FindGameObjectsWithTag("Boom");
79 + foreach (GameObject smoke in smokeGroup) {
80 + Destroy(smoke.gameObject);
81 + }
82 + }
35 private IEnumerator spawnNewBird() { 83 private IEnumerator spawnNewBird() {
36 yield return new WaitForSeconds (3f); 84 yield return new WaitForSeconds (3f);
37 //Spawn new bird 85 //Spawn new bird
......
...@@ -21,7 +21,7 @@ MonoBehaviour: ...@@ -21,7 +21,7 @@ MonoBehaviour:
21 m_ShowMode: 4 21 m_ShowMode: 4
22 m_Title: 22 m_Title:
23 m_RootView: {fileID: 6} 23 m_RootView: {fileID: 6}
24 - m_MinSize: {x: 875, y: 392} 24 + m_MinSize: {x: 875, y: 542}
25 m_MaxSize: {x: 10000, y: 10000} 25 m_MaxSize: {x: 10000, y: 10000}
26 m_Maximized: 0 26 m_Maximized: 0
27 --- !u!114 &2 27 --- !u!114 &2
...@@ -45,10 +45,10 @@ MonoBehaviour: ...@@ -45,10 +45,10 @@ MonoBehaviour:
45 y: 30 45 y: 30
46 width: 1237 46 width: 1237
47 height: 705 47 height: 705
48 - m_MinSize: {x: 677, y: 342} 48 + m_MinSize: {x: 679, y: 492}
49 - m_MaxSize: {x: 12002, y: 8042} 49 + m_MaxSize: {x: 14002, y: 14042}
50 vertical: 0 50 vertical: 0
51 - controlID: 17 51 + controlID: 108
52 --- !u!114 &3 52 --- !u!114 &3
53 MonoBehaviour: 53 MonoBehaviour:
54 m_ObjectHideFlags: 52 54 m_ObjectHideFlags: 52
...@@ -68,8 +68,8 @@ MonoBehaviour: ...@@ -68,8 +68,8 @@ MonoBehaviour:
68 y: 0 68 y: 0
69 width: 415 69 width: 415
70 height: 705 70 height: 705
71 - m_MinSize: {x: 275, y: 50} 71 + m_MinSize: {x: 276, y: 71}
72 - m_MaxSize: {x: 4000, y: 4000} 72 + m_MaxSize: {x: 4001, y: 4021}
73 m_ActualView: {fileID: 15} 73 m_ActualView: {fileID: 15}
74 m_Panes: 74 m_Panes:
75 - {fileID: 15} 75 - {fileID: 15}
...@@ -94,8 +94,8 @@ MonoBehaviour: ...@@ -94,8 +94,8 @@ MonoBehaviour:
94 y: 0 94 y: 0
95 width: 251 95 width: 251
96 height: 427 96 height: 427
97 - m_MinSize: {x: 200, y: 200} 97 + m_MinSize: {x: 201, y: 221}
98 - m_MaxSize: {x: 4000, y: 4000} 98 + m_MaxSize: {x: 4001, y: 4021}
99 m_ActualView: {fileID: 16} 99 m_ActualView: {fileID: 16}
100 m_Panes: 100 m_Panes:
101 - {fileID: 16} 101 - {fileID: 16}
...@@ -111,7 +111,7 @@ MonoBehaviour: ...@@ -111,7 +111,7 @@ MonoBehaviour:
111 m_Enabled: 1 111 m_Enabled: 1
112 m_EditorHideFlags: 1 112 m_EditorHideFlags: 1
113 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} 113 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
114 - m_Name: ConsoleWindow 114 + m_Name: ProjectBrowser
115 m_EditorClassIdentifier: 115 m_EditorClassIdentifier:
116 m_Children: [] 116 m_Children: []
117 m_Position: 117 m_Position:
...@@ -120,14 +120,14 @@ MonoBehaviour: ...@@ -120,14 +120,14 @@ MonoBehaviour:
120 y: 427 120 y: 427
121 width: 822 121 width: 822
122 height: 278 122 height: 278
123 - m_MinSize: {x: 101, y: 121} 123 + m_MinSize: {x: 231, y: 271}
124 - m_MaxSize: {x: 4001, y: 4021} 124 + m_MaxSize: {x: 10001, y: 10021}
125 - m_ActualView: {fileID: 19} 125 + m_ActualView: {fileID: 14}
126 m_Panes: 126 m_Panes:
127 - {fileID: 14} 127 - {fileID: 14}
128 - {fileID: 19} 128 - {fileID: 19}
129 - m_Selected: 1 129 + m_Selected: 0
130 - m_LastSelected: 0 130 + m_LastSelected: 1
131 --- !u!114 &6 131 --- !u!114 &6
132 MonoBehaviour: 132 MonoBehaviour:
133 m_ObjectHideFlags: 52 133 m_ObjectHideFlags: 52
...@@ -216,10 +216,10 @@ MonoBehaviour: ...@@ -216,10 +216,10 @@ MonoBehaviour:
216 y: 0 216 y: 0
217 width: 822 217 width: 822
218 height: 705 218 height: 705
219 - m_MinSize: {x: 402, y: 342} 219 + m_MinSize: {x: 403, y: 492}
220 - m_MaxSize: {x: 8002, y: 8042} 220 + m_MaxSize: {x: 10001, y: 14042}
221 vertical: 1 221 vertical: 1
222 - controlID: 18 222 + controlID: 109
223 --- !u!114 &10 223 --- !u!114 &10
224 MonoBehaviour: 224 MonoBehaviour:
225 m_ObjectHideFlags: 52 225 m_ObjectHideFlags: 52
...@@ -241,10 +241,10 @@ MonoBehaviour: ...@@ -241,10 +241,10 @@ MonoBehaviour:
241 y: 0 241 y: 0
242 width: 822 242 width: 822
243 height: 427 243 height: 427
244 - m_MinSize: {x: 402, y: 221} 244 + m_MinSize: {x: 403, y: 221}
245 - m_MaxSize: {x: 8002, y: 4021} 245 + m_MaxSize: {x: 8003, y: 4021}
246 vertical: 0 246 vertical: 0
247 - controlID: 19 247 + controlID: 110
248 --- !u!114 &11 248 --- !u!114 &11
249 MonoBehaviour: 249 MonoBehaviour:
250 m_ObjectHideFlags: 52 250 m_ObjectHideFlags: 52
...@@ -376,10 +376,10 @@ MonoBehaviour: ...@@ -376,10 +376,10 @@ MonoBehaviour:
376 m_Tooltip: 376 m_Tooltip:
377 m_Pos: 377 m_Pos:
378 serializedVersion: 2 378 serializedVersion: 2
379 - x: 280 379 + x: 260
380 - y: 75 380 + y: 30
381 - width: 722 381 + width: 589
382 - height: 405 382 + height: 433
383 m_ViewDataDictionary: {fileID: 0} 383 m_ViewDataDictionary: {fileID: 0}
384 --- !u!114 &14 384 --- !u!114 &14
385 MonoBehaviour: 385 MonoBehaviour:
...@@ -420,20 +420,20 @@ MonoBehaviour: ...@@ -420,20 +420,20 @@ MonoBehaviour:
420 m_SkipHidden: 0 420 m_SkipHidden: 0
421 m_SearchArea: 1 421 m_SearchArea: 1
422 m_Folders: 422 m_Folders:
423 - - Assets/Scripts 423 + - Assets/Resources
424 m_ViewMode: 1 424 m_ViewMode: 1
425 m_StartGridSize: 64 425 m_StartGridSize: 64
426 m_LastFolders: 426 m_LastFolders:
427 - - Assets/Scripts 427 + - Assets/Resources
428 m_LastFoldersGridSize: -1 428 m_LastFoldersGridSize: -1
429 m_LastProjectPath: /Users/sws/Duck Hunter AR 429 m_LastProjectPath: /Users/sws/Duck Hunter AR
430 m_LockTracker: 430 m_LockTracker:
431 m_IsLocked: 0 431 m_IsLocked: 0
432 m_FolderTreeState: 432 m_FolderTreeState:
433 - scrollPos: {x: 0, y: 323} 433 + scrollPos: {x: 0, y: 79}
434 - m_SelectedIDs: 244b0000 434 + m_SelectedIDs: a83a0000
435 - m_LastClickedID: 19236 435 + m_LastClickedID: 15016
436 - m_ExpandedIDs: 00000000ec3a0000 436 + m_ExpandedIDs: 00000000883a000000ca9a3b
437 m_RenameOverlay: 437 m_RenameOverlay:
438 m_UserAcceptedRename: 0 438 m_UserAcceptedRename: 0
439 m_Name: 439 m_Name:
...@@ -461,7 +461,7 @@ MonoBehaviour: ...@@ -461,7 +461,7 @@ MonoBehaviour:
461 scrollPos: {x: 0, y: 0} 461 scrollPos: {x: 0, y: 0}
462 m_SelectedIDs: 462 m_SelectedIDs:
463 m_LastClickedID: 0 463 m_LastClickedID: 0
464 - m_ExpandedIDs: 00000000ec3a0000 464 + m_ExpandedIDs: 00000000883a0000
465 m_RenameOverlay: 465 m_RenameOverlay:
466 m_UserAcceptedRename: 0 466 m_UserAcceptedRename: 0
467 m_Name: 467 m_Name:
...@@ -488,7 +488,7 @@ MonoBehaviour: ...@@ -488,7 +488,7 @@ MonoBehaviour:
488 m_ListAreaState: 488 m_ListAreaState:
489 m_SelectedInstanceIDs: 489 m_SelectedInstanceIDs:
490 m_LastClickedInstanceID: 0 490 m_LastClickedInstanceID: 0
491 - m_HadKeyboardFocusLastEvent: 1 491 + m_HadKeyboardFocusLastEvent: 0
492 m_ExpandedInstanceIDs: c6230000dc3f000000000000 492 m_ExpandedInstanceIDs: c6230000dc3f000000000000
493 m_RenameOverlay: 493 m_RenameOverlay:
494 m_UserAcceptedRename: 0 494 m_UserAcceptedRename: 0
...@@ -505,7 +505,7 @@ MonoBehaviour: ...@@ -505,7 +505,7 @@ MonoBehaviour:
505 m_IsRenaming: 0 505 m_IsRenaming: 0
506 m_OriginalEventType: 11 506 m_OriginalEventType: 11
507 m_IsRenamingFilename: 1 507 m_IsRenamingFilename: 1
508 - m_ClientGUIView: {fileID: 0} 508 + m_ClientGUIView: {fileID: 5}
509 m_CreateAssetUtility: 509 m_CreateAssetUtility:
510 m_EndAction: {fileID: 0} 510 m_EndAction: {fileID: 0}
511 m_InstanceID: 0 511 m_InstanceID: 0
...@@ -584,9 +584,9 @@ MonoBehaviour: ...@@ -584,9 +584,9 @@ MonoBehaviour:
584 m_SceneHierarchy: 584 m_SceneHierarchy:
585 m_TreeViewState: 585 m_TreeViewState:
586 scrollPos: {x: 0, y: 0} 586 scrollPos: {x: 0, y: 0}
587 - m_SelectedIDs: a4390000 587 + m_SelectedIDs:
588 - m_LastClickedID: 14756 588 + m_LastClickedID: 0
589 - m_ExpandedIDs: 60fbffffee390000 589 + m_ExpandedIDs: 60fbffff
590 m_RenameOverlay: 590 m_RenameOverlay:
591 m_UserAcceptedRename: 0 591 m_UserAcceptedRename: 0
592 m_Name: 592 m_Name:
...@@ -646,9 +646,9 @@ MonoBehaviour: ...@@ -646,9 +646,9 @@ MonoBehaviour:
646 m_PlayAudio: 0 646 m_PlayAudio: 0
647 m_AudioPlay: 0 647 m_AudioPlay: 0
648 m_Position: 648 m_Position:
649 - m_Target: {x: -0.7786596, y: -0.67948675, z: -0.58338237} 649 + m_Target: {x: -0.3424908, y: 6.095478, z: -0.054552317}
650 speed: 2 650 speed: 2
651 - m_Value: {x: -0.7786596, y: -0.67948675, z: -0.58338237} 651 + m_Value: {x: -0.3424908, y: 6.095478, z: -0.054552317}
652 m_RenderMode: 0 652 m_RenderMode: 0
653 m_CameraMode: 653 m_CameraMode:
654 drawMode: 0 654 drawMode: 0
...@@ -694,13 +694,13 @@ MonoBehaviour: ...@@ -694,13 +694,13 @@ MonoBehaviour:
694 m_GridAxis: 1 694 m_GridAxis: 1
695 m_gridOpacity: 0.5 695 m_gridOpacity: 0.5
696 m_Rotation: 696 m_Rotation:
697 - m_Target: {x: -0.15572436, y: 0.8441295, z: -0.37121826, w: -0.3541085} 697 + m_Target: {x: -0.25960436, y: 0.5711201, z: -0.19677876, w: -0.7534632}
698 speed: 2 698 speed: 2
699 - m_Value: {x: -0.15572433, y: 0.8441293, z: -0.37121817, w: -0.35410842} 699 + m_Value: {x: -0.25960422, y: 0.5711197, z: -0.19677864, w: -0.75346273}
700 m_Size: 700 m_Size:
701 - m_Target: 2.777765 701 + m_Target: 3.6011362
702 speed: 2 702 speed: 2
703 - m_Value: 2.777765 703 + m_Value: 3.6011362
704 m_Ortho: 704 m_Ortho:
705 m_Target: 0 705 m_Target: 0
706 speed: 2 706 speed: 2
...@@ -718,7 +718,7 @@ MonoBehaviour: ...@@ -718,7 +718,7 @@ MonoBehaviour:
718 m_FarClip: 10000 718 m_FarClip: 10000
719 m_DynamicClip: 1 719 m_DynamicClip: 1
720 m_OcclusionCulling: 0 720 m_OcclusionCulling: 0
721 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} 721 + m_LastSceneViewRotation: {x: -0.25960436, y: 0.5711201, z: -0.19677876, w: -0.7534632}
722 m_LastSceneViewOrtho: 0 722 m_LastSceneViewOrtho: 0
723 m_ReplacementShader: {fileID: 0} 723 m_ReplacementShader: {fileID: 0}
724 m_ReplacementString: 724 m_ReplacementString:
...@@ -838,8 +838,8 @@ MonoBehaviour: ...@@ -838,8 +838,8 @@ MonoBehaviour:
838 m_Tooltip: 838 m_Tooltip:
839 m_Pos: 839 m_Pos:
840 serializedVersion: 2 840 serializedVersion: 2
841 - x: 43 841 + x: 0
842 - y: 502 842 + y: 484
843 - width: 821 843 + width: 850
844 - height: 257 844 + height: 275
845 m_ViewDataDictionary: {fileID: 0} 845 m_ViewDataDictionary: {fileID: 0}
......
1 +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
...\ No newline at end of file ...\ No newline at end of file
1 +{"m_ExpandedPrefabGameObjectFileIDs":[6416379245625954454,6416379245625954458,6416379245625954452,6416379245625954450,6416379245625954462],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":6416379245625954454,"m_LastClickedInstanceID":0}
...\ No newline at end of file ...\ No newline at end of file
1 +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-0.05192927271127701,"y":1.0240000486373902,"z":-1.2667886018753052},"rotation":{"x":-0.2596043646335602,"y":0.5711200833320618,"z":-0.19677875936031342,"w":-0.7534632086753845},"size":0.39765363931655886,"orthographic":false}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-0.13249647617340089,"y":1.054817795753479,"z":-1.2810721397399903},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":0.4302772879600525,"orthographic":true}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-2.6501102447509767,"y":3.503981590270996,"z":0.6967406272888184},"rotation":{"x":-0.2596043646335602,"y":0.5711200833320618,"z":-0.19677875936031342,"w":-0.7534632086753845},"size":4.520999431610107,"orthographic":false}
...\ No newline at end of file ...\ No newline at end of file
1 -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-0.7786595821380615,"y":-0.6794867515563965,"z":-0.5833823680877686},"rotation":{"x":-0.15572436153888703,"y":0.8441295027732849,"z":-0.3712182641029358,"w":-0.3541085124015808},"size":2.7777650356292726,"orthographic":false}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-0.3424907922744751,"y":6.095478057861328,"z":-0.054552316665649417},"rotation":{"x":-0.2596043646335602,"y":0.5711200833320618,"z":-0.19677875936031342,"w":-0.7534632086753845},"size":3.6011362075805666,"orthographic":false}
...\ No newline at end of file ...\ No newline at end of file
......
1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines' 1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines'
2 Cmd: initializeCompiler 2 Cmd: initializeCompiler
3 Cmd: compileSnippet 3 Cmd: compileSnippet
4 - api=14 type=0 insize=1086 outsize=1546 kw=VUFORIA_RGB pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 4 + api=14 type=0 insize=288996 outsize=2933 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
5 Cmd: compileSnippet 5 Cmd: compileSnippet
6 - api=14 type=1 insize=41108 outsize=5554 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 6 + api=14 type=1 insize=1402 outsize=1028 kw=UNITY_PASS_FORWARDBASE PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
7 +Cmd: compileSnippet
8 + api=14 type=1 insize=934 outsize=730 kw=PROCEDURAL_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
......
1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines' 1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines'
2 Cmd: initializeCompiler 2 Cmd: initializeCompiler
3 Cmd: compileSnippet 3 Cmd: compileSnippet
4 - api=14 type=1 insize=1086 outsize=880 kw=VUFORIA_RGB pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 4 + api=14 type=1 insize=288996 outsize=4084 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
5 Cmd: compileSnippet 5 Cmd: compileSnippet
6 - api=14 type=0 insize=41108 outsize=2933 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 6 + api=14 type=0 insize=1402 outsize=5483 kw=UNITY_PASS_FORWARDBASE PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
7 +Cmd: compileSnippet
8 + api=14 type=0 insize=1152 outsize=3288 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH _ALPHABLEND_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
9 +
10 +Quitting shader compiler process
......
1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines' 1 Base path: '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents', plugins path '/Applications/Unity/Hub/Editor/2019.3.14f1/Unity.app/Contents/PlaybackEngines'
2 Cmd: initializeCompiler 2 Cmd: initializeCompiler
3 Cmd: compileSnippet 3 Cmd: compileSnippet
4 - api=14 type=0 insize=7271 outsize=5974 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 4 + api=14 type=0 insize=934 outsize=4312 kw=PROCEDURAL_INSTANCING_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
5 Cmd: compileSnippet 5 Cmd: compileSnippet
6 - api=14 type=1 insize=316957 outsize=7762 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 6 + api=14 type=1 insize=1152 outsize=1067 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH _ALPHABLEND_ON pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
7 -Cmd: compileSnippet
8 - api=14 type=1 insize=1602 outsize=8056 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1
9 7
10 Quitting shader compiler process 8 Quitting shader compiler process
......
...@@ -5,6 +5,8 @@ TagManager: ...@@ -5,6 +5,8 @@ TagManager:
5 serializedVersion: 2 5 serializedVersion: 2
6 tags: 6 tags:
7 - target 7 - target
8 + - GunSmoke
9 + - Boom
8 layers: 10 layers:
9 - Default 11 - Default
10 - TransparentFX 12 - TransparentFX
...@@ -14,7 +16,7 @@ TagManager: ...@@ -14,7 +16,7 @@ TagManager:
14 - UI 16 - UI
15 - 17 -
16 - 18 -
17 - - 19 + - birdLayer
18 - 20 -
19 - 21 -
20 - 22 -
......