From b66ae414e3f34e8ba3d6e686b658eb124e6eb20b Mon Sep 17 00:00:00 2001 From: Kotrba Filip Date: Sun, 2 Feb 2020 13:11:38 +0100 Subject: [PATCH] Ammo, wave gui, weapon staty, pilulky --- .../v16/Server/sqlite3/storage.ide | Bin 1294336 -> 1294336 bytes Assets/Prefabs/PillsObject.prefab | 157 ++++ Assets/Prefabs/PillsObject.prefab.meta | 7 + Assets/Prefabs/Player.prefab | 17 +- Assets/Prefabs/Weapon_1.prefab | 3 +- Assets/Prefabs/Weapon_2.prefab | 8 +- Assets/Prefabs/ammo_box.prefab | 3 + Assets/Scenes/PlayScene.unity | 828 ++++++++++++++---- Assets/Scenes/Test-Haitem.unity | 1 + Assets/Scripts/BarricadeManager.cs | 6 +- Assets/Scripts/DayManager.cs | 5 + Assets/Scripts/GuiManager.cs | 6 + Assets/Scripts/PlayerManager.cs | 13 +- 13 files changed, 873 insertions(+), 181 deletions(-) create mode 100644 Assets/Prefabs/PillsObject.prefab create mode 100644 Assets/Prefabs/PillsObject.prefab.meta diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide index 3260203216a98ca53593a3f2e78d8bbe60a669d4..78c4325dc85ba0d97d84bcbf72813e82cdcc84be 100644 GIT binary patch delta 8765 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 delta 8819 zcmeHLc~n)^8b9a4y`QX&RQAb& zqmzBID$(dTS2sjuTU~gxuevy-@p0M9q)w7oWjNS)Y`4{@`VFi*U9m4JMz> z6PSup?xR>)34#U?n)OvCAOaqNd|m z=sTlk*#l6f%?Sv?KqHJg9ZF89$>(A)17cZhF+>N=?c~GYbU;HxVTdyAl*0~#rX4HD zY##@#gUpPw{UkscV-3Q~7)-*!g@1Jjp>W3bETA_A+o1LZbdc$QhfAtk+YFHMcEPQMtSmS#5u^jyO z$8u`!OGl=89kf1Qax^mY_?JVi!nYpnIF`*1WXG}Gh{uQza3IieEGq|7$FcmsaV$^6 zQ^}j_A3c_hzwg#-r#RTf;(E9!SZCmc`eLn%*U6yrh2`^0%jcCBlpZQ7Dsr|Ks&dUQ zy5YWVi?3O)**Ku$&o_EyHV>}(y0fI0zjl^<49_6gxQwz-Z`RLf{`AMWU)-Niy(%nu z`{tc1|6RFNSaA2u;Zvjb<_7H_N>>C zXMr!q&8b}FE3!&1wPjCEXv<#qB+szvGoqi|`SNStkhnZAM|NS-Wv-> z1pNF(Zs+FuY-xr2$cQkv8=H@nc*cAb@A2ls^eZ2`dncK~W-l3Dz1Fdt*R`r|dJc9x z`F`w~U*f*n_j~01@|A|j?x%igRTn*(_P8N4@zqPCy*+y!b?y7uOAb3P2Uo4gi3sn1 zeEi^%y@bPwXER2;c)fK0%P$_dKkPTJE*?Ga7{sT4E?E{d=A#P>tW0qWzZ#}JHQDKt zbxYn~e$aO1)xI$`t9&jTttp?c@oe%sV&{G3T>1&efY}qyN7!6eFUnXI6EZV4d;XW_ z-rm|U^0~7`J$B!{+J8gn_&cX#MlCm{^t>3d=EG!!9NAsV_(LU%CwDLU<$=53d z?`M32V$o>E2R*G{X>R*vZ|b+&&nY_d!3rDxnHJ>XrjOO+MZXcOnm%PGjpp7)oV zcf0=eu;Ddqj%7ckwLK9|le&Fgc%``_EucPj?yk^bHT(T6`)MY^345}^d&;V4A$`b& zDf=6von}ToRk$zimCPNLk*b^<%|*MG{p$Oa=cz4w<*@D(r*^M=$Ld5^gJ+>!b#%*V z50_!rXX)ZLt#5e$#@m@?MJLY&M}64+H^Xk1m}3p^J#uPW>!5^!Lnk+ns5Bnv8D-u> zmMtW53u&>3SpJK9XlmOYYI%4MbusUulm~lgQoB7=HnMbeTgH~Twq;CxE#y~KNN{1{ z2M40923_7!dF^_rM(l5Xg_-$hJcllN%Pg1$bgn{TNqo;&!`A+6|!L#*8b2!3EFw(<&ZX;o1O-d_>=JW=6S}WnQz<)6yqd|Ml3+Z^B)C z((JSIT+SC14G5_-^;mPW=>-qJ+tC$n6I-(Nt`k4@~`{+&UBmd zlB*~C=MK)OdM>FfwEmgl&9B{PSs&xm+4uW_#}}j`6b0t8e4YOvQ*l(3Feg_XsSDuTJ?$5=TlXFR|^If z#)m5tb59X21wuT3ze)xHRey{D%`uJwwv;g2C9pPyxCvA zJ>DU{*3d&Q?|#ui?e=&7FYUGxLq((RG09q# ze{9rmke82_qUFyv>uZdW6QoA5I?YZTEyrxtC-d9i{OQ{tH9yo?+<^fA4>k6a^DN+v z$*)LWdr1J($}v3vepzz!vG@QPfO77V^KFKUM}6`)90vG+ zD>LQ+6AX@&nM)jgBf%K}DuFz~!XXO7fz*ficyJ{k_D=yfC@Eya3^XtUsLTfPAt?Rv zXj=fTWPrQ`oX-PG0td0AFYufRkhx7-7E4zT>;~(N_+<(d%QXw7O(PD5E>gnLh5|HPED*=$t16O8D zUI?x%0r_%pC)6zD>%o6nTP2gThAC*FtAUwF-gZ}Pv|GR%FJ1%!iiuqi2T<#s0d&lM8ak+O~?!3AF Q-!Jzm|Mca)wMBCN4;yW(JOBUy diff --git a/Assets/Prefabs/PillsObject.prefab b/Assets/Prefabs/PillsObject.prefab new file mode 100644 index 0000000..4991d43 --- /dev/null +++ b/Assets/Prefabs/PillsObject.prefab @@ -0,0 +1,157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3435627263884782620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3435627263884782622} + - component: {fileID: 3435627263884782623} + - component: {fileID: 3435627263884782617} + m_Layer: 0 + m_Name: PillsObject + m_TagString: Interact + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3435627263884782622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.008133344, y: 1.265739, z: -2.023658} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8352172027178710535} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3435627263884782623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a26079dbac7f3cd4bacb95972241b8cb, type: 3} + m_Name: + m_EditorClassIdentifier: + blockType: 6 + health: 30 + healthRate: 15 + amountModels: [] + pills: {fileID: 5022562433003553812} + prefabPills: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + spawnPillsPoint: {x: 0.008133344, y: 1.265739, z: -2.023658} + audioSource: {fileID: 0} + doorSound: {fileID: 0} +--- !u!65 &3435627263884782617 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.2, y: 0.4, z: 0.2} + m_Center: {x: 0, y: 0.15, z: 0} +--- !u!1001 &3554492602056808866 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3435627263884782622} + m_Modifications: + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} + - target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_Name + value: painkillers + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5689278253577398147, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} +--- !u!1 &5022562433003553812 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + m_PrefabInstance: {fileID: 3554492602056808866} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8352172027178710535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + m_PrefabInstance: {fileID: 3554492602056808866} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PillsObject.prefab.meta b/Assets/Prefabs/PillsObject.prefab.meta new file mode 100644 index 0000000..f3a03f5 --- /dev/null +++ b/Assets/Prefabs/PillsObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51b65bc1216f2c4469761bc1039bfce1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index e01ba26..b9f16fc 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -44,7 +44,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.05 m_Pitch: 1 Loop: 0 Mute: 0 @@ -141,8 +141,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: musicSource: {fileID: 5981860502065413816} - DayMusic: {fileID: 0} - NightMusic: {fileID: 0} + DayMusic: {fileID: 8300000, guid: dbd637c87d6302e47b3dc18075b6de89, type: 3} + NightMusic: {fileID: 8300000, guid: 2565765545848aa4daee89afd5ea506b, type: 3} Sun: {fileID: 0} --- !u!1 &7985979212931499537 GameObject: @@ -192,10 +192,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 885220d038aa1a6468127c63dd90a926, type: 3} m_Name: m_EditorClassIdentifier: - speed: 10 - runSpeed: 25 + speed: 5 + runSpeed: 10 rotateSpeed: 5 - mouseSensitive: 200 + mouseSensitive: 50 buildRate: 0.5 health: 100 actualHealth: 100 @@ -204,11 +204,14 @@ MonoBehaviour: weaponList: - {fileID: 2179056336067526865, guid: 666835f3de085f9409e62598a45208bf, type: 3} - {fileID: 2587956328074680696, guid: 4ce5febc0b514174abbed9882322d1ed, type: 3} + - {fileID: 7279375804173823597, guid: f7f441e621e5e5f40b11b7617756a0af, type: 3} spikes: {fileID: 1999182813209888360, guid: 7933df0606f61e94e9008c58a313b22c, type: 3} spikesImage: {fileID: 21300000, guid: 4962f21e920045b47be23a8e53f5716b, type: 3} handImage: {fileID: 21300000, guid: 53484c385de7af24a87aa73334775b28, type: 3} guiManager: {fileID: 0} selectedWeapon: 0 + audio: {fileID: 532783939} + lose: {fileID: 8300000, guid: 82c454fc5bd3770438a50747eec0fc06, type: 3} --- !u!136 &7985979212931499551 CapsuleCollider: m_ObjectHideFlags: 0 @@ -251,7 +254,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Prefabs/Weapon_1.prefab b/Assets/Prefabs/Weapon_1.prefab index 37269d9..7228237 100644 --- a/Assets/Prefabs/Weapon_1.prefab +++ b/Assets/Prefabs/Weapon_1.prefab @@ -51,8 +51,9 @@ MonoBehaviour: spawnShoot: {fileID: 4234349944776735638} particleShoot: {fileID: 9220017394946394338, guid: 6480cbf8d57433a49b5d77875ceb391c, type: 3} - damage: 8 + damage: 15 fireRate: 0.5 + ammoCost: 2 animator: {fileID: 0} player: {fileID: 0} hit: 0 diff --git a/Assets/Prefabs/Weapon_2.prefab b/Assets/Prefabs/Weapon_2.prefab index e2f2a5d..124edf0 100644 --- a/Assets/Prefabs/Weapon_2.prefab +++ b/Assets/Prefabs/Weapon_2.prefab @@ -66,11 +66,12 @@ MonoBehaviour: particleShoot: {fileID: 0} damage: 50 fireRate: 0.1 + ammoCost: 2 animator: {fileID: 562605605} player: {fileID: 0} hit: 0 audioSource: {fileID: 0} - shootSound: {fileID: 0} + shootSound: [] --- !u!1 &2587956328074680696 GameObject: m_ObjectHideFlags: 0 @@ -119,13 +120,14 @@ MonoBehaviour: weaponRange: 2 spawnShoot: {fileID: 0} particleShoot: {fileID: 0} - damage: 25 + damage: 50 fireRate: 0.1 + ammoCost: 2 animator: {fileID: 562605605} player: {fileID: 0} hit: 0 audioSource: {fileID: 0} - shootSound: {fileID: 0} + shootSound: [] --- !u!1001 &8629712593250585003 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/ammo_box.prefab b/Assets/Prefabs/ammo_box.prefab index c504438..7d5ae3c 100644 --- a/Assets/Prefabs/ammo_box.prefab +++ b/Assets/Prefabs/ammo_box.prefab @@ -253,6 +253,9 @@ MonoBehaviour: - {fileID: 8452048823607473439} - {fileID: 5205200862043998919} - {fileID: 4443642083919416725} + pills: {fileID: 0} + prefabPills: {fileID: 0} + spawnPillsPoint: {x: 0, y: 0, z: 0} audioSource: {fileID: 0} doorSound: {fileID: 0} --- !u!65 &8296172667468284673 diff --git a/Assets/Scenes/PlayScene.unity b/Assets/Scenes/PlayScene.unity index 75cf888..87f3841 100644 --- a/Assets/Scenes/PlayScene.unity +++ b/Assets/Scenes/PlayScene.unity @@ -121,6 +121,75 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: 210c0a45ca7dddb429c704640ac83479, type: 2} +--- !u!1001 &158086489 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (4) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -13.213615 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.2976084 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 43.361923 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1 &158876903 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1536441875314504533, guid: 82f30cc3e62668541884fb7b59b793b6, @@ -177,7 +246,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 18 + value: 24 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -246,7 +315,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 20 + value: 27 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -315,7 +384,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 21 + value: 28 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -472,7 +541,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6, type: 3} propertyPath: m_RootOrder - value: 12 + value: 18 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6, type: 3} @@ -516,6 +585,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 187e7593e510e0445b95707cb14176d6, type: 3} +--- !u!1001 &517682423 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (3) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 23.96904 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.08828926 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 23.601364 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &522161419 PrefabInstance: m_ObjectHideFlags: 0 @@ -571,7 +709,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -855,8 +993,9 @@ RectTransform: - {fileID: 1692949638} - {fileID: 1327297297} - {fileID: 1191888897} + - {fileID: 1368020646} m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -879,6 +1018,7 @@ MonoBehaviour: Wood: {fileID: 863154880} Ammo: {fileID: 802293425} healthBar: {fileID: 562374831} + waves: {fileID: 1942255809} --- !u!1001 &591872493 PrefabInstance: m_ObjectHideFlags: 0 @@ -929,7 +1069,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 19 + value: 25 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -993,7 +1133,7 @@ PrefabInstance: - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} propertyPath: m_RootOrder - value: 1 + value: 7 objectReference: {fileID: 0} - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} @@ -1023,6 +1163,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 591872493} m_PrefabAsset: {fileID: 0} +--- !u!1001 &700603880 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (6) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -25.458845 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.53990936 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -24.259186 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1 &747164718 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5974751188148447902, guid: 17027e96daa46634eac3c9bcf07b06b0, @@ -1106,7 +1315,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 7 + value: 13 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1217,7 +1426,7 @@ Transform: m_LocalScale: {x: 100, y: 100, z: 100} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &787940993 PrefabInstance: @@ -1274,7 +1483,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1502,7 +1711,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1521,6 +1730,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &900690521 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (1) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.065693 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.0018310547 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -24.562832 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &1011884372 PrefabInstance: m_ObjectHideFlags: 0 @@ -1590,7 +1868,7 @@ PrefabInstance: - target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} propertyPath: m_RootOrder - value: 15 + value: 21 objectReference: {fileID: 0} - target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} @@ -1614,6 +1892,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} +--- !u!1001 &1083353202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (2) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 45.40143 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -3.5726056 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -13.354382 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!4 &1090758819 stripped Transform: m_CorrespondingSourceObject: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, @@ -1684,7 +2031,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1131703976 stripped Transform: @@ -6565,7 +6912,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22, type: 3} propertyPath: m_RootOrder - value: 13 + value: 19 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22, type: 3} @@ -6773,6 +7120,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19bf5b78376a3b94882c1e26afe7c633, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1368020645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368020646} + - component: {fileID: 1368020648} + - component: {fileID: 1368020647} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1368020646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1942255811} + m_Father: {fileID: 587476773} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1368020647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aca2defce6c6d644bb6e1a60a2ddae23, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1368020648 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + m_CullTransparentMesh: 0 --- !u!1001 &1433009970 PrefabInstance: m_ObjectHideFlags: 0 @@ -6828,7 +7249,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -6847,6 +7268,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &1528993452 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (5) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -30.904196 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.33564377 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 21.493011 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &1603512920 PrefabInstance: m_ObjectHideFlags: 0 @@ -6892,7 +7382,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5, type: 3} propertyPath: m_RootOrder - value: 17 + value: 23 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5, type: 3} @@ -7109,7 +7599,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1765588425 PrefabInstance: @@ -7156,7 +7646,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3} propertyPath: m_RootOrder - value: 16 + value: 22 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3} @@ -7260,7 +7750,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1814508279 stripped GameObject: @@ -7337,7 +7827,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7411,7 +7901,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 11 + value: 17 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7482,7 +7972,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1922663893 PrefabInstance: @@ -7511,6 +8001,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5536355216553759363, guid: b5bdffdb5058d5e458831042023d3abc, + type: 3} + propertyPath: guiManager + value: + objectReference: {fileID: 587476774} - target: {fileID: 8150345748488139401, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} propertyPath: m_Name @@ -7639,7 +8134,7 @@ PrefabInstance: - target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} propertyPath: m_RootOrder - value: 25 + value: 32 objectReference: {fileID: 0} - target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} @@ -7713,7 +8208,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 9 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7732,7 +8227,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} ---- !u!1 &1990836489 +--- !u!1 &1942255808 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7740,66 +8235,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1990836491} - - component: {fileID: 1990836490} - - component: {fileID: 1990836492} - m_Layer: 0 - m_Name: PillsObject - m_TagString: Interact + - component: {fileID: 1942255811} + - component: {fileID: 1942255810} + - component: {fileID: 1942255809} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1990836490 +--- !u!114 &1942255809 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} + m_GameObject: {fileID: 1942255808} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a26079dbac7f3cd4bacb95972241b8cb, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - blockType: 6 - health: 30 - healthRate: 15 - amountModels: [] - pills: {fileID: 7646678029089908993} - prefabPills: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - spawnPillsPoint: {x: 0.008133344, y: 1.265739, z: -2.023658} - audioSource: {fileID: 0} - doorSound: {fileID: 0} ---- !u!4 &1990836491 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.008133344, y: 1.265739, z: -2.023658} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6648769901767351058} - m_Father: {fileID: 0} - m_RootOrder: 34 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1990836492 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.2, y: 0.4, z: 0.2} - m_Center: {x: 0, y: 0.15, z: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1942255810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942255808} + m_CullTransparentMesh: 0 +--- !u!224 &1942255811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942255808} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1368020646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -3.8} + m_SizeDelta: {x: 130, y: 24} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &2079126252 stripped GameObject: m_CorrespondingSourceObject: {fileID: 835007492758508419, guid: 5322794fa1699704b8e50a14cef106b1, @@ -7941,83 +8445,8 @@ Transform: m_Children: - {fileID: 1139190780} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2232049265454068919 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1990836491} - m_Modifications: - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - - target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_Name - value: painkillers - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5689278253577398147, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} --- !u!1001 &2435173729303179787 PrefabInstance: m_ObjectHideFlags: 0 @@ -8068,7 +8497,7 @@ PrefabInstance: - target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0, type: 3} propertyPath: m_RootOrder - value: 22 + value: 29 objectReference: {fileID: 0} - target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0, type: 3} @@ -8247,7 +8676,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -8266,6 +8695,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &3435627264125316373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.008133344 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.265739 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.023658 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &5702864032930705300 PrefabInstance: m_ObjectHideFlags: 0 @@ -8311,7 +8809,7 @@ PrefabInstance: - target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681, type: 3} propertyPath: m_RootOrder - value: 14 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681, type: 3} @@ -8385,7 +8883,7 @@ PrefabInstance: - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} propertyPath: m_RootOrder - value: 23 + value: 30 objectReference: {fileID: 0} - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} @@ -8744,7 +9242,7 @@ PrefabInstance: - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_RootOrder - value: 24 + value: 31 objectReference: {fileID: 0} - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} @@ -8822,18 +9320,6 @@ PrefabInstance: - {fileID: 4090411522576814766, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} - {fileID: 7851948758291723579, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} ---- !u!4 &6648769901767351058 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - m_PrefabInstance: {fileID: 2232049265454068919} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7646678029089908993 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - m_PrefabInstance: {fileID: 2232049265454068919} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7985979212702423926 PrefabInstance: m_ObjectHideFlags: 0 @@ -8916,6 +9402,16 @@ PrefabInstance: value: objectReference: {fileID: 7279375804173823597, guid: f7f441e621e5e5f40b11b7617756a0af, type: 3} + - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: audio + value: + objectReference: {fileID: 532783939} + - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + propertyPath: lose + value: + objectReference: {fileID: 8300000, guid: 82c454fc5bd3770438a50747eec0fc06, type: 3} - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: m_LocalPosition.x @@ -9023,7 +9519,7 @@ PrefabInstance: - target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd, type: 3} propertyPath: m_RootOrder - value: 10 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd, type: 3} diff --git a/Assets/Scenes/Test-Haitem.unity b/Assets/Scenes/Test-Haitem.unity index be2ff49..dd7b5da 100644 --- a/Assets/Scenes/Test-Haitem.unity +++ b/Assets/Scenes/Test-Haitem.unity @@ -787,6 +787,7 @@ MonoBehaviour: Wood: {fileID: 863154880} Ammo: {fileID: 802293425} healthBar: {fileID: 562374831} + waves: {fileID: 0} --- !u!1001 &591872493 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BarricadeManager.cs b/Assets/Scripts/BarricadeManager.cs index e1ea608..4a7d437 100644 --- a/Assets/Scripts/BarricadeManager.cs +++ b/Assets/Scripts/BarricadeManager.cs @@ -39,9 +39,9 @@ public class BarricadeManager : MonoBehaviour public void addPlank() { - if (health < (barricadePlanks.Count * 35)) { + if (health < (barricadePlanks.Count * 20)) { audioSource.PlayOneShot(buildSound); - health += 35; + health += 20; offMeshLink.enabled = false; } } @@ -59,7 +59,7 @@ public class BarricadeManager : MonoBehaviour { for (int i = 0; i < barricadePlanks.Count; i++) { - if (i < (health / 35)) { + if (i < (health / 20)) { barricadePlanks[i].SetActive(true); } else diff --git a/Assets/Scripts/DayManager.cs b/Assets/Scripts/DayManager.cs index 7a6f136..ecac937 100644 --- a/Assets/Scripts/DayManager.cs +++ b/Assets/Scripts/DayManager.cs @@ -10,6 +10,7 @@ public class DayManager : MonoBehaviour public AudioSource mainSource = new AudioSource(); public AudioClip dayClip; public AudioClip nigtClip; + public GuiManager guiManager; public int daySurvived = 0; @@ -22,6 +23,10 @@ public class DayManager : MonoBehaviour // Update is called once per frame void Update() { + if (guiManager != null) + { + guiManager.setWave(daySurvived+1); + } float sunRotationX = transform.localEulerAngles.x; sunRotationX = (sunRotationX > 180) ? sunRotationX - 360 : sunRotationX; if (sunRotationX < 0 && !night) diff --git a/Assets/Scripts/GuiManager.cs b/Assets/Scripts/GuiManager.cs index 42711f3..b81c727 100644 --- a/Assets/Scripts/GuiManager.cs +++ b/Assets/Scripts/GuiManager.cs @@ -9,6 +9,7 @@ public class GuiManager : MonoBehaviour public Text Wood; public Text Ammo; public Image healthBar; + public Text waves; // Start is called before the first frame update void Start() @@ -35,4 +36,9 @@ public class GuiManager : MonoBehaviour { healthBar.fillAmount = health; } + + public void setWave(int wave) + { + waves.text = "Wave: " + wave; + } } diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index b3bdb1e..c229b03 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -28,6 +28,10 @@ public class PlayerManager : MonoBehaviour public int selectedWeapon = 0; private float selectRate = 1; private float selectTime = 1; + public AudioSource audio; + public AudioClip lose; + private float nextMapeTime = 2; + private float nextMapeTime2 = 2; // Start is called before the first frame update @@ -58,7 +62,14 @@ public class PlayerManager : MonoBehaviour if (actualHealth <= 0) { - SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single); + if (audio != null && lose != null && (nextMapeTime2 + 1) <= Time.time) + { + audio.PlayOneShot(lose); + nextMapeTime2 = nextMapeTime + Time.time; + } + if (nextMapeTime2 <= Time.time) { + SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single); + } } float hpInPrcent = (actualHealth / (health / 100.0f));