From 5b3e0ac0b37dd67ebc21af0031d84c007b6e9dac Mon Sep 17 00:00:00 2001 From: loulou123546 Date: Sun, 30 Dec 2018 15:16:45 +0100 Subject: [PATCH] all the v0.4.2 new Internet optimisation (Break old Version /!\ ) + FPTSR + VL + SAMU + blessures --- On The CALL/Assets/UI/VHC.cs | 16 +- On The CALL/Assets/UI/actions.cs | 34 +- On The CALL/Assets/gameplay/IDsenpai.cs | 24 +- On The CALL/Assets/gameplay/LED_model.cs | 37 ++ On The CALL/Assets/gameplay/LED_model.cs.meta | 11 + On The CALL/Assets/gameplay/NetID.cs | 6 +- On The CALL/Assets/gameplay/NetTCP.cs | 16 +- On The CALL/Assets/gameplay/NetUDP.cs | 14 +- On The CALL/Assets/gameplay/OBJ_manger.cs | 40 ++ .../Assets/gameplay/OBJ_manger.cs.meta | 11 + On The CALL/Assets/gameplay/fromNetwork.cs | 2 +- On The CALL/Assets/gameplay/keyListener.cs | 6 +- .../Assets/interventions/intervention.cs | 6 + On The CALL/Assets/interventions/victimes.cs | 17 +- On The CALL/Assets/scenes/map.unity | 627 +++++++++++++++++- On The CALL/Assets/scenes/menu.unity | 2 +- .../Assets/textures/camions/VSAV.prefab | 8 +- On The CALL/Assets/textures/camions/fptsr.png | Bin 0 -> 2436 bytes .../Assets/textures/camions/fptsr.png.meta | 76 +++ .../Assets/textures/camions/fptsr.prefab | 497 ++++++++++++++ .../Assets/textures/camions/fptsr.prefab.meta | 8 + .../Assets/textures/camions/samu_vl.png | Bin 0 -> 1902 bytes .../Assets/textures/camions/samu_vl.png.meta | 76 +++ .../Assets/textures/camions/samu_vl.prefab | 424 ++++++++++++ .../textures/camions/samu_vl.prefab.meta | 8 + On The CALL/Assets/textures/camions/vl.png | Bin 0 -> 1019 bytes .../Assets/textures/camions/vl.png.meta | 76 +++ On The CALL/Assets/textures/camions/vl.prefab | 424 ++++++++++++ .../Assets/textures/camions/vl.prefab.meta | 8 + .../Assets/textures/object/net_cone.prefab | 3 +- 30 files changed, 2414 insertions(+), 63 deletions(-) create mode 100644 On The CALL/Assets/gameplay/LED_model.cs create mode 100644 On The CALL/Assets/gameplay/LED_model.cs.meta create mode 100644 On The CALL/Assets/gameplay/OBJ_manger.cs create mode 100644 On The CALL/Assets/gameplay/OBJ_manger.cs.meta create mode 100644 On The CALL/Assets/textures/camions/fptsr.png create mode 100644 On The CALL/Assets/textures/camions/fptsr.png.meta create mode 100644 On The CALL/Assets/textures/camions/fptsr.prefab create mode 100644 On The CALL/Assets/textures/camions/fptsr.prefab.meta create mode 100644 On The CALL/Assets/textures/camions/samu_vl.png create mode 100644 On The CALL/Assets/textures/camions/samu_vl.png.meta create mode 100644 On The CALL/Assets/textures/camions/samu_vl.prefab create mode 100644 On The CALL/Assets/textures/camions/samu_vl.prefab.meta create mode 100644 On The CALL/Assets/textures/camions/vl.png create mode 100644 On The CALL/Assets/textures/camions/vl.png.meta create mode 100644 On The CALL/Assets/textures/camions/vl.prefab create mode 100644 On The CALL/Assets/textures/camions/vl.prefab.meta diff --git a/On The CALL/Assets/UI/VHC.cs b/On The CALL/Assets/UI/VHC.cs index 67dd8d3..40973d8 100644 --- a/On The CALL/Assets/UI/VHC.cs +++ b/On The CALL/Assets/UI/VHC.cs @@ -16,6 +16,8 @@ public class VHC : MonoBehaviour { public GameObject spawn_door; public GameObject[] gyros; float toggleGyro = 0.25f; + public GameObject[] gyrosecondaires; + public int gyro_secondaire_mode = 0; public int code_alerte = 1; public float resetDriver = 0.0f; public GameObject World; @@ -41,9 +43,9 @@ void Update () { speed = speed + 0.2f; } else if (Input.GetKey (KeyCode.S) && speed > 0.1f) { speed = speed - 0.2f; - } else if (Input.GetKey (KeyCode.Z)) { + } else if (Input.GetKey (KeyCode.Z) && speed < maxspeed) { speed = speed + Time.deltaTime; - } else if (Input.GetKey (KeyCode.S)) { + } else if (Input.GetKey (KeyCode.S) && speed > (0 - maxspeed)) { speed = speed - Time.deltaTime; } else if (speed > 0.05f) { speed = speed - 0.05f; @@ -92,6 +94,9 @@ void Update () { if (code_alerte < 3 && gameObject.GetComponent ().isPlaying == true) { gameObject.GetComponent ().Stop (); } + foreach (GameObject led in gyrosecondaires) { + led.GetComponent ().send (Time.time, gyro_secondaire_mode); + } } public void change_code(int code, bool force){ @@ -127,12 +132,13 @@ public void change_code(int code, bool force){ } } - public void NetUpdate(int code, float x, float y, float zaxis, int driverID){ + public void NetUpdate(int code, int gyro2, float x, float y, float zaxis, int driverID){ // this is not called if you are the driver Imdriver = false; if (code_alerte != code) { change_code (code, true); } + gyro_secondaire_mode = gyro2; //Vector3 oldpos = gameObject.GetComponent ().position; gameObject.GetComponent ().position = new Vector3 (x, y, -3.0f); //gameObject.GetComponent ().LookAt (oldpos); @@ -166,6 +172,10 @@ public void menuE (){ World.GetComponent().OpenMenu("Brancard", "Attacher Brancard", "medic_rentrer_brancard_dans#VSAV 01#" + World.GetComponent().ID.ToString()); } else if (VHCname == "VSAV 01") { World.GetComponent().OpenMenu("Equipement", "Gants Latex", "taketool#hand", "Sac de secours", "taketool#medpack", "Brancard", "taketool#brancard", "Reprendre la victime", "medic_prendre_brancard_avec_victime#VSAV 01#" + World.GetComponent().ID.ToString()); + } else if (VHCname == "FPTSR 01" && gyro_secondaire_mode == 1) { + World.GetComponent().OpenMenu("FPTSR", "Eteindre TriFlash", "setGyro2model#FPTSR 01#0"); + } else if (VHCname == "FPTSR 01" && gyro_secondaire_mode == 0) { + World.GetComponent().OpenMenu("FPTSR", "Allumer TriFlash", "setGyro2model#FPTSR 01#1"); } } } diff --git a/On The CALL/Assets/UI/actions.cs b/On The CALL/Assets/UI/actions.cs index df833e1..dfd87fe 100644 --- a/On The CALL/Assets/UI/actions.cs +++ b/On The CALL/Assets/UI/actions.cs @@ -10,6 +10,9 @@ public class actions : MonoBehaviour { public GameObject cone_model; public GameObject car_VSAV1; public GameObject car_FPT1; + public GameObject car_FPTSR1; + public GameObject car_VL1; + public GameObject car_SAMU_VL1; public GameObject[] interventions; // Use this for initialization @@ -27,6 +30,8 @@ public void DoAction (string todo){ if (todo == "open Ordi") { gameObject.GetComponent ().CloseMenu (); gameObject.GetComponent ().OpenMenu ("Ordinateur", "Prendre feuille route", "take departure paper"); + } else if (todo == "close"){ + gameObject.GetComponent ().CloseMenu (); } else if (todo == "open Hospital Menu"){ gameObject.GetComponent ().CloseMenu (); gameObject.GetComponent ().OpenMenu ("CHU St-Brieuc", "Déposer une victime", "medic_deposer_brancard_hopital#" + gameObject.GetComponent().ID.ToString()); @@ -56,7 +61,23 @@ public void DoAction (string todo){ gameObject.GetComponent ().DoAction ("medic_asistance_resp", splitedTodo [1]); } else if (splitedTodo[0] == "medic_menu_blessures") { gameObject.GetComponent ().CloseMenu (); - //TODO region choose, and after type of soin + string[] Tags = splitedTodo[1].Split(':'); + NetAction("Inter#" + Tags[0] + "#menu_blessure#" + Tags[1]); + } else if (splitedTodo[0] == "medic_menu_blessures2") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().OpenMenu (splitedTodo[2], "Désinfecter", "medic_soins_desinfecter#" + splitedTodo[1] + "#" + splitedTodo[2], "Mettre bandage", "medic_soins_bandage#" + splitedTodo[1] + "#" + splitedTodo[2], "Mettre crème anti-douleur", "medic_soins_antidouleur#" + splitedTodo[1] + "#" + splitedTodo[2], "Mettre pansement", "medic_soins_pansement#" + splitedTodo[1] + "#" + splitedTodo[2]); + } else if (splitedTodo[0] == "medic_soins_desinfecter") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().DoAction ("medic_soins_desinfecter", splitedTodo [1], splitedTodo [2]); + } else if (splitedTodo[0] == "medic_soins_bandage") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().DoAction ("medic_soins_bandage", splitedTodo [1], splitedTodo [2]); + } else if (splitedTodo[0] == "medic_soins_antidouleur") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().DoAction ("medic_soins_antidouleur", splitedTodo [1], splitedTodo [2]); + } else if (splitedTodo[0] == "medic_soins_pansement") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().DoAction ("medic_soins_pansement", splitedTodo [1], splitedTodo [2]); } else if (splitedTodo[0] == "medic_put_victim_in_brancard") { gameObject.GetComponent ().CloseMenu (); gameObject.GetComponent ().DoAction ("medic_put_victim_in_brancard", splitedTodo [1], splitedTodo [2]); @@ -74,6 +95,9 @@ public void DoAction (string todo){ } else if (splitedTodo[0] == "taketool") { gameObject.GetComponent ().CloseMenu (); gameObject.GetComponent ().change_tool (splitedTodo [1]); + } else if (splitedTodo[0] == "setGyro2model") { + gameObject.GetComponent ().CloseMenu (); + gameObject.GetComponent ().DoAction ("setGyro2model", splitedTodo [1], splitedTodo [2]); } } @@ -84,12 +108,7 @@ public void NetAction(string rawaction){ nbline = nbline + 1; } if (nbline > 0) { - if (datas [0] == "addcone" && nbline > 3) { - GameObject temp = Instantiate (cone_model, new Vector3 (float.Parse (datas [2]), float.Parse (datas [3]), -2.0f), new Quaternion (0, 0, 0, 0)); - temp.GetComponent ().ID = int.Parse (datas [1]); - } else if (datas [0] == "remcone" && nbline > 1) { - eventmanager.GetComponent ().actionTo (int.Parse (datas [1]), "destroy"); - } else if(datas[0] == "Inter" && nbline > 2) { + if(datas[0] == "Inter" && nbline > 2) { foreach (GameObject inter in interventions) { if (inter.GetComponent ().NAME == datas [1]) { string preparestring = "fromServer"; @@ -100,6 +119,7 @@ public void NetAction(string rawaction){ return; } } + Debug.Log ("inter not find : " + rawaction); } else { //unknow action } diff --git a/On The CALL/Assets/gameplay/IDsenpai.cs b/On The CALL/Assets/gameplay/IDsenpai.cs index 78f5f97..7dac5c5 100644 --- a/On The CALL/Assets/gameplay/IDsenpai.cs +++ b/On The CALL/Assets/gameplay/IDsenpai.cs @@ -4,7 +4,7 @@ public class IDsenpai : MonoBehaviour { - string[] Orders = { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; + //string[] Orders = { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; // Use this for initialization void Start () { @@ -16,22 +16,22 @@ void Update () { } - void OnTriggerStay(Collider col){ + /*void OnTriggerStay(Collider col){ for (int i = 0; i < Orders.Length; i++) { if (Orders [i] != "") { string[] data = Orders [i].Split ('#'); - if (col != null && col.gameObject != null && col.gameObject.GetComponent() != null && int.Parse (data [0]) == col.gameObject.GetComponent ().ID) { - if (data [1] == "destroy") { - col.gameObject.GetComponent ().deleteMyself (); - Orders [i] = ""; - return; - } - } + //if (col != null && col.gameObject != null && col.gameObject.GetComponent() != null && int.Parse (data [0]) == col.gameObject.GetComponent ().ID) { + //if (data [1] == "destroy") { + // col.gameObject.GetComponent ().deleteMyself (); + //Orders [i] = ""; + //return; + //} + //} } } - } + }*/ - public void actionTo(int ID, string ask, string data = ""){ + /*public void actionTo(int ID, string ask, string data = ""){ for (int i = 0; i < Orders.Length; i++) { if (Orders [i] == "") { Orders [i] = ID.ToString () + "#" + ask + "#" + data; @@ -39,5 +39,5 @@ public void actionTo(int ID, string ask, string data = ""){ } } // If your come here, there was a BIG PROBLEM, action will be skipped - } + }*/ } diff --git a/On The CALL/Assets/gameplay/LED_model.cs b/On The CALL/Assets/gameplay/LED_model.cs new file mode 100644 index 0000000..7b1683a --- /dev/null +++ b/On The CALL/Assets/gameplay/LED_model.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LED_model : MonoBehaviour { + + /* Modes : + * 0 : off + * 1 : blink sync (FPTSR) + * 2 : cross + * 3 : arrowLeft + * 4 : arrow Right + */ + public bool[] TurnOnFor = { true, false, false, false, false }; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + public void send (float TimeS, int mode){ + if (TurnOnFor [mode] == false) { + gameObject.GetComponent ().enabled = false; + } else if (mode == 1) { + if (TimeS % 0.3f >= 0.15f) { + gameObject.GetComponent ().enabled = false; + } else { + gameObject.GetComponent ().enabled = true; + } + } + } +} diff --git a/On The CALL/Assets/gameplay/LED_model.cs.meta b/On The CALL/Assets/gameplay/LED_model.cs.meta new file mode 100644 index 0000000..da6d024 --- /dev/null +++ b/On The CALL/Assets/gameplay/LED_model.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fae9034026a5a1649a75c92c97d6ba45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/On The CALL/Assets/gameplay/NetID.cs b/On The CALL/Assets/gameplay/NetID.cs index a3697b6..4ec0b4d 100644 --- a/On The CALL/Assets/gameplay/NetID.cs +++ b/On The CALL/Assets/gameplay/NetID.cs @@ -4,7 +4,7 @@ public class NetID : MonoBehaviour { - public int ID = 0; + //public int ID = 0; // Use this for initialization void Start () { @@ -16,11 +16,11 @@ void Update () { } - public void deleteMyself(){ + /*public void deleteMyself(){ Destroy (gameObject); } public void setVHCcode(int code){ gameObject.GetComponent().change_code(code, true); - } + }*/ } diff --git a/On The CALL/Assets/gameplay/NetTCP.cs b/On The CALL/Assets/gameplay/NetTCP.cs index d9a56ac..9fd3e98 100644 --- a/On The CALL/Assets/gameplay/NetTCP.cs +++ b/On The CALL/Assets/gameplay/NetTCP.cs @@ -41,17 +41,21 @@ public void DoAction(string act, string d1 = " ", string d2 = " ", string d3 = " StartCoroutine (makeAweb(act, d1, d2, d3)); } - public void receive(string chat, string chat_inter, string act1 = " ", string act2 = " ", string act3 = " ", string act4 = " ", string act5 = " "){ + public void receive(string chat, string chat_inter, string cones = " ", string inter_info = " "){ gameObject.GetComponent ().update_chat(chat); + gameObject.GetComponent ().updateCones (cones); if (gameObject.GetComponent ().truck_text.GetComponent ().text == "") { gameObject.GetComponent ().msg_inter (""); } else { gameObject.GetComponent ().msg_inter (chat_inter); } - if(act1 != " ") gameObject.GetComponent ().NetAction (act1); - if(act2 != " ") gameObject.GetComponent ().NetAction (act2); - if(act3 != " ") gameObject.GetComponent ().NetAction (act3); - if(act4 != " ") gameObject.GetComponent ().NetAction (act4); - if(act5 != " ") gameObject.GetComponent ().NetAction (act5); + + string[] inter_data = inter_info.Split ('&'); + foreach (string inter in inter_data) { + string[] parsed = inter.Split ('#'); + if (parsed [0] == "Victim_blessure") { + gameObject.GetComponent ().NetAction ("Inter#" + parsed[1] + "#Victim_blessure#" + parsed[2] + "#" + parsed[3]); + } + } } } diff --git a/On The CALL/Assets/gameplay/NetUDP.cs b/On The CALL/Assets/gameplay/NetUDP.cs index c21ffd8..556acfc 100644 --- a/On The CALL/Assets/gameplay/NetUDP.cs +++ b/On The CALL/Assets/gameplay/NetUDP.cs @@ -92,10 +92,16 @@ public void receive (string rawdata){ gameObject.GetComponent ().set_bip_msg (cmds2 [2]); gameObject.GetComponent ().set_bip_vhc (cmds2 [3]); } - } else if(cmds2 [0] == "VSAV 01" && int.Parse(cmds2[5]) != playerID){ - gameObject.GetComponent ().car_VSAV1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),float.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),int.Parse(cmds2[5])); - } else if(cmds2 [0] == "FPT 01" && int.Parse(cmds2[5]) != playerID){ - gameObject.GetComponent ().car_FPT1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),float.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),int.Parse(cmds2[5])); + } else if(cmds2 [0] == "VSAV 01" && int.Parse(cmds2[6]) != playerID){ + gameObject.GetComponent ().car_VSAV1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),int.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),float.Parse(cmds2[5]),int.Parse(cmds2[6])); + } else if(cmds2 [0] == "FPT 01" && int.Parse(cmds2[6]) != playerID){ + gameObject.GetComponent ().car_FPT1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),int.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),float.Parse(cmds2[5]),int.Parse(cmds2[6])); + } else if(cmds2 [0] == "FPTSR 01" && int.Parse(cmds2[6]) != playerID){ + gameObject.GetComponent ().car_FPTSR1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),int.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),float.Parse(cmds2[5]),int.Parse(cmds2[6])); + } else if(cmds2 [0] == "VL 01" && int.Parse(cmds2[6]) != playerID){ + gameObject.GetComponent ().car_VL1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),int.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),float.Parse(cmds2[5]),int.Parse(cmds2[6])); + } else if(cmds2 [0] == "SAMU_VL 01" && int.Parse(cmds2[6]) != playerID){ + gameObject.GetComponent ().car_SAMU_VL1.GetComponent ().NetUpdate (int.Parse(cmds2[1]),int.Parse(cmds2[2]),float.Parse(cmds2[3]),float.Parse(cmds2[4]),float.Parse(cmds2[5]),int.Parse(cmds2[6])); } else if(cmds2 [0] == "VICTIME"){ gameObject.GetComponent ().NetAction ("Inter#" + cmds2[1] + "#VICTIME#" + cmds2[2] + "#" + cmds2[3] + "#" + cmds2[4] + "#" + cmds2[5] + "#" + cmds2[6]); diff --git a/On The CALL/Assets/gameplay/OBJ_manger.cs b/On The CALL/Assets/gameplay/OBJ_manger.cs new file mode 100644 index 0000000..650277d --- /dev/null +++ b/On The CALL/Assets/gameplay/OBJ_manger.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class OBJ_manger : MonoBehaviour { + + public GameObject cone_model; + public GameObject[] cones = new GameObject[100]; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + public void updateCones (string raw = "&"){ + string[] list = raw.Split ('&'); + for (int i = 0; i < 100; i++) { + if (list [i] != "") { + string[] coord = list [i].Split ('#'); + if (cones [i] == null) { + cones[i] = Instantiate (cone_model, new Vector3 (float.Parse (coord [0]), float.Parse (coord [1]), -2.0f), new Quaternion (0, 0, 0, 0)); + } else { + if (cones [i].GetComponent ().position.x != float.Parse (coord [0]) || cones [i].GetComponent ().position.y != float.Parse (coord [1])) { + Destroy (cones [i]); + cones [i] = null; + cones[i] = Instantiate (cone_model, new Vector3 (float.Parse (coord [0]), float.Parse (coord [1]), -2.0f), new Quaternion (0, 0, 0, 0)); + } + } + } else if (cones [i] != null) { + Destroy (cones [i]); + cones [i] = null; + } + } + } +} diff --git a/On The CALL/Assets/gameplay/OBJ_manger.cs.meta b/On The CALL/Assets/gameplay/OBJ_manger.cs.meta new file mode 100644 index 0000000..cae56b9 --- /dev/null +++ b/On The CALL/Assets/gameplay/OBJ_manger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83d6b614345ea7a40bf3b423677c0e12 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/On The CALL/Assets/gameplay/fromNetwork.cs b/On The CALL/Assets/gameplay/fromNetwork.cs index 8225ad5..c85d142 100644 --- a/On The CALL/Assets/gameplay/fromNetwork.cs +++ b/On The CALL/Assets/gameplay/fromNetwork.cs @@ -43,7 +43,7 @@ IEnumerator fetchMainData (){ yield return downloadFM; if (string.IsNullOrEmpty (downloadFM.error)) { monObjFM = JSON.Parse(downloadFM.text); - gameObject.GetComponent ().receive (monObjFM ["chat"], monObjFM ["chat_inter"], monObjFM ["act1"], monObjFM ["act2"], monObjFM ["act3"], monObjFM ["act4"], monObjFM ["act5"]); + gameObject.GetComponent ().receive (monObjFM ["chat"], monObjFM ["chat_inter"], monObjFM ["cones"], monObjFM ["inter_info"]); } sendOnNext = true; } diff --git a/On The CALL/Assets/gameplay/keyListener.cs b/On The CALL/Assets/gameplay/keyListener.cs index 21daf70..8d40341 100644 --- a/On The CALL/Assets/gameplay/keyListener.cs +++ b/On The CALL/Assets/gameplay/keyListener.cs @@ -176,11 +176,7 @@ void Update () { } if (listen_cone && Input.GetKeyDown (convertKey (PlayerPrefs.GetString ("keyboard_cone", "C"))) && gameObject.GetComponent ().inacar == false) { listen_cone = false; - if (gameObject.GetComponent ().nearCone == null) { - gameObject.GetComponent ().World.GetComponent ().DoAction ("addcone", gameObject.GetComponent ().position.x.ToString (), (gameObject.GetComponent ().position.y + 1.0f).ToString ()); - } else { - gameObject.GetComponent ().World.GetComponent ().DoAction ("remcone", gameObject.GetComponent ().nearCone.GetComponent ().ID.ToString ()); - } + gameObject.GetComponent ().World.GetComponent ().DoAction ("keycone", gameObject.GetComponent ().position.x.ToString (), (gameObject.GetComponent ().position.y).ToString ()); } if (Input.GetKeyUp (convertKey (PlayerPrefs.GetString ("keyboard_car", "Space")))) { diff --git a/On The CALL/Assets/interventions/intervention.cs b/On The CALL/Assets/interventions/intervention.cs index 12daaa5..2b6eccc 100644 --- a/On The CALL/Assets/interventions/intervention.cs +++ b/On The CALL/Assets/interventions/intervention.cs @@ -55,6 +55,12 @@ public void Action (string rawaction){ if (datas [1] == "victime_menu" && nbline > 2) { victimes [ int.Parse(datas[2]) ].GetComponent ().action ("menu"); } + else if (datas [1] == "menu_blessure" && nbline > 2) { + victimes [ int.Parse(datas[2]) ].GetComponent ().action ("menu_blessure"); + } + else if (datas [1] == "Victim_blessure" && nbline > 3) { + victimes [ int.Parse(datas[2]) ].GetComponent ().updateBlessures (datas[3]); + } else if (datas [1] == "VICTIME" && nbline > 2) { victimes [ int.Parse(datas[2]) ].GetComponent ().update (float.Parse(datas[3]), float.Parse(datas[4]), float.Parse(datas[5]), float.Parse(datas[6])); } diff --git a/On The CALL/Assets/interventions/victimes.cs b/On The CALL/Assets/interventions/victimes.cs index 7f2ddee..78530b9 100644 --- a/On The CALL/Assets/interventions/victimes.cs +++ b/On The CALL/Assets/interventions/victimes.cs @@ -10,6 +10,7 @@ public class victimes : MonoBehaviour { public float orig_y = 0.0f; public float orig_z = 0.0f; public float orig_rot = 0.0f; + public string[] blessures = new string[4]; // Use this for initialization @@ -57,9 +58,23 @@ public void action(string action){ if (action == "menu" && gameObject.GetComponentInParent ().World.GetComponent ().get_tool() == "hand") { gameObject.GetComponentInParent ().World.GetComponent ().OpenMenu ("Victime", "Test conscience", "check_inconsciente#" + tag_name, "Prendre le Pouls", "check_respire#" + tag_name, "Cherche blessures", "search_hurt_zone#" + tag_name, "Identifier la victime", "check_identitee#" + tag_name); } else if (action == "menu" && gameObject.GetComponentInParent ().World.GetComponent ().get_tool() == "medpack") { - gameObject.GetComponentInParent ().World.GetComponent ().OpenMenu ("Victime", "Mettre collier cervical", "medic_put_collier_cervical#" + tag_name, "Massage Cardiaque", "medic_rcp#" + tag_name, "Mettre Assistance Respiratoire", "medic_asistance_resp#" + tag_name/*, "Blessures", "medic_menu_blessures#" + tag_name*/);//TODO ajouter la gestion des blessures + gameObject.GetComponentInParent ().World.GetComponent ().OpenMenu ("Victime", "Mettre collier cervical", "medic_put_collier_cervical#" + tag_name, "Massage Cardiaque", "medic_rcp#" + tag_name, "Mettre Assistance Respiratoire", "medic_asistance_resp#" + tag_name, "Blessures", "medic_menu_blessures#" + tag_name); } else if (action == "menu" && gameObject.GetComponentInParent ().World.GetComponent ().get_tool() == "brancard") { gameObject.GetComponentInParent ().World.GetComponent ().OpenMenu ("Victime", "Prendre victime ", "medic_put_victim_in_brancard#" + tag_name + "#" + gameObject.GetComponentInParent().World.GetComponent().ID.ToString()); + } else if (action == "menu_blessure") { + gameObject.GetComponentInParent ().World.GetComponent ().OpenMenu ("Blessures", blessures[0], "medic_menu_blessures2#" + tag_name + "#" + blessures[0], blessures[1], "medic_menu_blessures2#" + tag_name + "#" + blessures[1], blessures[2], "medic_menu_blessures2#" + tag_name + "#" + blessures[2], blessures[3], "medic_menu_blessures2#" + tag_name + "#" + blessures[3]);//TODO ajouter la gestion des blessures + } + } + + public void updateBlessures (string raw){ + if (raw == "nohurt") { + blessures[0] = "";blessures[1] = "";blessures[2] = "";blessures[3] = ""; + } else { + string[] datas = raw.Split (':'); + if (datas.Length >= 1) { blessures [0] = datas[0]; } else { blessures [0] = ""; } + if (datas.Length >= 2) { blessures [1] = datas[1]; } else { blessures [1] = ""; } + if (datas.Length >= 3) { blessures [2] = datas[2]; } else { blessures [2] = ""; } + if (datas.Length >= 4) { blessures [3] = datas[3]; } else { blessures [3] = ""; } } } } diff --git a/On The CALL/Assets/scenes/map.unity b/On The CALL/Assets/scenes/map.unity index 1b7b677..bf7fbfd 100644 --- a/On The CALL/Assets/scenes/map.unity +++ b/On The CALL/Assets/scenes/map.unity @@ -2817,7 +2817,7 @@ Prefab: m_Modifications: - target: {fileID: 4707033017210418, guid: 68c762d05f715964ea99a1e76d39e48c, type: 2} propertyPath: m_LocalPosition.x - value: 47.4 + value: 51.35 objectReference: {fileID: 0} - target: {fileID: 4707033017210418, guid: 68c762d05f715964ea99a1e76d39e48c, type: 2} propertyPath: m_LocalPosition.y @@ -15768,7 +15768,7 @@ Transform: m_LocalScale: {x: 5, y: 10, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!65 &219193092 BoxCollider: @@ -21524,6 +21524,78 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: a8c30489551699240939ca3b481f559c, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &300416926 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: gyrosecondaires.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalPosition.x + value: 55.75 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalPosition.y + value: -5.93 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: World + value: + objectReference: {fileID: 871728318} + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: gyrosecondaires.Array.data[0] + value: + objectReference: {fileID: 1950970282} + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: gyrosecondaires.Array.data[1] + value: + objectReference: {fileID: 1397362947} + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: gyrosecondaires.Array.data[2] + value: + objectReference: {fileID: 1173591319} + - target: {fileID: 114450076911003006, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + propertyPath: gyro_secondaire_mode + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e1ae36bf0c0e311479bdbcaff08d1cae, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &301008945 Prefab: m_ObjectHideFlags: 0 @@ -22475,7 +22547,7 @@ RectTransform: - {fileID: 1452239597} - {fileID: 939177473} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -32357,6 +32429,11 @@ Transform: m_PrefabParentObject: {fileID: 4082999795408960, guid: 85880a81f71d6264097bc708217a1007, type: 2} m_PrefabInternal: {fileID: 448407224} +--- !u!1 &449922306 stripped +GameObject: + m_PrefabParentObject: {fileID: 1868024775726072, guid: dcdd08c93390d624293d427c00cff4b5, + type: 2} + m_PrefabInternal: {fileID: 737534695} --- !u!1001 &450250774 Prefab: m_ObjectHideFlags: 0 @@ -45932,6 +46009,53 @@ Transform: m_PrefabParentObject: {fileID: 4764298983568108, guid: 34eaa0df86c579543b6a3f39100f215a, type: 2} m_PrefabInternal: {fileID: 649361114} +--- !u!1001 &649437453 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalPosition.x + value: 73.72 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalPosition.y + value: -17.26 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4383882978739814, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114186703743201074, guid: 75d6df1cfd3409e498e8e21fdad688c4, + type: 2} + propertyPath: World + value: + objectReference: {fileID: 871728318} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 75d6df1cfd3409e498e8e21fdad688c4, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &649833212 Prefab: m_ObjectHideFlags: 0 @@ -48366,7 +48490,7 @@ Transform: - {fileID: 1895723091} - {fileID: 655631950} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &683463237 Prefab: @@ -52199,6 +52323,11 @@ MonoBehaviour: orig_y: 0 orig_z: 0 orig_rot: -32 + blessures: + - + - + - + - --- !u!65 &735350708 BoxCollider: m_ObjectHideFlags: 0 @@ -52384,6 +52513,53 @@ Transform: m_PrefabParentObject: {fileID: 4985548759422142, guid: 6cef01e3173c42f4a929a5ff9810a56b, type: 2} m_PrefabInternal: {fileID: 737232161} +--- !u!1001 &737534695 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalPosition.x + value: 238.3 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalPosition.y + value: 74.9 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4893975498512878, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114524466887774024, guid: dcdd08c93390d624293d427c00cff4b5, + type: 2} + propertyPath: World + value: + objectReference: {fileID: 871728318} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: dcdd08c93390d624293d427c00cff4b5, type: 2} + m_IsPrefabParent: 0 --- !u!4 &738029589 stripped Transform: m_PrefabParentObject: {fileID: 4082999795408960, guid: 85880a81f71d6264097bc708217a1007, @@ -55394,6 +55570,11 @@ MonoBehaviour: orig_y: 0 orig_z: 0 orig_rot: 180 + blessures: + - + - + - + - --- !u!65 &779498977 BoxCollider: m_ObjectHideFlags: 0 @@ -61227,6 +61408,7 @@ GameObject: - component: {fileID: 871728319} - component: {fileID: 871728329} - component: {fileID: 871728328} + - component: {fileID: 871728333} - component: {fileID: 871728332} - component: {fileID: 871728331} m_Layer: 0 @@ -61310,7 +61492,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &871728325 MonoBehaviour: @@ -61342,6 +61524,9 @@ MonoBehaviour: cone_model: {fileID: 1875301188391840, guid: f0a71b2698c5d4c4181eeef1aa45621d, type: 2} car_VSAV1: {fileID: 2022242022} car_FPT1: {fileID: 1959621924} + car_FPTSR1: {fileID: 2000106587} + car_VL1: {fileID: 1528323275} + car_SAMU_VL1: {fileID: 449922306} interventions: - {fileID: 1889584386} - {fileID: 2125499721} @@ -61683,6 +61868,119 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: da60d3c3c0f4e604b9e6e7f1f3620576, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &871728333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 871728318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83d6b614345ea7a40bf3b423677c0e12, type: 3} + m_Name: + m_EditorClassIdentifier: + cone_model: {fileID: 1875301188391840, guid: f0a71b2698c5d4c4181eeef1aa45621d, type: 2} + cones: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} --- !u!4 &873333111 stripped Transform: m_PrefabParentObject: {fileID: 4941835204671792, guid: 3209fbeb12e0a794eaf2f409b46c1492, @@ -75557,7 +75855,7 @@ Transform: - {fileID: 1090100119} - {fileID: 1597937010} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1073603906 Prefab: @@ -77926,7 +78224,7 @@ Prefab: m_Modifications: - target: {fileID: 4719330370016078, guid: f556bb0171dabdd4da9e9a1bc650b388, type: 2} propertyPath: m_LocalPosition.x - value: 51.71 + value: 47.7 objectReference: {fileID: 0} - target: {fileID: 4719330370016078, guid: f556bb0171dabdd4da9e9a1bc650b388, type: 2} propertyPath: m_LocalPosition.y @@ -79238,7 +79536,7 @@ Transform: - {fileID: 2084712631} - {fileID: 1303594102} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1127074004 BoxCollider: @@ -82694,13 +82992,102 @@ RectTransform: m_Children: - {fileID: 518459768} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1173591319 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1008577000642528, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1173591322} + - component: {fileID: 1173591321} + - component: {fileID: 1173591320} + m_Layer: 0 + m_Name: light (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1173591320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1173591319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fae9034026a5a1649a75c92c97d6ba45, type: 3} + m_Name: + m_EditorClassIdentifier: + TurnOnFor: 0001000000 +--- !u!212 &1173591321 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 212575999948931724, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1173591319} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: eeb127b7d5c505340845c34ed3530e8b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &1173591322 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4221068452957066, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1173591319} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0.273, y: -1.052, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2000106595} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1173814638 Prefab: m_ObjectHideFlags: 0 @@ -84286,7 +84673,7 @@ Transform: - {fileID: 1818787885} - {fileID: 37245805} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1195474896 BoxCollider: @@ -84775,7 +85162,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1202075942 stripped Transform: @@ -87657,14 +88044,14 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1251155029 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1251155028} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9e89da33375248f4a91af48fcc7e3668, type: 3} m_Name: @@ -87707,7 +88094,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1251741294 Prefab: @@ -91479,6 +91866,11 @@ MonoBehaviour: orig_y: 0 orig_z: 0 orig_rot: -35 + blessures: + - + - + - + - --- !u!65 &1310150974 BoxCollider: m_ObjectHideFlags: 0 @@ -92701,6 +93093,11 @@ MonoBehaviour: orig_y: 0 orig_z: 0 orig_rot: 57.16 + blessures: + - + - + - + - --- !u!65 &1331679289 BoxCollider: m_ObjectHideFlags: 0 @@ -94877,7 +95274,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Alpha 0.4.1 + m_Text: Alpha 0.4.2 --- !u!222 &1362277411 CanvasRenderer: m_ObjectHideFlags: 0 @@ -96542,6 +96939,95 @@ Transform: m_PrefabParentObject: {fileID: 4106719433670260, guid: 48290b61bdc7d2346b5a69a7f237fc90, type: 2} m_PrefabInternal: {fileID: 1395399862} +--- !u!1 &1397362947 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1008577000642528, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1397362950} + - component: {fileID: 1397362949} + - component: {fileID: 1397362948} + m_Layer: 0 + m_Name: light (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1397362948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1397362947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fae9034026a5a1649a75c92c97d6ba45, type: 3} + m_Name: + m_EditorClassIdentifier: + TurnOnFor: 0001000000 +--- !u!212 &1397362949 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 212575999948931724, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1397362947} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: eeb127b7d5c505340845c34ed3530e8b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &1397362950 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4221068452957066, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1397362947} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: -0.109, y: -1.6259999, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2000106595} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1397776139 Prefab: m_ObjectHideFlags: 0 @@ -105494,6 +105980,11 @@ Transform: m_PrefabParentObject: {fileID: 4764298983568108, guid: 34eaa0df86c579543b6a3f39100f215a, type: 2} m_PrefabInternal: {fileID: 1528019768} +--- !u!1 &1528323275 stripped +GameObject: + m_PrefabParentObject: {fileID: 1452489250608946, guid: 75d6df1cfd3409e498e8e21fdad688c4, + type: 2} + m_PrefabInternal: {fileID: 649437453} --- !u!1001 &1528405511 Prefab: m_ObjectHideFlags: 0 @@ -133301,6 +133792,11 @@ MonoBehaviour: orig_y: 0 orig_z: 0 orig_rot: 57.16 + blessures: + - + - + - + - --- !u!4 &1947559654 stripped Transform: m_PrefabParentObject: {fileID: 4941835204671792, guid: 3209fbeb12e0a794eaf2f409b46c1492, @@ -133454,6 +133950,95 @@ Transform: m_PrefabParentObject: {fileID: 4941835204671792, guid: 3209fbeb12e0a794eaf2f409b46c1492, type: 2} m_PrefabInternal: {fileID: 1950501261} +--- !u!1 &1950970282 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 1008577000642528, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1950970285} + - component: {fileID: 1950970284} + - component: {fileID: 1950970283} + m_Layer: 0 + m_Name: light (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1950970283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1950970282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fae9034026a5a1649a75c92c97d6ba45, type: 3} + m_Name: + m_EditorClassIdentifier: + TurnOnFor: 0001000000 +--- !u!212 &1950970284 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 212575999948931724, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1950970282} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: eeb127b7d5c505340845c34ed3530e8b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &1950970285 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 4221068452957066, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1950970282} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0.656, y: -1.626, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2000106595} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1951427949 Prefab: m_ObjectHideFlags: 0 @@ -134172,7 +134757,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1959621924 stripped GameObject: @@ -136338,6 +136923,16 @@ Transform: m_PrefabParentObject: {fileID: 4941835204671792, guid: 3209fbeb12e0a794eaf2f409b46c1492, type: 2} m_PrefabInternal: {fileID: 1074644630} +--- !u!1 &2000106587 stripped +GameObject: + m_PrefabParentObject: {fileID: 1717621837136506, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 300416926} +--- !u!4 &2000106595 stripped +Transform: + m_PrefabParentObject: {fileID: 4163501558656932, guid: e1ae36bf0c0e311479bdbcaff08d1cae, + type: 2} + m_PrefabInternal: {fileID: 300416926} --- !u!1001 &2000752335 Prefab: m_ObjectHideFlags: 0 diff --git a/On The CALL/Assets/scenes/menu.unity b/On The CALL/Assets/scenes/menu.unity index 713211f..b8928ab 100644 --- a/On The CALL/Assets/scenes/menu.unity +++ b/On The CALL/Assets/scenes/menu.unity @@ -1423,7 +1423,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e53ab84c312c611429d01d535ced8d07, type: 3} m_Name: m_EditorClassIdentifier: - VERSION_ACTUAL: 0.4.1 + VERSION_ACTUAL: 0.4.2 pseudo_parent: {fileID: 185485807} pass_parent: {fileID: 1753602589} maj_text: {fileID: 1771346813} diff --git a/On The CALL/Assets/textures/camions/VSAV.prefab b/On The CALL/Assets/textures/camions/VSAV.prefab index 8117899..f061e63 100644 --- a/On The CALL/Assets/textures/camions/VSAV.prefab +++ b/On The CALL/Assets/textures/camions/VSAV.prefab @@ -100,7 +100,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1910859984382450} m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 51.71, y: -6.63, z: -3} + m_LocalPosition: {x: 47.7, y: -6.63, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4505336242145296} @@ -280,12 +280,16 @@ MonoBehaviour: Imdriver: 0 VHCname: VSAV 01 Direction: 180 - maxspeed: 10 + maxspeed: 12 spawn_door: {fileID: 1207012371308538} gyros: - {fileID: 1761248092170020} - {fileID: 1688606940864274} + gyrosecondaires: [] + gyro_secondaire_mode: 0 code_alerte: 1 + resetDriver: 0 + World: {fileID: 0} --- !u!212 &212105136490050468 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/On The CALL/Assets/textures/camions/fptsr.png b/On The CALL/Assets/textures/camions/fptsr.png new file mode 100644 index 0000000000000000000000000000000000000000..30d4e15a26c75b019ac9c40cffaef8637a96a697 GIT binary patch literal 2436 zcmbtW3rtgI6fR*CDB6OEognDwkj+7>A~JcDamzzq6`YC)6bFi9Dq~ov6cEK?LwFcQ zL@E?=tpo`K#OTCAL8E|EkQ+4v6bcg@S3%@abp=ZI-#%#F*dtrg=D+9s|M|{$zH{#1 zW(PBTm*Fk&I2>-7-!`uuV4cC?^rVJMz|)F?4KlD8C2R{jio@xTU|+r4*XF(lzAb)U zo;!~{dDUP4?TU~UCw|d$sL9>EGWu&F#BIvdyT$NKTXJa4O`9J4+Z24NabuOk;T=y5 zqbsQio#vU<@mC6a1vf?{vL&?4wt@{Ka~8=5og@9LEHApsad$Rd9$=trS@0=D57vha zEQs<)FQV`PWR{5t@kAj5*w~6o(KQGV$;B{I6_TZEDC4;co-ff8$Vpq?{PaEMOv5{S zu~<%VZ&7S@=lmvr*FHBoH!GVy?eEpfzFvg1L^PhWew`6yVDKVBHZAK4v$rv-Z*=0) zhM{c1UUK;XwvboWQn88y@1_=iHu zsJn;@sQ;%dph4=q$|k6LwulSs=?M)XokpsAr%PxNmo6cl@le+Be%Xt-bUB_vw3CCW zwaDoF!KInczmjq7!iX*?t95}9ULd4VR#!$nfUY96psd!_@BJb6V*JN$u|xik;E_AE zebrFJUcG;(8Oi+b%ht@OZf8KH|1>>e4H734msh@$oJiE3oLFxx$nv5j!;ii}siELv z*lc~HC+h)ZLuy1!U7*Sz4F*qhvF)3}u@cM~H~iviP=PTxI8iDKt`#D2ZWxA${#xV# zZW@c6G^dG-Y&8x;A0}p}#f;U~AytZuql#*EGBOJ`7Fd+|KlMYSNiLJ|x%^L9^~P2( znHAgInREqdrLdm$-KWK2yAVl)@F&m46?y|2W+Trl3whu{iLgo%7+r)NzUNIlv~c#* zsa`rD%J-PEfkBNOYi1Y{e}5FROCI)yUT0BQv3X5(qoE4E?;aLxmVtm!Kj%e6U{hO=>{M}#8{HI^?HERO79xTC+4L&B@eU#9nG^O zQ5lIT<-=ZW}2Cw}@ts??h#8rroA9 zVPmGv1ek=ECn%m?LZ(w}YROXxTv`UYeNAaD7P!A4NBjda(6`mvoI~5*0g*Via7M#q zGzPFSCt~a@cYf$)XGoWDWcmY##QH`@2I|S>aDveBBvQ(4cH1@U#?ZQKx4pyB?>HEEEc_`i=C=e3U5YtZC*8UT%?1&qTrD7O=6r1!-@}8_6$Z-y#wA>FIP#e}v^fm8X+(YiP1kRn!rP5!HzwH^I`-Q57j3RyzTsq9PR#qpBtl+b3XJxMH$^AUalq@;KN5 v6<2HoQuaSA))b)uC14S;5E}@ZynKdQK{%3IL=@};f2(kQ-VCo=XkX^Mur z0Rq+v9vnu27?1=E5-mqs1BpTsE(tdT!;!!*q*3cJF!)dBo87mw^NxLQ-+r5Q%*PF^ zp{D@?fxsT_hkO;11_CKrZBkXNk}K7N6+-=tdq5lrq%!h$C^2e*vmlV#c8^1@{^xt9 zc-2=X{f(Ojq}pfPcS0_;?x=Fx;qETlKvc6jndp%_-mSLPU)ucBU=GAhS4>T zzn)89k=SE=*x;5Y4R(FSi*p5$$EyBbjf`E_ltox_E zVdSwn#p+|U>2C69oG_r;R$M0dGkliW`Os%b=uLNKAKqriTDn|JX^VdTLn{yNT+=BN z17s>dc9JL?*Z=aNXsg`3+oo+;gHM6h7<#TO ze>pbX0BB=!9qO4(=AFi|2^E;6KVADvQ$v_5CIIvyGey8l79!Ji@b=y*z8)^lw7uBSfN{6dvCuQ`O`)avg6WD}&bGI`MPsysM8UN$n1;K$MB3v77@?!5Gm zF&w=y(MGzD1`OU4_F*mCEjqGOf|9IjncPI#vNM+jlkRTdSc~1-9lr1IiZFs@3u#0M zn`ao^nJem<6mTDeH!}2T5ygHJ_93lf10!F7G4~lay!S)oE|Vb?%HU7#Z+_Cr-F1K`;4TE*pxzM~C&13ES=x{-3hJ!y~ zp1*u8X@dmad4C>1dO82>UCk50&Avn^y7O6A=dKo_Db*&3dg;_Gof%WZi|jCAu%>WH zRRs#oaRlUva@}KfUuNDNJB?YLmtCR0`eu}Gh8(7Kt&I6F}kY8f(z#+dme%eN_drIS9Y4sWv#!t?lvxAv@bp-2f;vTpX9u1Fw@ zBi8X7sO3!0tHb*e=j~ilCInc8>(8I>|KK-sbMc||nq5EMemt^A@}afK=VkvtdDvXt_~wmGwY9zeH;c=cj6c6wofh}Sa^KVI z=Qc0jRryhTgN)Nzo8K$vnm?Hu-CmeCZ|{}!(q*X!7p6Sken0th+r6uW7Bhdm{rY3i z!|7LKf^z?SyJ?<(>a9E2v8)4Vk9(W$1?_WwS&Z~v@Zx!Y=*T$NN} zyy@pj)3504|KTcLy=wOKeRE$5biJE)!~g9b!RwP`-M;0vf4gINe)idqX~hqfYtWE@ z9fy1i{~`8=%^x8C2Xozj9709=57p<#H$)-_7d+hH3?u^}=5fUTz=`Dl)B{5s({fmB z=!@4?uid^)$NS3N??6{`$NxAazVAb;K2GNSsjM-P0(OVQVQ6~@rpIu)>wb_R7RP`B z1|!ITBG?>0IMkv>8zdH|bs@(sa#TO$mPbd?TIh)ZrlCc@1|4A}989(R{Yji?u^e-X Z-A2dxT2jL@4Pb6&@O1TaS?83{1ORtb;u-(| literal 0 HcmV?d00001 diff --git a/On The CALL/Assets/textures/camions/vl.png.meta b/On The CALL/Assets/textures/camions/vl.png.meta new file mode 100644 index 0000000..41487fa --- /dev/null +++ b/On The CALL/Assets/textures/camions/vl.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: bb55cce299f3d9443a58b818b3796875 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/On The CALL/Assets/textures/camions/vl.prefab b/On The CALL/Assets/textures/camions/vl.prefab new file mode 100644 index 0000000..d5944dd --- /dev/null +++ b/On The CALL/Assets/textures/camions/vl.prefab @@ -0,0 +1,424 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1452489250608946} + m_IsPrefabParent: 1 +--- !u!1 &1136335811562074 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4921444417299254} + - component: {fileID: 212342186694446438} + m_Layer: 0 + m_Name: light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1452489250608946 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4383882978739814} + - component: {fileID: 212999464806787966} + - component: {fileID: 54931690876039130} + - component: {fileID: 65361710200352418} + - component: {fileID: 65339161767177308} + - component: {fileID: 114042383586565292} + - component: {fileID: 114186703743201074} + - component: {fileID: 82883059782750012} + m_Layer: 0 + m_Name: vl + m_TagString: barriereOpenner + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1727046864140906 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4838547380036488} + - component: {fileID: 212391513045257266} + m_Layer: 0 + m_Name: light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1832739171601534 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4379504522831568} + m_Layer: 0 + m_Name: Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4379504522831568 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1832739171601534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.831, y: 1.975, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4383882978739814} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4383882978739814 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 73.72, y: -17.26, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4379504522831568} + - {fileID: 4838547380036488} + - {fileID: 4921444417299254} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!4 &4838547380036488 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1727046864140906} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0.3606, y: 0.4615, z: -1} + m_LocalScale: {x: 4.820308, y: 1.018272, z: 1} + m_Children: [] + m_Father: {fileID: 4383882978739814} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4921444417299254 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1136335811562074} + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: -0.3605, y: 0.4619, z: -1} + m_LocalScale: {x: 4.8151784, y: 1.0445564, z: 1} + m_Children: [] + m_Father: {fileID: 4383882978739814} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &54931690876039130 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + serializedVersion: 2 + m_Mass: 15000 + m_Drag: 1 + m_AngularDrag: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 56 + m_CollisionDetection: 0 +--- !u!65 &65339161767177308 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.477769, y: 3.8235307, z: 50} + m_Center: {x: 0.014171541, y: 0.108042955, z: 0} +--- !u!65 &65361710200352418 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.7156802, y: 2.9156482, z: 50} + m_Center: {x: -0.0021001399, y: 0.047198534, z: 0} +--- !u!82 &82883059782750012 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7aa2057fb2827834c9c0b6e1cd0c2761, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.25 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 25 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 +--- !u!114 &114042383586565292 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd591a03fcc3c37438f4d064fed4cc56, type: 3} + m_Name: + m_EditorClassIdentifier: + eventname: FireEngine +--- !u!114 &114186703743201074 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a89648c140f679e40a3ad1c5ac9fe804, type: 3} + m_Name: + m_EditorClassIdentifier: + Imdriver: 0 + VHCname: VL 01 + Direction: 90 + maxspeed: 18 + spawn_door: {fileID: 1832739171601534} + gyros: + - {fileID: 1727046864140906} + - {fileID: 1136335811562074} + gyrosecondaires: [] + gyro_secondaire_mode: 0 + code_alerte: 1 + resetDriver: 0 + World: {fileID: 0} +--- !u!212 &212342186694446438 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1136335811562074} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0a7fd5cf260e6b941a085d11dfeb229a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212391513045257266 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1727046864140906} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0a7fd5cf260e6b941a085d11dfeb229a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!212 &212999464806787966 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1452489250608946} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: bb55cce299f3d9443a58b818b3796875, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.5, y: 5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/On The CALL/Assets/textures/camions/vl.prefab.meta b/On The CALL/Assets/textures/camions/vl.prefab.meta new file mode 100644 index 0000000..98cdad5 --- /dev/null +++ b/On The CALL/Assets/textures/camions/vl.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75d6df1cfd3409e498e8e21fdad688c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/On The CALL/Assets/textures/object/net_cone.prefab b/On The CALL/Assets/textures/object/net_cone.prefab index 04ace5f..7996992 100644 --- a/On The CALL/Assets/textures/object/net_cone.prefab +++ b/On The CALL/Assets/textures/object/net_cone.prefab @@ -102,12 +102,11 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1875301188391840} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 40f91abd7e5890c46a2f7f42073f8a41, type: 3} m_Name: m_EditorClassIdentifier: - ID: 0 --- !u!212 &212285219717063586 SpriteRenderer: m_ObjectHideFlags: 1