From 8d417d2d86fd1013526c8d19aac593aa680dc597 Mon Sep 17 00:00:00 2001 From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:12:54 -0500 Subject: [PATCH] replaced king head in lobby: --- Assets/Scenes/Game-Mountain.unity | 231 ++++++++++++++++---------- Assets/Scenes/Lobby.unity | 196 ++++++++-------------- ProjectSettings/TagManager.asset | 2 +- UserSettings/EditorUserSettings.asset | 28 ++-- 4 files changed, 227 insertions(+), 230 deletions(-) diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index cbce370..eb37184 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -808,7 +808,7 @@ GameObject: - component: {fileID: 14200312} - component: {fileID: 14200311} - component: {fileID: 14200310} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1488,7 +1488,7 @@ GameObject: - component: {fileID: 30366847} - component: {fileID: 30366846} - component: {fileID: 30366845} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4248,7 +4248,7 @@ GameObject: - component: {fileID: 89465360} - component: {fileID: 89465359} - component: {fileID: 89465358} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -5953,7 +5953,7 @@ GameObject: - component: {fileID: 117229214} - component: {fileID: 117229213} - component: {fileID: 117229212} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -6291,7 +6291,7 @@ GameObject: - component: {fileID: 123437790} - component: {fileID: 123437789} - component: {fileID: 123437788} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8688,7 +8688,7 @@ GameObject: - component: {fileID: 161125226} - component: {fileID: 161125225} - component: {fileID: 161125224} - m_Layer: 0 + m_Layer: 16 m_Name: Right Angle Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -9864,7 +9864,7 @@ GameObject: - component: {fileID: 185020680} - component: {fileID: 185020679} - component: {fileID: 185020678} - m_Layer: 0 + m_Layer: 16 m_Name: Left Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -10260,7 +10260,7 @@ GameObject: - component: {fileID: 189643335} - component: {fileID: 189643334} - component: {fileID: 189643333} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10356,7 +10356,7 @@ GameObject: - component: {fileID: 190835505} - component: {fileID: 190835504} - component: {fileID: 190835503} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (34) m_TagString: Untagged m_Icon: {fileID: 0} @@ -16040,7 +16040,7 @@ GameObject: - component: {fileID: 215113618} - component: {fileID: 215113617} - component: {fileID: 215113616} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -16539,7 +16539,7 @@ GameObject: - component: {fileID: 227541517} - component: {fileID: 227541516} - component: {fileID: 227541515} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -17451,7 +17451,7 @@ GameObject: - component: {fileID: 240816438} - component: {fileID: 240816437} - component: {fileID: 240816436} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17711,7 +17711,7 @@ GameObject: - component: {fileID: 242067969} - component: {fileID: 242067968} - component: {fileID: 242067967} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (25) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18139,7 +18139,7 @@ GameObject: - component: {fileID: 249474764} - component: {fileID: 249474763} - component: {fileID: 249474762} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (38) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18626,7 +18626,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 256312161} - m_Layer: 0 + m_Layer: 16 m_Name: Invisible Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -19391,6 +19391,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (6) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -19649,6 +19653,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (4) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -19751,7 +19759,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 271023841} - m_Layer: 0 + m_Layer: 16 m_Name: Invisible Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -19883,7 +19891,7 @@ GameObject: - component: {fileID: 274628237} - component: {fileID: 274628236} - component: {fileID: 274628235} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20992,6 +21000,10 @@ PrefabInstance: propertyPath: m_Name value: MountainRP4 objectReference: {fileID: 0} + - target: {fileID: 1430223874298954445, guid: 32877ab32805617498ca886a633fec50, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32877ab32805617498ca886a633fec50, type: 3} --- !u!4 &294430288 stripped @@ -21907,7 +21919,7 @@ GameObject: - component: {fileID: 304990588} - component: {fileID: 304990587} - component: {fileID: 304990586} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (17) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22003,7 +22015,7 @@ GameObject: - component: {fileID: 305411030} - component: {fileID: 305411029} - component: {fileID: 305411028} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22296,7 +22308,7 @@ GameObject: - component: {fileID: 307563028} - component: {fileID: 307563027} - component: {fileID: 307563026} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22872,7 +22884,7 @@ GameObject: - component: {fileID: 316992133} - component: {fileID: 316992132} - component: {fileID: 316992131} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (33) m_TagString: Untagged m_Icon: {fileID: 0} @@ -23453,7 +23465,7 @@ GameObject: - component: {fileID: 334800067} - component: {fileID: 334800066} - component: {fileID: 334800065} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (26) m_TagString: Untagged m_Icon: {fileID: 0} @@ -25068,6 +25080,7 @@ MonoBehaviour: kickItem: {fileID: 0} grapple: {fileID: 0} Glide: {fileID: 0} + boxHighlight: {fileID: 0} --- !u!114 &358007096 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25242,7 +25255,7 @@ GameObject: - component: {fileID: 360844872} - component: {fileID: 360844871} - component: {fileID: 360844870} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (39) m_TagString: Untagged m_Icon: {fileID: 0} @@ -25772,7 +25785,7 @@ GameObject: - component: {fileID: 365932312} - component: {fileID: 365932311} - component: {fileID: 365932310} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (31) m_TagString: Untagged m_Icon: {fileID: 0} @@ -26360,7 +26373,7 @@ GameObject: - component: {fileID: 374966755} - component: {fileID: 374966754} - component: {fileID: 374966753} - m_Layer: 0 + m_Layer: 16 m_Name: Front Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -26783,7 +26796,7 @@ GameObject: - component: {fileID: 385253553} - component: {fileID: 385253552} - component: {fileID: 385253551} - m_Layer: 0 + m_Layer: 16 m_Name: Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -28017,7 +28030,7 @@ GameObject: - component: {fileID: 407291406} - component: {fileID: 407291405} - component: {fileID: 407291404} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (27) m_TagString: Untagged m_Icon: {fileID: 0} @@ -28110,7 +28123,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 407674778} - m_Layer: 0 + m_Layer: 16 m_Name: Invisible Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -28346,7 +28359,7 @@ GameObject: - component: {fileID: 416375137} - component: {fileID: 416375136} - component: {fileID: 416375135} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -29398,7 +29411,7 @@ GameObject: - component: {fileID: 446397478} - component: {fileID: 446397477} - component: {fileID: 446397476} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (37) m_TagString: Untagged m_Icon: {fileID: 0} @@ -29654,7 +29667,7 @@ GameObject: - component: {fileID: 448627064} - component: {fileID: 448627063} - component: {fileID: 448627062} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -30637,7 +30650,7 @@ GameObject: - component: {fileID: 460554697} - component: {fileID: 460554696} - component: {fileID: 460554695} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -34188,7 +34201,7 @@ GameObject: - component: {fileID: 502838095} - component: {fileID: 502838094} - component: {fileID: 502838093} - m_Layer: 0 + m_Layer: 16 m_Name: Left Angle Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -36704,6 +36717,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (5) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -40652,7 +40669,7 @@ GameObject: - component: {fileID: 616640599} - component: {fileID: 616640598} - component: {fileID: 616640597} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -43289,7 +43306,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 655697233} - m_Layer: 0 + m_Layer: 16 m_Name: Invisible Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -45802,7 +45819,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_LocalScale.x @@ -45941,7 +45958,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 711017710} - m_Layer: 0 + m_Layer: 16 m_Name: Border Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -45976,7 +45993,7 @@ GameObject: - component: {fileID: 715477515} - component: {fileID: 715477514} - component: {fileID: 715477513} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -46072,7 +46089,7 @@ GameObject: - component: {fileID: 715791809} - component: {fileID: 715791808} - component: {fileID: 715791807} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (23) m_TagString: Untagged m_Icon: {fileID: 0} @@ -56818,7 +56835,7 @@ GameObject: - component: {fileID: 832352205} - component: {fileID: 832352204} - component: {fileID: 832352203} - m_Layer: 0 + m_Layer: 16 m_Name: Left Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -58353,7 +58370,7 @@ GameObject: - component: {fileID: 864392754} - component: {fileID: 864392753} - component: {fileID: 864392752} - m_Layer: 0 + m_Layer: 16 m_Name: Left Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -59767,7 +59784,7 @@ GameObject: - component: {fileID: 891236286} - component: {fileID: 891236285} - component: {fileID: 891236284} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -61074,7 +61091,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 916346170} - m_Layer: 0 + m_Layer: 16 m_Name: Border Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -61369,7 +61386,7 @@ GameObject: - component: {fileID: 922880969} - component: {fileID: 922880968} - component: {fileID: 922880967} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -62127,7 +62144,7 @@ GameObject: - component: {fileID: 935252827} - component: {fileID: 935252826} - component: {fileID: 935252825} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -62223,7 +62240,7 @@ GameObject: - component: {fileID: 937093167} - component: {fileID: 937093166} - component: {fileID: 937093165} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -64217,7 +64234,7 @@ GameObject: - component: {fileID: 965408409} - component: {fileID: 965408408} - component: {fileID: 965408407} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -64790,7 +64807,7 @@ GameObject: - component: {fileID: 984352470} - component: {fileID: 984352469} - component: {fileID: 984352468} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (30) m_TagString: Untagged m_Icon: {fileID: 0} @@ -67326,6 +67343,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (7) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -67472,7 +67493,7 @@ GameObject: - component: {fileID: 1028773904} - component: {fileID: 1028773903} - component: {fileID: 1028773902} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -69164,7 +69185,7 @@ GameObject: - component: {fileID: 1060834247} - component: {fileID: 1060834246} - component: {fileID: 1060834245} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -70322,7 +70343,7 @@ GameObject: - component: {fileID: 1084971899} - component: {fileID: 1084971898} - component: {fileID: 1084971897} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (28) m_TagString: Untagged m_Icon: {fileID: 0} @@ -70751,7 +70772,7 @@ GameObject: - component: {fileID: 1096069951} - component: {fileID: 1096069950} - component: {fileID: 1096069949} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (36) m_TagString: Untagged m_Icon: {fileID: 0} @@ -71095,7 +71116,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1103189204} - m_Layer: 0 + m_Layer: 16 m_Name: Track Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -71413,7 +71434,7 @@ GameObject: - component: {fileID: 1110733458} - component: {fileID: 1110733457} - component: {fileID: 1110733456} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -75664,7 +75685,7 @@ GameObject: - component: {fileID: 1188861603} - component: {fileID: 1188861602} - component: {fileID: 1188861601} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -76107,7 +76128,7 @@ GameObject: - component: {fileID: 1194658024} - component: {fileID: 1194658023} - component: {fileID: 1194658022} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -77116,7 +77137,7 @@ GameObject: - component: {fileID: 1213479952} - component: {fileID: 1213479951} - component: {fileID: 1213479950} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -78944,7 +78965,7 @@ GameObject: - component: {fileID: 1244800521} - component: {fileID: 1244800520} - component: {fileID: 1244800519} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -80132,7 +80153,7 @@ GameObject: - component: {fileID: 1264280567} - component: {fileID: 1264280566} - component: {fileID: 1264280565} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -80525,6 +80546,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -80644,7 +80669,7 @@ GameObject: - component: {fileID: 1272714513} - component: {fileID: 1272714512} - component: {fileID: 1272714511} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -80953,7 +80978,7 @@ GameObject: - component: {fileID: 1278241391} - component: {fileID: 1278241390} - component: {fileID: 1278241389} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (20) m_TagString: Untagged m_Icon: {fileID: 0} @@ -84368,7 +84393,7 @@ GameObject: - component: {fileID: 1323629286} - component: {fileID: 1323629285} - component: {fileID: 1323629284} - m_Layer: 0 + m_Layer: 16 m_Name: Right Angle Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -84766,6 +84791,10 @@ PrefabInstance: propertyPath: m_Name value: MountainRP2 objectReference: {fileID: 0} + - target: {fileID: 1430223874298954445, guid: 32877ab32805617498ca886a633fec50, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32877ab32805617498ca886a633fec50, type: 3} --- !u!4 &1326772648 stripped @@ -86245,7 +86274,7 @@ GameObject: - component: {fileID: 1352952425} - component: {fileID: 1352952424} - component: {fileID: 1352952423} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -86498,7 +86527,7 @@ GameObject: - component: {fileID: 1358775417} - component: {fileID: 1358775416} - component: {fileID: 1358775415} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (29) m_TagString: Untagged m_Icon: {fileID: 0} @@ -87703,7 +87732,7 @@ GameObject: - component: {fileID: 1380768246} - component: {fileID: 1380768245} - component: {fileID: 1380768244} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (18) m_TagString: Untagged m_Icon: {fileID: 0} @@ -87916,7 +87945,7 @@ GameObject: - component: {fileID: 1384707771} - component: {fileID: 1384707770} - component: {fileID: 1384707769} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (24) m_TagString: Untagged m_Icon: {fileID: 0} @@ -88814,7 +88843,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1398597339} - m_Layer: 0 + m_Layer: 16 m_Name: Mountain Killzones m_TagString: Untagged m_Icon: {fileID: 0} @@ -90750,6 +90779,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (1) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -91253,7 +91286,7 @@ GameObject: - component: {fileID: 1440881171} - component: {fileID: 1440881170} - component: {fileID: 1440881169} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -92119,7 +92152,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1457390346} - m_Layer: 0 + m_Layer: 16 m_Name: Volcano Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -97495,7 +97528,7 @@ GameObject: - component: {fileID: 1467662829} - component: {fileID: 1467662828} - component: {fileID: 1467662827} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -104926,7 +104959,7 @@ GameObject: - component: {fileID: 1591673158} - component: {fileID: 1591673157} - component: {fileID: 1591673156} - m_Layer: 0 + m_Layer: 16 m_Name: Back Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -111329,7 +111362,7 @@ GameObject: - component: {fileID: 1630822938} - component: {fileID: 1630822937} - component: {fileID: 1630822936} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -113848,7 +113881,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 17.77, y: 90, z: 0} --- !u!114 &1664207033 MonoBehaviour: @@ -116600,7 +116633,7 @@ GameObject: - component: {fileID: 1713054827} - component: {fileID: 1713054826} - component: {fileID: 1713054825} - m_Layer: 0 + m_Layer: 16 m_Name: Left Angle Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -118425,7 +118458,7 @@ GameObject: - component: {fileID: 1753104469} - component: {fileID: 1753104468} - component: {fileID: 1753104467} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (19) m_TagString: Untagged m_Icon: {fileID: 0} @@ -118920,7 +118953,7 @@ GameObject: - component: {fileID: 1760442483} - component: {fileID: 1760442482} - component: {fileID: 1760442481} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (22) m_TagString: Untagged m_Icon: {fileID: 0} @@ -119995,7 +120028,7 @@ GameObject: - component: {fileID: 1780536527} - component: {fileID: 1780536526} - component: {fileID: 1780536525} - m_Layer: 0 + m_Layer: 16 m_Name: Back Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -120633,7 +120666,7 @@ GameObject: - component: {fileID: 1785119244} - component: {fileID: 1785119243} - component: {fileID: 1785119242} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (35) m_TagString: Untagged m_Icon: {fileID: 0} @@ -120932,6 +120965,10 @@ PrefabInstance: propertyPath: m_Name value: MountainRP1 objectReference: {fileID: 0} + - target: {fileID: 1430223874298954445, guid: 32877ab32805617498ca886a633fec50, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32877ab32805617498ca886a633fec50, type: 3} --- !u!4 &1788527569 stripped @@ -122857,7 +122894,7 @@ GameObject: - component: {fileID: 1819137290} - component: {fileID: 1819137289} - component: {fileID: 1819137288} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -124312,7 +124349,7 @@ GameObject: - component: {fileID: 1840970829} - component: {fileID: 1840970828} - component: {fileID: 1840970827} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -125307,7 +125344,7 @@ GameObject: - component: {fileID: 1862105919} - component: {fileID: 1862105918} - component: {fileID: 1862105917} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -125770,7 +125807,7 @@ GameObject: - component: {fileID: 1869085820} - component: {fileID: 1869085819} - component: {fileID: 1869085818} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -125982,6 +126019,10 @@ PrefabInstance: propertyPath: m_Name value: MountainRP3 objectReference: {fileID: 0} + - target: {fileID: 1430223874298954445, guid: 32877ab32805617498ca886a633fec50, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32877ab32805617498ca886a633fec50, type: 3} --- !u!4 &1875049836 stripped @@ -126824,7 +126865,7 @@ GameObject: - component: {fileID: 1881462752} - component: {fileID: 1881462751} - component: {fileID: 1881462750} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -128825,6 +128866,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (2) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -133232,7 +133277,7 @@ GameObject: - component: {fileID: 1989173871} - component: {fileID: 1989173870} - component: {fileID: 1989173869} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (21) m_TagString: Untagged m_Icon: {fileID: 0} @@ -136278,7 +136323,7 @@ GameObject: - component: {fileID: 2046675105} - component: {fileID: 2046675104} - component: {fileID: 2046675103} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (32) m_TagString: Untagged m_Icon: {fileID: 0} @@ -136456,7 +136501,7 @@ GameObject: - component: {fileID: 2048059041} - component: {fileID: 2048059040} - component: {fileID: 2048059039} - m_Layer: 0 + m_Layer: 16 m_Name: Right Wall (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -138141,7 +138186,7 @@ GameObject: - component: {fileID: 2093960242} - component: {fileID: 2093960241} - component: {fileID: 2093960240} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -138634,7 +138679,7 @@ GameObject: - component: {fileID: 2100425794} - component: {fileID: 2100425793} - component: {fileID: 2100425792} - m_Layer: 0 + m_Layer: 16 m_Name: Wall (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -140103,6 +140148,10 @@ PrefabInstance: propertyPath: m_Name value: Primary Mountain Killzone (3) objectReference: {fileID: 0} + - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_IsActive value: 1 @@ -140123,7 +140172,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2128453449} - m_Layer: 0 + m_Layer: 16 m_Name: Vertical Section Walls m_TagString: Untagged m_Icon: {fileID: 0} @@ -141235,7 +141284,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_LocalPosition.x @@ -141830,7 +141879,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 7faf84c..5515b67 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -123,37 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &628299623 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 628299624} - m_Layer: 0 - m_Name: StandInKing - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &628299624 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 628299623} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 23, y: 2.1, z: 45.1} - m_LocalScale: {x: 10, y: 10, z: 10} - m_Children: - - {fileID: 1607833154} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &651583808 GameObject: m_ObjectHideFlags: 0 @@ -404,101 +373,80 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2080873442886702253, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} m_PrefabInstance: {fileID: 1129569235} m_PrefabAsset: {fileID: 0} ---- !u!1 &1607833153 -GameObject: +--- !u!1001 &1822173499 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1607833154} - - component: {fileID: 1607833157} - - component: {fileID: 1607833156} - - component: {fileID: 1607833155} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1607833154 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607833153} - 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_Children: [] - m_Father: {fileID: 628299624} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1607833155 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607833153} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1607833156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2715093778034557172, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_Name + value: KingHeadUVd + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalScale.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalScale.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalScale.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalPosition.x + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalPosition.y + value: -9.76 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalPosition.z + value: 45.1 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} +--- !u!1 &1822173500 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2715093778034557172, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} + m_PrefabInstance: {fileID: 1822173499} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607833153} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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!33 &1607833157 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607833153} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1857311124 GameObject: m_ObjectHideFlags: 0 @@ -575,7 +523,7 @@ PrefabInstance: - target: {fileID: 1900253489175822351, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: king value: - objectReference: {fileID: 628299623} + objectReference: {fileID: 1822173500} - target: {fileID: 1900253489175822351, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: player value: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 952784e..1450bc5 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -44,7 +44,7 @@ TagManager: - Door - DoorFrame - PlayerKicking - - + - InvisibleWall - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1b17d78..db8a7a6 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c731f1415016439262f2434 - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c731f1415016439262f2434 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650