diff --git a/Assets/Animation/EnemyAC.controller b/Assets/Animation/EnemyAC.controller new file mode 100644 index 0000000000000000000000000000000000000000..67bcd72b7315deb5f20c56d0c3607683c2e99f54 --- /dev/null +++ b/Assets/Animation/EnemyAC.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EnemyAC + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Animation/EnemyAC.controller.meta b/Assets/Animation/EnemyAC.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..ee983a08ae40633d830f1563ec3cfdc5d5d43b13 --- /dev/null +++ b/Assets/Animation/EnemyAC.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab74e54b63766124ba32163636c0e2e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_01.meta b/Assets/Scenes/Level_01.meta new file mode 100644 index 0000000000000000000000000000000000000000..a1a26bb5ebd9f2af907281dc2a2060c86a2a95ee --- /dev/null +++ b/Assets/Scenes/Level_01.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b47dfc889b252f428f639236a5eb5af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyMovement.cs b/Assets/Scripts/Enemy/EnemyMovement.cs index ed5ae7070fe7306d6f33c270d7aef0e320d5d547..d7f16f237a30537256a84401a9075e93108d59eb 100644 --- a/Assets/Scripts/Enemy/EnemyMovement.cs +++ b/Assets/Scripts/Enemy/EnemyMovement.cs @@ -13,21 +13,21 @@ public class EnemyMovement : MonoBehaviour { player = GameObject.FindGameObjectWithTag ("Player").transform; - //playerHealth = player.GetComponent <PlayerHealth> (); - //enemyHealth = GetComponent <EnemyHealth> (); + playerHealth = player.GetComponent <PlayerHealth> (); + enemyHealth = GetComponent <EnemyHealth> (); nav = GetComponent <UnityEngine.AI.NavMeshAgent> (); } void Update () { - //if (enemyHealth.currentHealth > 0 && playerHealth.currentHealth > 0) - //{ + if (enemyHealth.currentHealth > 0 && playerHealth.currentHealth > 0) + { nav.SetDestination (player.position); - //} - //else - //{ - // nav.enabled = false; - //} + } + else + { + nav.enabled = false; + } } } diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 1906017a76be54fb729d780d3122d006a38a395d..e04573331a571730a0f52f927ffcfea7bded8ece 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/0e/0e4b14094fcea23d44d5845721a12a4c b/Library/Artifacts/0e/0e4b14094fcea23d44d5845721a12a4c new file mode 100644 index 0000000000000000000000000000000000000000..32b5e1f57d2ad86cb784d5ada6ce8436f26f0a32 Binary files /dev/null and b/Library/Artifacts/0e/0e4b14094fcea23d44d5845721a12a4c differ diff --git a/Library/Artifacts/17/17155470f8faea2a37c3bf1423ec07c0 b/Library/Artifacts/17/17155470f8faea2a37c3bf1423ec07c0 new file mode 100644 index 0000000000000000000000000000000000000000..06206f93cf6b2d4403f2da20361caf13876bb40f Binary files /dev/null and b/Library/Artifacts/17/17155470f8faea2a37c3bf1423ec07c0 differ diff --git a/Library/Artifacts/23/23318cf341f8825ea7fcbbc8c3c438ef b/Library/Artifacts/23/23318cf341f8825ea7fcbbc8c3c438ef new file mode 100644 index 0000000000000000000000000000000000000000..89ce9519d1c7e53d16d5aff8471f8d51451db923 Binary files /dev/null and b/Library/Artifacts/23/23318cf341f8825ea7fcbbc8c3c438ef differ diff --git a/Library/Artifacts/2c/2c66bb3f747092ca8979387432a267bd b/Library/Artifacts/2c/2c66bb3f747092ca8979387432a267bd new file mode 100644 index 0000000000000000000000000000000000000000..df4b6bf615c9d2e90c86fd96ce62f741a6799ca1 Binary files /dev/null and b/Library/Artifacts/2c/2c66bb3f747092ca8979387432a267bd differ diff --git a/Library/Artifacts/35/355937c56ee6d93480f34e81997e89b1 b/Library/Artifacts/35/355937c56ee6d93480f34e81997e89b1 new file mode 100644 index 0000000000000000000000000000000000000000..8204ccfe733f1ca50064394443f9f97b2c0cc411 Binary files /dev/null and b/Library/Artifacts/35/355937c56ee6d93480f34e81997e89b1 differ diff --git a/Library/Artifacts/36/36ea689b46370cc09a354cc224976e74 b/Library/Artifacts/36/36ea689b46370cc09a354cc224976e74 new file mode 100644 index 0000000000000000000000000000000000000000..5d80898b41a52a75e4d26b050725a16bb3d0ad82 Binary files /dev/null and b/Library/Artifacts/36/36ea689b46370cc09a354cc224976e74 differ diff --git a/Library/Artifacts/3b/3b6c0cc2209984a9db7803b64bae82f0 b/Library/Artifacts/3b/3b6c0cc2209984a9db7803b64bae82f0 new file mode 100644 index 0000000000000000000000000000000000000000..28bcece346f427e6524c9462f5096ca0bcdbd05a Binary files /dev/null and b/Library/Artifacts/3b/3b6c0cc2209984a9db7803b64bae82f0 differ diff --git a/Library/Artifacts/3e/3e7163882e80dedc3e0894334a79b8b1 b/Library/Artifacts/3e/3e7163882e80dedc3e0894334a79b8b1 new file mode 100644 index 0000000000000000000000000000000000000000..fb48db28f6bf695159e54cfae6061af83252a5a4 Binary files /dev/null and b/Library/Artifacts/3e/3e7163882e80dedc3e0894334a79b8b1 differ diff --git a/Library/Artifacts/43/431858fe7091f7df073cd4f44fd094db b/Library/Artifacts/43/431858fe7091f7df073cd4f44fd094db new file mode 100644 index 0000000000000000000000000000000000000000..1f2ec9851ecb4d1a45c8653e812b6c7f29eb61ed Binary files /dev/null and b/Library/Artifacts/43/431858fe7091f7df073cd4f44fd094db differ diff --git a/Library/Artifacts/47/47a222b857ad1dc6709eb9cdfadf7cc4 b/Library/Artifacts/47/47a222b857ad1dc6709eb9cdfadf7cc4 new file mode 100644 index 0000000000000000000000000000000000000000..4d2de2c4e323b0c13022791c7212b7ca3c0ccee5 Binary files /dev/null and b/Library/Artifacts/47/47a222b857ad1dc6709eb9cdfadf7cc4 differ diff --git a/Library/Artifacts/49/49bb9b33339840ceedb1d7ed47e66215 b/Library/Artifacts/49/49bb9b33339840ceedb1d7ed47e66215 new file mode 100644 index 0000000000000000000000000000000000000000..7052d2a60402aa8246abd55db9a912c9f523a84f Binary files /dev/null and b/Library/Artifacts/49/49bb9b33339840ceedb1d7ed47e66215 differ diff --git a/Library/Artifacts/4b/4b86b80c2fb3af1b5ab5405d3425a1f6 b/Library/Artifacts/4b/4b86b80c2fb3af1b5ab5405d3425a1f6 new file mode 100644 index 0000000000000000000000000000000000000000..958b05b3a540b5645bc786148731644aa3e651c1 Binary files /dev/null and b/Library/Artifacts/4b/4b86b80c2fb3af1b5ab5405d3425a1f6 differ diff --git a/Library/Artifacts/4f/4f77f28f6061fd8cd1c284010b62480a b/Library/Artifacts/4f/4f77f28f6061fd8cd1c284010b62480a new file mode 100644 index 0000000000000000000000000000000000000000..f7f23ba5e59c43c1965c5d29dfaddf5ff4e30a4a Binary files /dev/null and b/Library/Artifacts/4f/4f77f28f6061fd8cd1c284010b62480a differ diff --git a/Library/Artifacts/54/541f3fea1dc51d8b6b7861a13a6f73e7 b/Library/Artifacts/54/541f3fea1dc51d8b6b7861a13a6f73e7 new file mode 100644 index 0000000000000000000000000000000000000000..af8d51ccad5a00898d76efbc0b4da6af4d51a1e4 Binary files /dev/null and b/Library/Artifacts/54/541f3fea1dc51d8b6b7861a13a6f73e7 differ diff --git a/Library/Artifacts/6b/6b04d3c1c4580a8661f2d61d78c03f66 b/Library/Artifacts/6b/6b04d3c1c4580a8661f2d61d78c03f66 new file mode 100644 index 0000000000000000000000000000000000000000..5d99de99bfaefb4dc700fe158da19774961c671c Binary files /dev/null and b/Library/Artifacts/6b/6b04d3c1c4580a8661f2d61d78c03f66 differ diff --git a/Library/Artifacts/6b/6b8b3120d79d8b58d33e02ff0fcecc1c b/Library/Artifacts/6b/6b8b3120d79d8b58d33e02ff0fcecc1c new file mode 100644 index 0000000000000000000000000000000000000000..348d35fdfb7bddf577f7b39f163b576eed0d539c Binary files /dev/null and b/Library/Artifacts/6b/6b8b3120d79d8b58d33e02ff0fcecc1c differ diff --git a/Library/Artifacts/76/7622e48867ec40be1fd78926d5dc58d2 b/Library/Artifacts/76/7622e48867ec40be1fd78926d5dc58d2 new file mode 100644 index 0000000000000000000000000000000000000000..979576054203310a888505a353693e2c8d7b791f Binary files /dev/null and b/Library/Artifacts/76/7622e48867ec40be1fd78926d5dc58d2 differ diff --git a/Library/Artifacts/76/764400ca97ca5db8d555b6754e59921d b/Library/Artifacts/76/764400ca97ca5db8d555b6754e59921d new file mode 100644 index 0000000000000000000000000000000000000000..4be23b343e080b10de6560504d7052270a4a7de8 Binary files /dev/null and b/Library/Artifacts/76/764400ca97ca5db8d555b6754e59921d differ diff --git a/Library/Artifacts/81/81f7328a318634a61d65f26e2f225cfb b/Library/Artifacts/81/81f7328a318634a61d65f26e2f225cfb new file mode 100644 index 0000000000000000000000000000000000000000..01b21b008867be6bbc376986b7e755cf92ccb50a Binary files /dev/null and b/Library/Artifacts/81/81f7328a318634a61d65f26e2f225cfb differ diff --git a/Library/Artifacts/88/88f76f361564b670237579a9b9bb895b b/Library/Artifacts/88/88f76f361564b670237579a9b9bb895b new file mode 100644 index 0000000000000000000000000000000000000000..8e80823c3ffa0af0a01f8da518c993b91dc45a3e Binary files /dev/null and b/Library/Artifacts/88/88f76f361564b670237579a9b9bb895b differ diff --git a/Library/Artifacts/89/897763132b11e04ac51a48ef2fa03c4f b/Library/Artifacts/89/897763132b11e04ac51a48ef2fa03c4f new file mode 100644 index 0000000000000000000000000000000000000000..0cea2a84c58abcafec1d8a6e76518b0e3b3c9ba6 Binary files /dev/null and b/Library/Artifacts/89/897763132b11e04ac51a48ef2fa03c4f differ diff --git a/Library/Artifacts/a3/a3d151da3ed27906e7a780f0b4ee2bfc b/Library/Artifacts/a3/a3d151da3ed27906e7a780f0b4ee2bfc new file mode 100644 index 0000000000000000000000000000000000000000..8db0a23366ca37aede998308c2b3c457c5b704f5 Binary files /dev/null and b/Library/Artifacts/a3/a3d151da3ed27906e7a780f0b4ee2bfc differ diff --git a/Library/Artifacts/af/af26de29f4817749955d409a0a33f296 b/Library/Artifacts/af/af26de29f4817749955d409a0a33f296 new file mode 100644 index 0000000000000000000000000000000000000000..e6f6882dcd12302afc2b1cbe3e1c37686ea599fd Binary files /dev/null and b/Library/Artifacts/af/af26de29f4817749955d409a0a33f296 differ diff --git a/Library/Artifacts/c4/c4a4df108bf3a644cd50857af8b9ae3a b/Library/Artifacts/c4/c4a4df108bf3a644cd50857af8b9ae3a new file mode 100644 index 0000000000000000000000000000000000000000..b56f0d6b41892ce4aa6c48dc9a1b9a80a2230be1 Binary files /dev/null and b/Library/Artifacts/c4/c4a4df108bf3a644cd50857af8b9ae3a differ diff --git a/Library/Artifacts/cf/cf1e6c4a969cc9099db1f777df47059c b/Library/Artifacts/cf/cf1e6c4a969cc9099db1f777df47059c new file mode 100644 index 0000000000000000000000000000000000000000..7793ef5b0ccb3d9e8504d0497d8adcaaa8c71b97 Binary files /dev/null and b/Library/Artifacts/cf/cf1e6c4a969cc9099db1f777df47059c differ diff --git a/Library/Artifacts/d5/d571f9bc99a3151edb347d6fd6581792 b/Library/Artifacts/d5/d571f9bc99a3151edb347d6fd6581792 new file mode 100644 index 0000000000000000000000000000000000000000..7991de833e2204a4467584ce86ebd61b64296291 Binary files /dev/null and b/Library/Artifacts/d5/d571f9bc99a3151edb347d6fd6581792 differ diff --git a/Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee b/Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee new file mode 100644 index 0000000000000000000000000000000000000000..12afa3ab8e257c8ff31a7cb3a1ee35251cd9ee21 Binary files /dev/null and b/Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee differ diff --git a/Library/Artifacts/e5/e5fd2d2bc347c17f12a64b0b68fb06dd b/Library/Artifacts/e5/e5fd2d2bc347c17f12a64b0b68fb06dd new file mode 100644 index 0000000000000000000000000000000000000000..99fbc3d915516e46d62a6faeb6d88f6970c9be49 Binary files /dev/null and b/Library/Artifacts/e5/e5fd2d2bc347c17f12a64b0b68fb06dd differ diff --git a/Library/Artifacts/f0/f0db13c689da4c554877b178de502ead b/Library/Artifacts/f0/f0db13c689da4c554877b178de502ead new file mode 100644 index 0000000000000000000000000000000000000000..6d28176b1df2abe085a91df49f134bb392ff7707 Binary files /dev/null and b/Library/Artifacts/f0/f0db13c689da4c554877b178de502ead differ diff --git a/Library/Artifacts/f7/f7dc01fbc5183cca0eedb739c780f32d b/Library/Artifacts/f7/f7dc01fbc5183cca0eedb739c780f32d new file mode 100644 index 0000000000000000000000000000000000000000..2708aca28a3512e92e8bc329d6e5b7bc14aa415c Binary files /dev/null and b/Library/Artifacts/f7/f7dc01fbc5183cca0eedb739c780f32d differ diff --git a/Library/Artifacts/fd/fd6959246dcbe69b4ac3116e22c86542 b/Library/Artifacts/fd/fd6959246dcbe69b4ac3116e22c86542 new file mode 100644 index 0000000000000000000000000000000000000000..bacb4f3b6fb2f5d035a456abf1e449f449970719 Binary files /dev/null and b/Library/Artifacts/fd/fd6959246dcbe69b4ac3116e22c86542 differ diff --git a/Library/Artifacts/fe/feaa85128925ec7bd900cf4debe29c87 b/Library/Artifacts/fe/feaa85128925ec7bd900cf4debe29c87 new file mode 100644 index 0000000000000000000000000000000000000000..28ab15ec73c420f03ca45f2107ade8f1756a9da4 Binary files /dev/null and b/Library/Artifacts/fe/feaa85128925ec7bd900cf4debe29c87 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 8dcb1bfd3f001a8b6a5e6900f56c853f2dd7e05d..64a8d3df47cefdea779d39fbb0097652d9d6eded 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 8 - y: 51 - width: 1350 - height: 709 + x: 1366 + y: -160 + width: 1280 + height: 917 m_ShowMode: 4 m_Title: Game m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 542} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1350 - height: 659 + width: 1280 + height: 867 m_MinSize: {x: 679, y: 492} m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 41 + controlID: 66 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,12 +64,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1031 + x: 978 y: 0 - width: 319 - height: 659 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 302 + height: 867 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -92,10 +92,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 255 - height: 388 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 242 + height: 510 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 388 - width: 1031 - height: 271 + y: 510 + width: 978 + height: 357 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 13} @@ -148,9 +148,9 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1350 - height: 709 - m_MinSize: {x: 875, y: 300} + width: 1280 + height: 917 + m_MinSize: {x: 875, y: 542} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 @@ -173,7 +173,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1350 + width: 1280 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -197,8 +197,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 689 - width: 1350 + y: 897 + width: 1280 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -221,12 +221,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1031 - height: 659 + width: 978 + height: 867 m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 42 + controlID: 67 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -246,12 +246,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1031 - height: 388 + width: 978 + height: 510 m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 43 + controlID: 68 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,12 +267,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 255 + x: 242 y: 0 - width: 776 - height: 388 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 736 + height: 510 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 16} @@ -361,10 +361,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 469 - width: 1030 - height: 250 + x: 1366 + y: 380 + width: 977 + height: 336 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -392,9 +392,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 90} - m_SelectedIDs: 68410000 - m_LastClickedID: 16744 - m_ExpandedIDs: 0000000030400000a6400000b0400000b64000005c41000000ca9a3b + m_SelectedIDs: ca400000 + m_LastClickedID: 16586 + m_ExpandedIDs: 0000000036400000b4400000cc40000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -422,7 +422,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000030400000 + m_ExpandedIDs: 0000000036400000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -449,7 +449,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -498,10 +498,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1039 - y: 81 - width: 318 - height: 638 + x: 2344 + y: -130 + width: 301 + height: 846 m_ViewDataDictionary: {fileID: 0} m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: @@ -535,17 +535,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 81 - width: 254 - height: 367 + x: 1366 + y: -130 + width: 241 + height: 489 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a23d0000 - m_LastClickedID: 15778 - m_ExpandedIDs: 5cfbffff72fbffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 72fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -656,7 +656,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0, y: 0, z: -0, w: -1} m_Size: m_Target: 20.74528 speed: 2 @@ -705,10 +705,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 263 - y: 81 - width: 774 - height: 367 + x: 1608 + y: -130 + width: 734 + height: 489 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] m_SerializedViewValues: [] @@ -716,7 +716,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 774, y: 346} + m_TargetSize: {x: 734, y: 468} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -731,10 +731,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -387 - m_HBaseRangeMax: 387 - m_VBaseRangeMin: -173 - m_VBaseRangeMax: 173 + m_HBaseRangeMin: -367 + m_HBaseRangeMax: 367 + m_VBaseRangeMin: -234 + m_VBaseRangeMax: 234 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -752,23 +752,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 774 - height: 346 + width: 734 + height: 468 m_Scale: {x: 1, y: 1} - m_Translation: {x: 387, y: 173} + m_Translation: {x: 367, y: 234} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -387 - y: -173 - width: 774 - height: 346 + x: -367 + y: -234 + width: 734 + height: 468 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 774, y: 367} + m_LastWindowPixelSize: {x: 734, y: 489} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 diff --git a/Library/EditorInstance.json b/Library/EditorInstance.json index 9bfce41213979ae2f91db85d6f582624d5ee231a..a75950eb96890f4489070dc7d77e5d46e7938501 100644 --- a/Library/EditorInstance.json +++ b/Library/EditorInstance.json @@ -1,5 +1,5 @@ { - "process_id" : 5468, + "process_id" : 7368, "version" : "2020.3.30f1", "app_path" : "C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Unity.exe", "app_contents_path" : "C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data" diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 811d57dcb4ad59e4f04260514f5e6a5b839aa3ab..09f010696f161fb2a9175f346f257035d27e47b6 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/SceneVisibilityState.asset b/Library/SceneVisibilityState.asset index cdb99251f1652381fd96d940c3feb59a887f66cb..a5743f87494401a2178e7a80dcf2b6e5b305a1a9 100644 Binary files a/Library/SceneVisibilityState.asset and b/Library/SceneVisibilityState.asset differ diff --git a/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/Library/ScriptAssemblies/BuiltinAssemblies.stamp deleted file mode 100644 index fc0a841fabcff5abd7b64aec4fcd9b340ede97db..0000000000000000000000000000000000000000 --- a/Library/ScriptAssemblies/BuiltinAssemblies.stamp +++ /dev/null @@ -1 +0,0 @@ -08d9f0137ce40900.08d9f013879e9e00 \ No newline at end of file diff --git a/Library/ShaderCache/0/0d8ed10231cca8eeacc03e6a9008e53f.bin b/Library/ShaderCache/0/0d8ed10231cca8eeacc03e6a9008e53f.bin new file mode 100644 index 0000000000000000000000000000000000000000..895c2655538ce41e0a8c85d925a9f8aef6b1b729 Binary files /dev/null and b/Library/ShaderCache/0/0d8ed10231cca8eeacc03e6a9008e53f.bin differ diff --git a/Library/ShaderCache/3/3fc1f11067a5af76af604ee15f1f49e7.bin b/Library/ShaderCache/3/3fc1f11067a5af76af604ee15f1f49e7.bin new file mode 100644 index 0000000000000000000000000000000000000000..8845e9a88cc225198bdb2aa167da69d6770bc20b Binary files /dev/null and b/Library/ShaderCache/3/3fc1f11067a5af76af604ee15f1f49e7.bin differ diff --git a/Library/ShaderCache/6/676b629c8d30a5e0d1178ab12c4f33a2.bin b/Library/ShaderCache/6/676b629c8d30a5e0d1178ab12c4f33a2.bin new file mode 100644 index 0000000000000000000000000000000000000000..46587c2c48991e086d48878858732e3f5116ae0a Binary files /dev/null and b/Library/ShaderCache/6/676b629c8d30a5e0d1178ab12c4f33a2.bin differ diff --git a/Library/ShaderCache/7/7eebecaf19d5ee39dff3bd40a3816259.bin b/Library/ShaderCache/7/7eebecaf19d5ee39dff3bd40a3816259.bin new file mode 100644 index 0000000000000000000000000000000000000000..a64f074d358fc7e4f77f2659b03eaedd7c8c6be0 Binary files /dev/null and b/Library/ShaderCache/7/7eebecaf19d5ee39dff3bd40a3816259.bin differ diff --git a/Library/ShaderCache/EditorEncounteredVariants b/Library/ShaderCache/EditorEncounteredVariants index 359cf4b2bbeaa3f2815abc963b7a081a6916ad48..783b05aaed111872705d94a94273b27ca0d384dc 100644 Binary files a/Library/ShaderCache/EditorEncounteredVariants and b/Library/ShaderCache/EditorEncounteredVariants differ diff --git a/Library/ShaderCache/e/e3d0d24d4ce7a72dac17e5183c21df0b.bin b/Library/ShaderCache/e/e3d0d24d4ce7a72dac17e5183c21df0b.bin new file mode 100644 index 0000000000000000000000000000000000000000..f3d72c5c9a730307694fe9f97ff95a9caa8bc7cb Binary files /dev/null and b/Library/ShaderCache/e/e3d0d24d4ce7a72dac17e5183c21df0b.bin differ diff --git a/Library/ShaderCache/e/e86e4da48bc11f561a3f235208710186.bin b/Library/ShaderCache/e/e86e4da48bc11f561a3f235208710186.bin new file mode 100644 index 0000000000000000000000000000000000000000..13c399b40ee0d52434c686f85750fc055f4e12b5 Binary files /dev/null and b/Library/ShaderCache/e/e86e4da48bc11f561a3f235208710186.bin differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index 87d0ff760444b6682f9e89660ef0cb6979415ea9..02ea4be6cef39056b674d11c9bb69f5b55f5e3c3 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json index 8ef437d29906b150b93ff65097a80ea01ba6e59a..fc83e0ce342a1542a341c0b4f4a5354b80d2a98b 100644 --- a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json +++ b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json @@ -1 +1 @@ -{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]} \ No newline at end of file +{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-1166],"m_LastClickedInstanceID":15782,"m_OpenSceneGUIDs":["7c6548dde5dbbeb4c8b3a296639c3b06"]} \ No newline at end of file diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt new file mode 100644 index 0000000000000000000000000000000000000000..aaf51f0c0099ee3c2807b262d58d742f9a022dc2 --- /dev/null +++ b/Logs/ApiUpdaterCheck.txt @@ -0,0 +1,10 @@ +[api-updater (non-obsolete-error-filter)] 3/23/2022 2:39:19 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 1037.9702ms +moved types parse time: 76ms +candidates parse time : 1ms +C# parse time : 756ms +candidates check time : 35ms +console write time : 1ms + diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log deleted file mode 100644 index d4be7c70b0d8b2b10b503b5406a31bb7b3986b25..0000000000000000000000000000000000000000 --- a/Logs/AssetImportWorker0-prev.log +++ /dev/null @@ -1,398 +0,0 @@ -Using pre-set license -Built from '2020.3/staging' branch; Version is '2020.3.30f1 (1fb1bf06830e) revision 2077119'; Using compiler version '192528614'; Build Type 'Release' -OS: 'Windows 10 (10.0.19044) 64bit CoreSingleLanguage' Language: 'en' Physical Memory: 12110 MB -BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0 - -COMMAND LINE ARGUMENTS: -C:\Program Files\Unity\Hub\Editor\2020.3.30f1\Editor\Unity.exe --adb2 --batchMode --noUpm --name -AssetImportWorker0 --projectPath -D:/GIT/Github/UNITY/Survival Shooter --logFile -Logs/AssetImportWorker0.log --srvPort -55983 -Successfully changed project path to: D:/GIT/Github/UNITY/Survival Shooter -D:/GIT/Github/UNITY/Survival Shooter -Using Asset Import Pipeline V2. -Refreshing native plugins compatible for Editor in 32.57 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Initialize engine version: 2020.3.30f1 (1fb1bf06830e) -[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Resources/UnitySubsystems -[Subsystems] Discovering subsystems at path D:/GIT/Github/UNITY/Survival Shooter/Assets -GfxDevice: creating device client; threaded=0 -Direct3D: - Version: Direct3D 11.0 [level 11.1] - Renderer: Radeon 530 Series (ID=0x6900) - Vendor: - VRAM: 2038 MB - Driver: 27.20.15002.118 -Initialize mono -Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Managed' -Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit' -Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/MonoBleedingEdge/etc' -Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56924 -Begin MonoManager ReloadAssembly -Registering precompiled unity dll's ... -Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll -Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll -Registered in 0.002280 seconds. -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 35.18 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 0.702 seconds -Domain Reload Profiling: - ReloadAssembly (703ms) - BeginReloadAssembly (91ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (0ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (2ms) - EndReloadAssembly (524ms) - LoadAssemblies (86ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (187ms) - ReleaseScriptCaches (0ms) - RebuildScriptCaches (34ms) - SetupLoadedEditorAssemblies (189ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) - SetLoadedEditorAssemblies (0ms) - RefreshPlugins (35ms) - BeforeProcessingInitializeOnLoad (11ms) - ProcessInitializeOnLoadAttributes (103ms) - ProcessInitializeOnLoadMethodAttributes (33ms) - AfterProcessingInitializeOnLoad (0ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (0ms) -Platform modules already initialized, skipping -Registering precompiled user dll's ... -Registered in 0.001896 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 0.40 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.335 seconds -Domain Reload Profiling: - ReloadAssembly (1336ms) - BeginReloadAssembly (190ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (6ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (19ms) - EndReloadAssembly (1078ms) - LoadAssemblies (116ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (300ms) - ReleaseScriptCaches (0ms) - RebuildScriptCaches (54ms) - SetupLoadedEditorAssemblies (521ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (0ms) - BeforeProcessingInitializeOnLoad (56ms) - ProcessInitializeOnLoadAttributes (428ms) - ProcessInitializeOnLoadMethodAttributes (22ms) - AfterProcessingInitializeOnLoad (8ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -======================================================================== -Worker process is ready to serve import requests -Launched and connected shader compiler UnityShaderCompiler.exe after 0.17 seconds -Refreshing native plugins compatible for Editor in 0.51 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 1535 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 70.1 MB. -System memory in use after: 70.1 MB. - -Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 1971. -Total: 3.429000 ms (FindLiveObjects: 0.147600 ms CreateObjectMapping: 0.057500 ms MarkObjects: 3.125200 ms DeleteObjects: 0.097200 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Import Request. - path: Assets/Scripts - artifactKey: Guid(5b4c49a66ffe046409ae2403576daed6) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/Scripts using Guid(5b4c49a66ffe046409ae2403576daed6) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '7f53c9c36bd3290cf5d34da370888c17') in 0.015306 seconds -======================================================================== -Received Import Request. - Time since last request: 0.000345 seconds. - path: Assets/Scripts/Player - artifactKey: Guid(ddcf9b9898ce58248b9a49113705d610) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/Scripts/Player using Guid(ddcf9b9898ce58248b9a49113705d610) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'd44417750b525b3cf004a82fc3181842') in 0.025987 seconds -======================================================================== -Received Import Request. - Time since last request: 0.000345 seconds. - path: Assets/Scripts/Player/PlayerMovement.cs - artifactKey: Guid(8ec45203ae7a1a54c9d02c355f983833) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/Scripts/Player/PlayerMovement.cs using Guid(8ec45203ae7a1a54c9d02c355f983833) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fb6d02dcb7f41e0315c6ad8548909a03') in 0.050424 seconds -======================================================================== -Received Import Request. - Time since last request: 44.869069 seconds. - path: Assets/_Complete-Game/Scripts/Player/PlayerMovement.cs - artifactKey: Guid(9b2268f9c7df8764aa2e92dbf55b5ae1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/_Complete-Game/Scripts/Player/PlayerMovement.cs using Guid(9b2268f9c7df8764aa2e92dbf55b5ae1) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '9309f38d27b970c59dc747e479a4175d') in 0.003039 seconds -======================================================================== -Received Import Request. - Time since last request: 965.597576 seconds. - path: Assets/_Complete-Game/Scripts/Player/PlayerShooting.cs - artifactKey: Guid(6c83720df9acb89488dbf2c0dbd3ad78) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/_Complete-Game/Scripts/Player/PlayerShooting.cs using Guid(6c83720df9acb89488dbf2c0dbd3ad78) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'fe21877f683a22e333deb041005a0e91') in 0.010315 seconds -======================================================================== -Received Import Request. - Time since last request: 0.984604 seconds. - path: Assets/_Complete-Game/Scripts/Player/PlayerHealth.cs - artifactKey: Guid(c32067ea884548644b13cf9baddd4573) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -Start importing Assets/_Complete-Game/Scripts/Player/PlayerHealth.cs using Guid(c32067ea884548644b13cf9baddd4573) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '81a6f72c3abd33455b87952c33d3ac08') in 0.009622 seconds -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.002036 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.024 seconds -Domain Reload Profiling: - ReloadAssembly (1024ms) - BeginReloadAssembly (126ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (4ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (34ms) - EndReloadAssembly (832ms) - LoadAssemblies (103ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (312ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (40ms) - SetupLoadedEditorAssemblies (285ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (0ms) - BeforeProcessingInitializeOnLoad (50ms) - ProcessInitializeOnLoadAttributes (211ms) - ProcessInitializeOnLoadMethodAttributes (9ms) - AfterProcessingInitializeOnLoad (7ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (7ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 1529 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 69.9 MB. -System memory in use after: 70.0 MB. - -Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1973. -Total: 3.237300 ms (FindLiveObjects: 0.159400 ms CreateObjectMapping: 0.058800 ms MarkObjects: 2.995500 ms DeleteObjects: 0.022400 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.001856 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 0.40 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.044 seconds -Domain Reload Profiling: - ReloadAssembly (1045ms) - BeginReloadAssembly (122ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (34ms) - EndReloadAssembly (850ms) - LoadAssemblies (108ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (319ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (42ms) - SetupLoadedEditorAssemblies (288ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (0ms) - BeforeProcessingInitializeOnLoad (55ms) - ProcessInitializeOnLoadAttributes (212ms) - ProcessInitializeOnLoadMethodAttributes (9ms) - AfterProcessingInitializeOnLoad (6ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (7ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 0.58 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 1529 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 69.9 MB. -System memory in use after: 70.0 MB. - -Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1975. -Total: 2.982500 ms (FindLiveObjects: 0.218700 ms CreateObjectMapping: 0.077500 ms MarkObjects: 2.662700 ms DeleteObjects: 0.022600 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.001554 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.015 seconds -Domain Reload Profiling: - ReloadAssembly (1016ms) - BeginReloadAssembly (121ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (33ms) - EndReloadAssembly (828ms) - LoadAssemblies (101ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (301ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (42ms) - SetupLoadedEditorAssemblies (285ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (6ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (0ms) - BeforeProcessingInitializeOnLoad (51ms) - ProcessInitializeOnLoadAttributes (212ms) - ProcessInitializeOnLoadMethodAttributes (8ms) - AfterProcessingInitializeOnLoad (7ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (13ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 0.37 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 1529 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 70.0 MB. -System memory in use after: 70.1 MB. - -Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1977. -Total: 3.188200 ms (FindLiveObjects: 0.165500 ms CreateObjectMapping: 0.078800 ms MarkObjects: 2.919900 ms DeleteObjects: 0.022900 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -======================================================================== -Received Prepare -Registering precompiled user dll's ... -Registered in 0.001584 seconds. -Begin MonoManager ReloadAssembly -Native extension for WindowsStandalone target not found -Native extension for WebGL target not found -Refreshing native plugins compatible for Editor in 0.35 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Mono: successfully reloaded assembly -- Completed reload, in 1.018 seconds -Domain Reload Profiling: - ReloadAssembly (1019ms) - BeginReloadAssembly (120ms) - ExecutionOrderSort (0ms) - DisableScriptedObjects (5ms) - BackupInstance (0ms) - ReleaseScriptingObjects (0ms) - CreateAndSetChildDomain (34ms) - EndReloadAssembly (830ms) - LoadAssemblies (98ms) - RebuildTransferFunctionScriptingTraits (0ms) - SetupTypeCache (307ms) - ReleaseScriptCaches (1ms) - RebuildScriptCaches (43ms) - SetupLoadedEditorAssemblies (292ms) - LogAssemblyErrors (0ms) - InitializePlatformSupportModulesInManaged (8ms) - SetLoadedEditorAssemblies (1ms) - RefreshPlugins (0ms) - BeforeProcessingInitializeOnLoad (51ms) - ProcessInitializeOnLoadAttributes (216ms) - ProcessInitializeOnLoadMethodAttributes (8ms) - AfterProcessingInitializeOnLoad (8ms) - EditorAssembliesLoaded (0ms) - ExecutionOrderSort2 (0ms) - AwakeInstancesAfterBackupRestoration (7ms) -Platform modules already initialized, skipping -Refreshing native plugins compatible for Editor in 0.36 ms, found 2 plugins. -Preloading 0 native plugins for Editor in 0.00 ms. -Unloading 1529 Unused Serialized files (Serialized files now loaded: 0) -System memory in use before: 70.0 MB. -System memory in use after: 70.1 MB. - -Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1979. -Total: 2.895000 ms (FindLiveObjects: 0.191800 ms CreateObjectMapping: 0.050500 ms MarkObjects: 2.625600 ms DeleteObjects: 0.025700 ms) - -AssetImportParameters requested are different than current active one (requested -> active): - custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 -> - custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc -> - custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b -> - custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 -> - custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 -> - custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 -> - custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 -> - custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> - custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 -> -AssetImportWorkerClient::OnTransportError - code=2 error=End of file diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log new file mode 100644 index 0000000000000000000000000000000000000000..3815c06af453c50c303e23c2e3426c47a49629e9 --- /dev/null +++ b/Logs/shadercompiler-AssetImportWorker0.log @@ -0,0 +1 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines' diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log index 3f69716475f4300bb19bf6d9b27411eafc5bf607..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/Logs/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,3 +0,0 @@ -Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines' -Cmd: initializeCompiler - diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log new file mode 100644 index 0000000000000000000000000000000000000000..3815c06af453c50c303e23c2e3426c47a49629e9 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe1.log @@ -0,0 +1 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines' diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe2.log b/Logs/shadercompiler-UnityShaderCompiler.exe2.log new file mode 100644 index 0000000000000000000000000000000000000000..3815c06af453c50c303e23c2e3426c47a49629e9 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe2.log @@ -0,0 +1 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines' diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log new file mode 100644 index 0000000000000000000000000000000000000000..3815c06af453c50c303e23c2e3426c47a49629e9 --- /dev/null +++ b/Logs/shadercompiler-UnityShaderCompiler.exe3.log @@ -0,0 +1 @@ +Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines'