From ccef3306f50416c70b20daeee97ddf0ac01d9137 Mon Sep 17 00:00:00 2001 From: szczuras4 Date: Mon, 17 Mar 2025 00:31:45 +0100 Subject: [PATCH] Last Cut scene, Giant cut scene fix, VO, new version --- .../Giant/Materials_Giant/B_skin Giant02.mat | 4 +- Assets/Meshes/Terrain/Terrain_Land01.asset | Bin 13606780 -> 13606780 bytes .../Rocks/Desert/LOCl_Rock.prefab | 85 +- .../Scenes/Land_01/Land_Of_Death_Demo.unity | 2586 ++++++----------- .../FluXY/Resources/Materials/Splat.mat | 4 +- .../Resources/Materials/URP VolumetricFog.mat | 2 +- Packages/packages-lock.json | 12 +- ProjectSettings/ProjectVersion.txt | 4 +- 8 files changed, 1024 insertions(+), 1673 deletions(-) diff --git a/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant02.mat b/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant02.mat index c1796f2d0..e4df3a056 100644 --- a/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant02.mat +++ b/Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant02.mat @@ -126,7 +126,7 @@ Material: - FresnelPower: 4 - Metalness: 3 - NormalStrength: 1.29 - - Smoothness: 0.99 + - Smoothness: 0.74 - USEDISSOLVE: 0 - USEDISSOLVEMASK: 0 - USEFRESNEL: 0 @@ -211,7 +211,7 @@ Material: - BaseColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0} - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _BaseColor: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} + - _BaseColor: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1} - _BendVector: {r: 0, g: -1, b: 0, a: 0} - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _DistanceFade: {r: 398.00253, g: 0.01, b: 0, a: 0} diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index c80241f2db31fb717877e1175dcf7f59b2b99c20..4a9dfa82fd3ff5c82ee1ef66e5c7c49a18fde3e2 100644 GIT binary patch delta 3290 zcmYk;30zdw9tZGqXW=>rX7y_Un;byWtK~y^}o{FptwOLF{ z@T+*sJ4#uSp`99w6gQ@rbzO3TIzR+O zLKJj_Xy^nn@C0;*Sm**>Ar87hcX$$dKs+QsBJ_k_kOWUbGNeFnut6$34SgUDo`H18 zfK2EM{b<$BtnEJqHDVW^fnd-8D@!yOF}VOy9)B`iG+e}jzg3o9B}>s+tYX2Y}49|pj4Fc5O!A20}>hr#qp?T~LiX?qy&)(fx{iu&4xB-txzN~kRCaSAJr0pM>E*71xKS_~UWAw6Wq1X~z*xwK zaZmu`sUXhY=?VFsLCdwgiB=A_-;o1#{P9Q2X?33cmMo^Z>?V45jQyIdX)>r!7Fs{S zepQws!zIIgI#6T3(3r6+^+RwKnqR;DFi!qW+ z$F4klAE`anTyO0hLti%9FSd>oNXH+vHj0sw>7?vv$q*xTA)n&FbjGJRVx&|$V^tq! z?6gPgO+1s2q;rvK)8;@h@5f)J3$c#xWl0v(ciKDYjeGzfPd~(~Awx^Z%%A5|=u!$o zZ39|2DTv2#KXnVNdMh8!XVI_e7}a3q;k+Y{x0!`0uN~!B#=MNXVT3)$0b?n@^IWiypaAJgOIi}_ZQP$cC)@GpNJ9vnt;wINAp0D zpW-lUvv?8xH5Dy8BqF1RjzW)zXE>aXqX)wA zm)v$B-bas*Kkv>9NGexj!+0vjwO|6z@_f>6bu`NUgLq%`@6TUAD}9yYj;zn&Ief57 zTkU`eFcDsbf5Ie~3{&7WmmISt29S! zEZ178_?G(^?zrnFU0G6Wm?m#4IW(SnMGP?ptC2{W80@*AG+)XhvtWTyB;;#C^mXx! zrHLPUEegR!pVfSW)46C5u59)8M!$JXf!(;^PddB5|`Tj0!cS-zkCLc5SK9HZgXtGnTbI6$Yb%-RQfc(LpcCB7I1R-hfv6yJ|0?Xr2od z?Gkhrn(~FWMz*kO#vUHhq+0yw_`A7TP_bVa*-v>-$flz$+4Of9%iY14=QVT?iBtER z)J*j9x85@{@9<;GYm`mGURWvjqPJe=Pq+3AxlE~-y|-n};@POR(11U@*JQsZ&f!Gg zpw!#myRzShIKu0OxKi(X;Sd~#BXATxhhy*s)WDZ;oKo+9b*0jP?VdG^v8sU-S5e!j z4N`wIon=hA$Jmo~IBUO&{6nEe%HCRAujT4o+yBg1at-y^UVB^X7g5hx+!>0is=cfA zOW&u?p5peX4<%z6o0;#5tFDC;6jy!n)-S=`a~N~D7<+CHW8F?8)6YVR*IOuSpnd^Ge9c%_kvnXek$P928oSRg%*I&88)E$!-(A13BE~{1Y5iE= nz8)G&vKa05EzksxrT@Bp>-{zD`q7-VzCScl5WTwIXO#X2{M6K& delta 4260 zcmZXX2UJwY8pmfFml>5S-G(Tr2pYf=aZ&7OqA@Bes8K;-*RH5h!6?PJ63YvVsAH^H zh~}x0STbrtv4V{SjlE%y9ec#W`_Gb>}FgZ};qdmzU@84p`f2f>Vta zqsC&?T8ui2QExFCEJg>5QLz{uEkaM#m8gpfcmj_*%ZT*XYA`(-t=lb<6sW3eY_$2)gjoW>h?yXkqi9H)9P zGG24FkE3W%=HAAxHPnO7i$BeB_vGc>qQ2xM!FoO4WpnW1<(GpUMZI$OP`i+qFJ9yi zSB7X_=HsFl_bc7wRYN6qkLRC<~2wO+$Hkxtm^` z_4Zh#a?OBLU%A-1YVlZ*$8uFOkC$%$HISE2aM$zA(+fW0@ptm{;z&nno6a=|Eb{tz zWT|{(X2u{MpWRO{_CL1if`9?l&JiNmBqn!7io*PdjL;R z3)BX6KwVG|c!B!B8#Dk7fe-KnjX-121o(lbz#jyFW}rFv2n2#45DZ#?mY@}A4L$~K zKnQ3Hj35-W1MNW==m0u`PM|aB0=kOD+q-SO=`1_E8uS1Zkjxg;HPhOpI?oC^S&x@p zMZ>?%49`*QXJKz*53yin_#Q=*%{4)Wc1yE7^)D)lDsj?_DLcbUJh@x3TP2R*s5;ibDP&1m38$U2v z(?&cPKX7d|&9JnE2?IeSh!P7E2EEVGB}A{~3;hQ-)TRXTAN>dW=tk~X&rf4P=iY2J zf9*dwT$eOwE$0~>b9$X##ojB3^oBm7 zHd;uFpuUXN+lc*^s?1r4wWdpoUnRYd-B;;xdJOufh^ngB*xylCkt?A0`vdo{pg(HY9fEE@_7ou2F{~X$W{;tNC35qTOXG6%;0}Brpn1?7 z!K(;)9YCByT;=<9`cC8)nyx6m_tDi;$aVjp+7rn2928P5YdK8Mi(DIe*QgvGa}8yM;hcaN1|#?hLLM?Ik^gjxitBR-9DKC`)P;4Ezg(dWh+HfjRtu z=`6*ba%eqS8`e?SR5Scar6Z&8EobDteXca@G0s%WyjTe9z`C*?;&+rql(^uHEc_giQw>&=xguUY)_^r;0Z@L-LRm)^&OT%P zSS0&`#fU3@=1YpdR68+e=FVy(t`GBL%~?zM4MY4-SRXck4PntNj*S-AgQUJXQ<)3% zKnC8d5%Xt(tTjA$vggpBMX_NlmW^f;*ko}#MCz;ZsEa(Bux6|UIv_Lt6rKmda||=H zaV(xqV>89QjxzgN$f6;#_=vS)ZPA5r)(f=_V#DEg44cTlWC?6GOBIiLm~SfHfl!6A z&a4MIATyQz#&(vnUMPwyC#{GUDfISY%qFPl@Thm z=lyb$^wW|V|I*0*{Y!*uruVRIHqHE8QHQY+$Z-rhG6fw;5bx9F>JXgKNUV>w_i~1)nzjo1({GuJ~0by{rancyoh3(N*dAQ_~9R4@m84dwz1m7GZ`wHIHPrSlXi&(aU8 z`1hpLndwc)ZU~k)C#25?Lfr2Y;_`@)_;g{`TCY`!+-!t6UWDolknTVkHdYd0cBv9M z^4U8VsJvigI(1Y2R!L<^5FsYsP&dz0SbeN}RWF#UrQt2-Z{43x$s32v7JjkfXiMu{ z)vFck`@m)Vxz7A6uswmO&Co@0Yx{wEakz_hky;D7>WBVUB%M0(b+=MJ!9RX|m3VK2 zb-AifB;+QaoZHpa<5~kk*h@lUR}nI5IX2ic;ia>kTZx}WT34xt`GiNz-qSK-(quhNs6#eoMvrbtrtD3vK;m!r#Ja~jwFJ|44E06h4 zQx~`)V|CfVG(E<{TB6q27mfoDs7h@j@7yT4u1L^koL9O3N$={~2X63KM3-nU^~bGKY<-!C)fpcgP(x_d%#|>5Bvgt1-T$k4E4z`&2&bu24iryRwLx=$%L$k z6CHlef1=3qG)yH#`+$&+`Gma0!-wxBLgpn96152}XvWKb#Aznx1HT|vk>KSD0~BC@CGcQyZ-!j_E1_vtwy$;l%0PW~%}Wek^o z2^pIyLLcW>C=Rh0lVzht=qq_6qyKJ53;mD}3c!AF02~B|z+rF%6oMjfRD^ywb~jr- zb!FkX=HSO7VB_)EI@vMpIzo2zA|$97za01Yh=SU#B7F1lYdY3_1R;+g>9b7)Zaw}= z=P(`L_{hy7Am@06&LLtW#xqX@?2O6$N6{*m5P#mU|2$XGHoG`xpF{l?g!CT8 z*F@VY9Q?);5}Yp9#Mt%)YU{M%L(*+YTF)qPG2OPNn%1?Gn7PvSSgUanW7gPQHU9yc CyAwVD diff --git a/Assets/Prefabs/Environments/Rocks/Desert/LOCl_Rock.prefab b/Assets/Prefabs/Environments/Rocks/Desert/LOCl_Rock.prefab index 0eecb8cb1..60bc2b7f7 100644 --- a/Assets/Prefabs/Environments/Rocks/Desert/LOCl_Rock.prefab +++ b/Assets/Prefabs/Environments/Rocks/Desert/LOCl_Rock.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2519707779655214685} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8421440352589980069} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6356280496268559224 MeshFilter: @@ -57,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -107,12 +111,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4074600211891592906} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8421440352589980069} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2506190912631661344 MeshFilter: @@ -139,6 +144,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -189,12 +197,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4207697877916204065} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8421440352589980069} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2970009803926160159 MeshFilter: @@ -221,6 +230,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -246,6 +258,69 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &9006523650409001523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3933753499202510735} + - component: {fileID: 2399189285007394305} + - component: {fileID: 5771921385339961634} + m_Layer: 0 + m_Name: Desert_small_Rock1_LOD2 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &3933753499202510735 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006523650409001523} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827} + m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8421440352589980069} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2399189285007394305 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006523650409001523} + m_Mesh: {fileID: 1890811075063134906, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3} +--- !u!64 &5771921385339961634 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9006523650409001523} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1890811075063134906, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3} --- !u!1 &9193297977177045791 GameObject: m_ObjectHideFlags: 0 @@ -270,15 +345,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9193297977177045791} + serializedVersion: 2 m_LocalRotation: {x: 0.34875348, y: -0.6151188, z: -0.61511874, w: -0.34875336} m_LocalPosition: {x: 187.74, y: -0.25, z: 156.33} m_LocalScale: {x: 39.01208, y: 39.01208, z: 39.01208} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7878192976686150767} - {fileID: 2204107433635107229} - {fileID: 9214463681282361288} + - {fileID: 3933753499202510735} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -239.104} --- !u!205 &3640290346971862740 LODGroup: diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index c43b72c78..13e4f498e 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -262,6 +262,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1126095948} + - {fileID: 782526165} m_Father: {fileID: 935141547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1350928 @@ -331,6 +332,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 782526166} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 fadeSettings: Startfade: serializedVersion: 2 @@ -9776,6 +9789,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 58086032} + m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 onExit: m_PersistentCalls: m_Calls: [] @@ -21592,6 +21617,125 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2086304067} m_PrefabAsset: {fileID: 0} +--- !u!1 &58086029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 58086030} + - component: {fileID: 58086033} + - component: {fileID: 58086032} + - component: {fileID: 58086031} + m_Layer: 11 + m_Name: YTigger_LastCutScene_End + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: b1a615fdf6bd20940a59c9cf8671316d, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &58086030 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58086029} + serializedVersion: 2 + m_LocalRotation: {x: -0.022675114, y: 0.89263445, z: -0.014305088, w: 0.4499833} + m_LocalPosition: {x: -15.14, y: 41.74, z: -54.06} + m_LocalScale: {x: 1.285206, y: 3.6934361, z: 8.283718} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 830642059} + m_LocalEulerAnglesHint: {x: 0.294, y: 126.486, z: -3.059} +--- !u!114 &58086031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58086029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: Cut_PORTAL_112650 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 0 + m_restoreStateOnStart: 0 + events: + onEnableDelay: 0 + onEnable: + m_PersistentCalls: + m_Calls: [] + onDisable: + m_PersistentCalls: + m_Calls: [] + onEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1333185046} + m_TargetAssemblyTypeName: UnityEngine.Playables.PlayableDirector, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + onExit: + m_PersistentCalls: + m_Calls: [] + reEnable: 0 + reDisable: 0 + reEntry: 0 + reExit: 0 + collisionLayer: + serializedVersion: 2 + m_Bits: 256 + tagMask: + m_tags: + - Player + drawGizmos: 0 + drawWire: 0 + color: {r: 0, g: 0.6603774, b: 0.19103707, a: 0.22745098} + colorWire: {r: 1, g: 1, b: 1, a: 1} +--- !u!65 &58086032 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58086029} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &58086033 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58086029} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &58086489 stripped Transform: m_CorrespondingSourceObject: {fileID: 2307686653789669327, guid: 01470a9fc5334014e96e661ea7abf07e, @@ -26503,6 +26647,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} +--- !u!21 &83622785 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!4 &83742598 stripped Transform: m_CorrespondingSourceObject: {fileID: 1059799105576019692, guid: 085ba9a312c11a942ab1bbbdd90f610e, @@ -29577,6 +29785,171 @@ Transform: m_Children: [] m_Father: {fileID: 1807495188} m_LocalEulerAnglesHint: {x: -0.241, y: 69.092, z: -0.938} +--- !u!43 &105290407 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &106381514 PrefabInstance: m_ObjectHideFlags: 0 @@ -39170,18 +39543,6 @@ MonoBehaviour: - m_event: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 413064816} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 16801836} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive @@ -39206,8 +39567,8 @@ MonoBehaviour: m_StringArgument: Searched m_BoolArgument: 1 m_CallState: 0 - barkString: Who goes there? - delay: 3 + barkString: + delay: 0 - m_event: m_PersistentCalls: m_Calls: @@ -39225,35 +39586,6 @@ MonoBehaviour: m_CallState: 0 barkString: delay: 0.5 - - m_event: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 457121707} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 548556716} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 0 - barkString: None of your business - delay: 1.3 - m_event: m_PersistentCalls: m_Calls: @@ -40625,8 +40957,8 @@ MonoBehaviour: - Player startVolumeState: 0 deactivateDelay: 0 - draw: 1 - drawWire: 1 + draw: 0 + drawWire: 0 drawColor: {r: 0.5878828, g: 0.8679245, b: 0.09552618, a: 0.4} drawWireColor: {r: 0.754717, g: 0, b: 0.56959766, a: 1} activeVolumeColor: {r: 1, g: 0, b: 1, a: 0.4} @@ -40864,147 +41196,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ef32dcb7e900c245b48572d43b140b4, type: 3} ---- !u!1001 &131867757 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalScale.x - value: 0.30838808 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalScale.y - value: 0.30838808 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalScale.z - value: 0.30838808 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.0459 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.069 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.1152 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.30605727 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.92338413 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.22832493 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.03947639 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 144.321 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.720993 - objectReference: {fileID: 0} - - target: {fileID: 7878192976686150767, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 29.298004 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.x - value: -21.84 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.y - value: 40.005 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalPosition.z - value: -91.692 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.5628473 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.18675524 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.19283871 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.7817536 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -5.237 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 30.744 - objectReference: {fileID: 0} - - target: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -252.94699 - objectReference: {fileID: 0} - - target: {fileID: 9193297977177045791, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - propertyPath: m_Name - value: LOCl_Rock - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - insertIndex: 1 - addedObject: {fileID: 157777579} - - targetCorrespondingSourceObject: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - insertIndex: 2 - addedObject: {fileID: 565355203} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 32a4c40cbe7f339419dcedd484b8ea90, type: 3} --- !u!1 &132570032 GameObject: m_ObjectHideFlags: 0 @@ -45253,92 +45444,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 157062729} m_PrefabAsset: {fileID: 0} ---- !u!1 &157777578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 157777579} - - component: {fileID: 157777581} - - component: {fileID: 157777580} - m_Layer: 0 - m_Name: Desert_small_Rock1_LOD0 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &157777579 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157777578} - serializedVersion: 2 - m_LocalRotation: {x: 0.84971577, y: 0.45433107, z: -0.12126909, w: 0.23845376} - m_LocalPosition: {x: -0.0741, y: -0.1664, z: -0.1325} - m_LocalScale: {x: 0.30838808, y: 0.30838808, z: 0.30838808} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1161346165} - m_LocalEulerAnglesHint: {x: 148.974, y: -0.7080078, z: -56.462006} ---- !u!23 &157777580 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157777578} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 295104a5d91de4e4bad074b63ee8532b, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &157777581 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157777578} - m_Mesh: {fileID: -2468174546278918456, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3} --- !u!1001 &157969207 PrefabInstance: m_ObjectHideFlags: 0 @@ -71597,7 +71702,7 @@ Transform: m_GameObject: {fileID: 268293284} serializedVersion: 2 m_LocalRotation: {x: -0.07348447, y: -0.96883166, z: -0.016170874, w: 0.23601672} - m_LocalPosition: {x: 22.4, y: 37.21, z: -111.77} + m_LocalPosition: {x: 23.98, y: 37.21, z: -112.39} m_LocalScale: {x: 2.315662, y: 0.95135283, z: 7.490943} m_ConstrainProportionsScale: 0 m_Children: [] @@ -111011,136 +111116,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 412235559} m_PrefabAsset: {fileID: 0} ---- !u!1 &413064816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 413064817} - - component: {fileID: 413064818} - m_Layer: 0 - m_Name: Audio_D_Who - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &413064817 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 413064816} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.84, y: 38.28, z: -118.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1369590070} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &413064818 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 413064816} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, - type: 2} - m_audioClip: {fileID: 8300000, guid: 7cd6d8e5370cc87428196a48893d4b44, type: 3} - m_Resource: {fileID: 8300000, guid: 7cd6d8e5370cc87428196a48893d4b44, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 20 - Pan2D: 0 - rolloffMode: 1 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.837 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1001 &413257529 PrefabInstance: m_ObjectHideFlags: 0 @@ -131261,136 +131236,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} ---- !u!1 &457121707 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 457121708} - - component: {fileID: 457121709} - m_Layer: 0 - m_Name: Audio_B_busines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &457121708 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 457121707} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 88.65, y: 33.207, z: -124.949} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1369590070} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &457121709 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 457121707} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, - type: 2} - m_audioClip: {fileID: 8300000, guid: c538a20f28bbc6f499d9b3ffdbefdd5e, type: 3} - m_Resource: {fileID: 8300000, guid: c538a20f28bbc6f499d9b3ffdbefdd5e, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1001 &457433843 PrefabInstance: m_ObjectHideFlags: 0 @@ -131898,6 +131743,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} +--- !u!43 &459142601 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &460195966 PrefabInstance: m_ObjectHideFlags: 0 @@ -135701,7 +135711,7 @@ Transform: m_GameObject: {fileID: 480532548} serializedVersion: 2 m_LocalRotation: {x: -0.0073444163, y: 0.447701, z: -0.0041821343, w: 0.8941434} - m_LocalPosition: {x: 20.98, y: 32.56, z: -88.73} + m_LocalPosition: {x: 21.87, y: 32.56, z: -92.03} m_LocalScale: {x: 16.254444, y: 12.441883, z: 14.56394} m_ConstrainProportionsScale: 0 m_Children: [] @@ -136045,18 +136055,6 @@ MonoBehaviour: onEnter: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 413064816} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 16801836} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive @@ -136083,31 +136081,7 @@ MonoBehaviour: m_CallState: 0 onExit: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 457121707} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 548556716} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 + m_Calls: [] reEnable: 0 reDisable: 0 reEntry: 0 @@ -154271,118 +154245,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 942027688} m_PrefabAsset: {fileID: 0} ---- !u!1 &548556716 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 548556717} - - component: {fileID: 548556721} - - component: {fileID: 548556719} - m_Layer: 11 - m_Name: Triger_text_bussines - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &548556717 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548556716} - serializedVersion: 2 - m_LocalRotation: {x: -0.056347102, y: 0.35928583, z: -0.07563998, w: 0.92844886} - m_LocalPosition: {x: 26.32, y: 49.67, z: -115.2} - m_LocalScale: {x: 0.562074, y: 2.9886074, z: 3.4378576} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 830642059} - m_LocalEulerAnglesHint: {x: -2.882, y: 42.574, z: -10.438} ---- !u!114 &548556719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548556716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 64 - fireOnce: 1 - condition: - luaConditions: [] - questConditions: - - questName: WastelandWaterQuest - questState: 1 - acceptedTags: - - Player - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: WastelandWaterQuest - questState: 2 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 2 - barkConversation: Wasteland/NeedWater - barkText: Umm. Not good at all...None of your business. - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 1 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: [] - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: [] - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} ---- !u!33 &548556721 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548556716} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &548776954 PrefabInstance: m_ObjectHideFlags: 0 @@ -161630,92 +161492,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 564851300} m_CullTransparentMesh: 1 ---- !u!1 &565355202 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 565355203} - - component: {fileID: 565355205} - - component: {fileID: 565355204} - m_Layer: 0 - m_Name: Desert_small_Rock1_LOD0 (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &565355203 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 565355202} - serializedVersion: 2 - m_LocalRotation: {x: 0.45959276, y: 0.33702382, z: -0.6212013, w: 0.5378647} - m_LocalPosition: {x: -0.0652, y: -0.0879, z: 0.0192} - m_LocalScale: {x: 0.30838808, y: 0.30838808, z: 0.30838808} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1161346165} - m_LocalEulerAnglesHint: {x: 114.06, y: 149.25, z: 61.549004} ---- !u!23 &565355204 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 565355202} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 295104a5d91de4e4bad074b63ee8532b, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &565355205 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 565355202} - m_Mesh: {fileID: -2468174546278918456, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3} --- !u!4 &566356458 stripped Transform: m_CorrespondingSourceObject: {fileID: 2474945421124602092, guid: 4f8faff92d8e4ed48a9066ebcbb0c713, @@ -167305,8 +167081,8 @@ MonoBehaviour: - Player startVolumeState: 0 deactivateDelay: 0 - draw: 1 - drawWire: 1 + draw: 0 + drawWire: 0 drawColor: {r: 0.5878828, g: 0.8679245, b: 0.09552618, a: 0.4} drawWireColor: {r: 0.754717, g: 0, b: 0.56959766, a: 1} activeVolumeColor: {r: 1, g: 0, b: 1, a: 0.4} @@ -179467,39 +179243,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d9b8aba8d4b62234ca6e7640e6f673f0, type: 3} ---- !u!21 &662041775 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &663486477 PrefabInstance: m_ObjectHideFlags: 0 @@ -207001,13 +206744,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778637346} serializedVersion: 2 - m_LocalRotation: {x: -0.0027867358, y: -0.13144049, z: -0.012371006, w: 0.991243} - m_LocalPosition: {x: 23.811, y: 38.25, z: -94.142} + m_LocalRotation: {x: -0.003656476, y: -0.060859486, z: -0.012142402, w: 0.9980658} + m_LocalPosition: {x: 23.78, y: 38.25, z: -95.6} m_LocalScale: {x: 1, y: 1, z: 1.706} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} - m_LocalEulerAnglesHint: {x: -0.503, y: -15.101, z: -1.363} + m_LocalEulerAnglesHint: {x: -0.503, y: -6.973, z: -1.363} --- !u!114 &778637348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -210010,6 +209753,51 @@ Transform: - {fileID: 1589594470} m_Father: {fileID: 830642059} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &782526164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 782526165} + - component: {fileID: 782526166} + m_Layer: 0 + m_Name: MarkerEndLevelw + m_TagString: Untagged + m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &782526165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782526164} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -10.31, y: 42.15, z: -49.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1350927} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &782526166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782526164} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fb106e34c72f40f6b124f0a149d1b99, type: 3} + m_Name: + m_EditorClassIdentifier: + m_sprite: {fileID: 0} --- !u!4 &782709721 stripped Transform: m_CorrespondingSourceObject: {fileID: 7290866530006230363, guid: c62fa5e4ec5f5784a83fc475b2c18f1b, @@ -222311,6 +222099,7 @@ Transform: - {fileID: 793781818} - {fileID: 1461741668} - {fileID: 24520094} + - {fileID: 58086030} - {fileID: 1999362949} - {fileID: 92585400} - {fileID: 1912640813} @@ -222325,7 +222114,6 @@ Transform: - {fileID: 1897511543} - {fileID: 1530814941} - {fileID: 505274923} - - {fileID: 548556717} - {fileID: 950495502} - {fileID: 292585976} - {fileID: 323124392} @@ -231478,7 +231266,7 @@ MonoBehaviour: - Player startVolumeState: 0 deactivateDelay: 0 - draw: 1 + draw: 0 drawWire: 0 drawColor: {r: 0.8396226, g: 0.05312127, b: 0, a: 0.4} drawWireColor: {r: 0.754717, g: 0, b: 0.56959766, a: 1} @@ -253150,7 +252938,6 @@ Transform: - {fileID: 1012520441} - {fileID: 482008140} - {fileID: 1350927} - - {fileID: 1979204077} - {fileID: 1082460855} - {fileID: 1393037566} - {fileID: 994305672} @@ -255550,171 +255337,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 947179831} m_PrefabAsset: {fileID: 0} ---- !u!43 &947701448 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &947839023 GameObject: m_ObjectHideFlags: 0 @@ -261479,7 +261101,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -273066,13 +272688,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027661114} serializedVersion: 2 - m_LocalRotation: {x: -0.020376483, y: 0.012528886, z: -0.017423982, w: 0.999562} - m_LocalPosition: {x: 22.48, y: 38.04, z: -110.78} - m_LocalScale: {x: 0.69617, y: 5.655274, z: 22.389767} + m_LocalRotation: {x: -0.022824926, y: 0.16688769, z: -0.014064819, w: 0.9856114} + m_LocalPosition: {x: 25.8, y: 38.04, z: -111.43} + m_LocalScale: {x: 4.387932, y: 5.655274, z: 22.389767} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1140965745} - m_LocalEulerAnglesHint: {x: -2.31, y: 1.477, z: -2.027} + m_LocalEulerAnglesHint: {x: -2.31, y: 19.262, z: -2.027} --- !u!114 &1027661116 MonoBehaviour: m_ObjectHideFlags: 0 @@ -273112,18 +272734,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass - m_MethodName: SendToMessageSystem - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Searched - m_BoolArgument: 0 - m_CallState: 0 onExit: m_PersistentCalls: m_Calls: [] @@ -275340,7 +274950,7 @@ Transform: m_GameObject: {fileID: 1037581378} serializedVersion: 2 m_LocalRotation: {x: -0.06746069, y: 0.6295011, z: -0.029770203, w: 0.7734928} - m_LocalPosition: {x: 22.31, y: 37.61, z: -93.683} + m_LocalPosition: {x: 23.02, y: 37.61, z: -94.73} m_LocalScale: {x: 8.012457, y: 8.179292, z: 15.083913} m_ConstrainProportionsScale: 0 m_Children: [] @@ -304748,7 +304358,6 @@ GameObject: - component: {fileID: 1140965746} - component: {fileID: 1140965747} - component: {fileID: 1140965748} - - component: {fileID: 1140965749} - component: {fileID: 1140965750} - component: {fileID: 1140965751} m_Layer: 0 @@ -304905,31 +304514,6 @@ MonoBehaviour: m_onEndEvent: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1140965749} - m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.DialogueSystemTrigger, - Assembly-CSharp-firstpass - m_MethodName: OnUse - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 116897654} - m_TargetAssemblyTypeName: Beyond.MusicManager, Assembly-CSharp - m_MethodName: PlayDialogue - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 0 - m_Target: {fileID: 1140965751} m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass m_MethodName: SendToMessageSystem @@ -305104,74 +304688,6 @@ MonoBehaviour: m_Calls: [] delay: 0 m_materialsToChange: [] ---- !u!114 &1140965749 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140965744} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 32 - fireOnce: 1 - condition: - luaConditions: [] - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: WastelandKillDogs - questState: 2 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 0 - barkConversation: - barkText: - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 0 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: [] - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: [] - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} --- !u!82 &1140965750 AudioSource: m_ObjectHideFlags: 0 @@ -314664,12 +314180,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1161282447} m_PrefabAsset: {fileID: 0} ---- !u!4 &1161346165 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8421440352589980069, guid: 32a4c40cbe7f339419dcedd484b8ea90, - type: 3} - m_PrefabInstance: {fileID: 131867757} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1162167425 PrefabInstance: m_ObjectHideFlags: 0 @@ -320887,7 +320397,6 @@ GameObject: - component: {fileID: 1196087297} - component: {fileID: 1196087296} - component: {fileID: 1196087295} - - component: {fileID: 1196087298} - component: {fileID: 1196087299} m_Layer: 11 m_Name: CUT_SCENE3_ENABLER @@ -320905,8 +320414,8 @@ Transform: m_GameObject: {fileID: 1196087293} serializedVersion: 2 m_LocalRotation: {x: 0.046047542, y: 0.33850557, z: -0.055079307, w: 0.93822163} - m_LocalPosition: {x: 25.85, y: 37.58, z: -114.77} - m_LocalScale: {x: 1.6909875, y: 12.916661, z: 73.28117} + m_LocalPosition: {x: 27.21, y: 37.58, z: -115.55} + m_LocalScale: {x: 6.8545866, y: 12.916661, z: 73.28117} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -320945,7 +320454,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 116897654} m_TargetAssemblyTypeName: Beyond.MusicManager, Assembly-CSharp - m_MethodName: OnCombat + m_MethodName: PlayCombat m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -320986,77 +320495,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1196087293} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1196087298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1196087293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 8 - fireOnce: 1 - condition: - luaConditions: [] - questConditions: - - questName: WastelandWaterQuest - questState: 2 - acceptedTags: - - Player - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: WastelandWaterQuest - questState: 4 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 0 - barkConversation: - barkText: - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 0 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: [] - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: [] - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} --- !u!82 &1196087299 AudioSource: m_ObjectHideFlags: 0 @@ -339201,7 +338639,7 @@ Transform: m_GameObject: {fileID: 1260972236} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 23.875, y: 38.25, z: -93.813} + m_LocalPosition: {x: 23.96, y: 38.25, z: -95.17} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -353276,13 +352714,14 @@ GameObject: m_Component: - component: {fileID: 1333185045} - component: {fileID: 1333185046} + - component: {fileID: 1333185047} m_Layer: 0 m_Name: PORTAL_END m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1333185045 Transform: m_ObjectHideFlags: 0 @@ -353309,7 +352748,7 @@ PlayableDirector: m_Enabled: 1 serializedVersion: 3 m_PlayableAsset: {fileID: 11400000, guid: fe7d3bed96262e545a1681f1ecf97dc9, type: 2} - m_InitialState: 1 + m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 m_InitialTime: 0 @@ -353326,6 +352765,172 @@ PlayableDirector: value: {fileID: 946039110} m_ExposedReferences: m_References: [] +--- !u!114 &1333185047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333185044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ca440d7a7106ec48948d6ced68759ee, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + toEnableOnStart: + - {fileID: 1497810223} + toDisableOnStart: + - {fileID: 569166459} + m_onStartEvent: + m_PersistentCalls: + m_Calls: [] + toEnableOnEnd: [] + toDisableOnEnd: [] + m_onEndEvent: + m_PersistentCalls: + m_Calls: [] + fadeSettings: + Startfade: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.45 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.55 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + EndFade: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.45 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.55 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + speed: 1 + inverseEndFadeCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_completeCurrentQuest: 0 + teleport: + useTeleport: 0 + playerObject: {fileID: 0} + targetPosition: {fileID: 0} + useCameraRotation: 0 + detectGround: 0 + ground: + serializedVersion: 2 + m_Bits: 1 + playOnStart: 0 + playMultipleTimes: 0 + skipFadeOutIn: 0 + skipFadeIn: 0 + m_speed: 1 + m_cutsceneLevelLoader: + Enabled: 1 + LevelName: Land_of_Death_River1_Valley + SpawnPointName: + cutSceneBreakpoints: [] + cutSceneDialogueBreakpoints: [] --- !u!1001 &1333904710 PrefabInstance: m_ObjectHideFlags: 0 @@ -358190,8 +357795,6 @@ Transform: - {fileID: 943115661} - {fileID: 775658770} - {fileID: 357311078} - - {fileID: 413064817} - - {fileID: 457121708} - {fileID: 1108178437} - {fileID: 485134284} - {fileID: 300373572} @@ -359629,6 +359232,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1380873799} m_PrefabAsset: {fileID: 0} +--- !u!21 &1381021968 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &1381553017 PrefabInstance: m_ObjectHideFlags: 0 @@ -389403,7 +389039,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 1410334711 --- !u!114 &1490408615 MonoBehaviour: m_ObjectHideFlags: 0 @@ -390613,7 +390249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1497810224 Transform: m_ObjectHideFlags: 0 @@ -397002,7 +396638,6 @@ Transform: - {fileID: 179034598} - {fileID: 1975405819} - {fileID: 1920210945} - - {fileID: 1849010783} m_Father: {fileID: 1140965745} m_LocalEulerAnglesHint: {x: 0, y: 372.167, z: 0} --- !u!95 &1504474635 @@ -459750,6 +459385,50 @@ PrefabInstance: propertyPath: treeSpotController value: objectReference: {fileID: 119738076} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_SizeDelta.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_SizeDelta.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000028220384 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchoredPosition.x + value: -270.9 + objectReference: {fileID: 0} + - target: {fileID: 1237963458, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} + propertyPath: m_AnchoredPosition.y + value: -129.8 + objectReference: {fileID: 0} - target: {fileID: 1250667256, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive value: 0 @@ -460305,6 +459984,11 @@ PrefabInstance: propertyPath: 'm_ActiveFontFeatures.Array.data[0]' value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 1167046722738504389, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[0]' + value: + objectReference: {fileID: 0} - target: {fileID: 1343879293682565934, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -460640,6 +460324,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3244563195940327563, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[1]' + value: + objectReference: {fileID: 0} + - target: {fileID: 3244563195940327563, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[2]' + value: + objectReference: {fileID: 0} + - target: {fileID: 3244563195940327563, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[3]' + value: + objectReference: {fileID: 0} - target: {fileID: 3244563195940327563, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: 'gameObjectsToEnable.Array.data[0]' @@ -462090,6 +461789,21 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 967471548} + - target: {fileID: 5938195661117737739, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[0]' + value: + objectReference: {fileID: 0} + - target: {fileID: 5938195661117737739, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[1]' + value: + objectReference: {fileID: 0} + - target: {fileID: 5938195661117737739, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: 'imagesToPulse.Array.data[2]' + value: + objectReference: {fileID: 0} - target: {fileID: 6285407467714926421, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_itemsToCollect.Array.size @@ -462315,6 +462029,11 @@ PrefabInstance: propertyPath: 'gameObjectsToDisableOnEnd.Array.data[1]' value: objectReference: {fileID: 178935178} + - target: {fileID: 6971765270240583462, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: powersSwitcher + value: + objectReference: {fileID: 0} - target: {fileID: 7004718496786065519, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: imagesToPulse.Array.size @@ -462440,6 +462159,31 @@ PrefabInstance: propertyPath: onStepStart.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7104178160733267442, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_LocalScale.x + value: 0.44 + objectReference: {fileID: 0} + - target: {fileID: 7104178160733267442, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_LocalScale.y + value: 0.36 + objectReference: {fileID: 0} + - target: {fileID: 7104178160733267442, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7104178160733267442, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -271.9 + objectReference: {fileID: 0} + - target: {fileID: 7104178160733267442, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -129.6 + objectReference: {fileID: 0} - target: {fileID: 7104178160916643874, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: 'objectsToInteractwith.Array.data[0]' @@ -506065,136 +505809,6 @@ Transform: - {fileID: 319003319} m_Father: {fileID: 1300801134} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1849010782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1849010783} - - component: {fileID: 1849010784} - m_Layer: 0 - m_Name: Audio_Giant_busiines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1849010783 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1849010782} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 24.584515, y: 36.052727, z: -117.50413} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1504474634} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &1849010784 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1849010782} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 5055728553863201067, guid: 5dd761199ee4b7045a10fd9b79e36026, - type: 2} - m_audioClip: {fileID: 8300000, guid: 3da5c515bdb8278418042be84148e899, type: 3} - m_Resource: {fileID: 8300000, guid: 3da5c515bdb8278418042be84148e899, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &1849839119 GameObject: m_ObjectHideFlags: 0 @@ -515360,6 +514974,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2004085325792372690, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6259510873288837657, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_Name @@ -538589,171 +538208,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f61dc6323074be14cb20e14425c8f0c5, type: 3} ---- !u!43 &1969577634 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1970026861 PrefabInstance: m_ObjectHideFlags: 0 @@ -540225,125 +539679,6 @@ MeshRenderer: type: 3} m_PrefabInstance: {fileID: 1530631732} m_PrefabAsset: {fileID: 0} ---- !u!1 &1979204076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1979204077} - - component: {fileID: 1979204080} - - component: {fileID: 1979204079} - - component: {fileID: 1979204078} - m_Layer: 0 - m_Name: Trigger_WhosGoingThere - m_TagString: Untagged - m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1979204077 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979204076} - serializedVersion: 2 - m_LocalRotation: {x: -0.012325236, y: 0.38762262, z: -0.023809336, w: 0.9214282} - m_LocalPosition: {x: 28.037, y: 46.652, z: -114.519} - m_LocalScale: {x: 0.69617, y: 1.942105, z: 13.897991} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 935141547} - m_LocalEulerAnglesHint: {x: -0.244, y: 45.637, z: -3.063} ---- !u!114 &1979204078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979204076} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_key: Trigger_WhosGoingThere_123964 - m_appendSaverTypeToKey: 0 - m_saveAcrossSceneChanges: 0 - m_restoreStateOnStart: 0 - events: - onEnableDelay: 0 - onEnable: - m_PersistentCalls: - m_Calls: [] - onDisable: - m_PersistentCalls: - m_Calls: [] - onEnter: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - onExit: - m_PersistentCalls: - m_Calls: [] - reEnable: 0 - reDisable: 0 - reEntry: 0 - reExit: 0 - collisionLayer: - serializedVersion: 2 - m_Bits: 256 - tagMask: - m_tags: - - Player - drawGizmos: 0 - drawWire: 0 - color: {r: 0, g: 0.6603774, b: 0.19103707, a: 0.22745098} - colorWire: {r: 1, g: 1, b: 1, a: 1} ---- !u!65 &1979204079 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979204076} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1979204080 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979204076} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1979617511 PrefabInstance: m_ObjectHideFlags: 0 @@ -559105,7 +558440,7 @@ PlayableDirector: m_GameObject: {fileID: 2065833132} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 0} + m_PlayableAsset: {fileID: 11400000, guid: 44d42e80517fdbd4ba3873a2f0915988, type: 2} m_InitialState: 1 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -560055,70 +559390,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2067707736} m_PrefabAsset: {fileID: 0} ---- !u!21 &2067976064 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &2068300778 PrefabInstance: m_ObjectHideFlags: 0 @@ -634539,7 +633810,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 662041775} + - {fileID: 1381021968} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -634632,7 +633903,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 2067976064} + overrideMaterial: {fileID: 83622785} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -683057,7 +682328,6 @@ SceneRoots: - {fileID: 246052762} - {fileID: 1909725109} - {fileID: 1947937815} - - {fileID: 131867757} - {fileID: 243154938} - {fileID: 95428430} - {fileID: 1570096173} diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index fd9bcbb81..3375fde88 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 2 + - _BlendOp: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat index 837d3df4b..cee0ed979 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat @@ -13,7 +13,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _LIGHTSOURCE_POINT + - _LIGHTSOURCE_DIRECTIONAL - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 07c413366..f614f0477 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,16 +10,17 @@ "hash": "02cf05485ac0bbd9f61e7b829dd6526db7c9dba5" }, "com.unity.addressables": { - "version": "2.2.2", + "version": "2.3.16", "depth": 1, "source": "registry", "dependencies": { "com.unity.profiling.core": "1.0.2", + "com.unity.test-framework": "1.4.5", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.1.4", + "com.unity.scriptablebuildpipeline": "2.2.11", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -161,10 +162,13 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.1.4", + "version": "2.2.11", "depth": 2, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.searcher": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a1aff48dd..92cbd95bf 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.40f1 -m_EditorVersionWithRevision: 6000.0.40f1 (157d81624ddf) +m_EditorVersion: 6000.0.42f1 +m_EditorVersionWithRevision: 6000.0.42f1 (feb9a7235030)