From 2297da97edf38fc7a9a95bfef822633cf3d7a836 Mon Sep 17 00:00:00 2001 From: Sunil Patel Date: Wed, 24 Nov 2021 14:23:15 +0530 Subject: [PATCH] Network things runnint prfectly, Build success --- .../Code/Editor/AC_Airplane_Menus.cs | 18 +++ .../Code/Editor/AC_Airplane_Menus.cs.meta | 11 ++ .../Code/Scripts/Controller.meta | 8 + .../Controller/AC_Airplane_Controller.cs | 21 +++ .../Controller/AC_Airplane_Controller.cs.meta | 11 ++ .../Controller/AC_BaseRigidbody_Controller.cs | 44 ++++++ .../AC_BaseRigidbody_Controller.cs.meta | 11 ++ .../Input/AC_BaseAirplane_Input.cs.meta | 2 +- .../Input/AC_XboxAirplane_Input.cs.meta | 2 +- .../AC_BaseAirplane_Input_Editor.cs.meta | 2 +- .../AC_XboxAirplane_Input_Editor.cs.meta | 2 +- .../Scripts/Networking/Client/SimpleClient.py | 23 ++- .../Networking/Server/InputOutputHandel.cs | 27 ++-- .../Server/InputOutputHandel.cs.meta | 2 +- .../Networking/Server/TCPTestServer.cs | 22 +-- .../Networking/Server/TCPTestServer.cs.meta | 2 +- .../Prefabs/Airplanes/IndiePixel_Plane.prefab | 17 -- .../Scenes/AirplanePhysics_Dev.unity | 149 ++++++++++++++++-- ProjectSettings/EditorBuildSettings.asset | 6 +- 19 files changed, 308 insertions(+), 72 deletions(-) create mode 100644 Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs create mode 100644 Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs.meta create mode 100644 Assets/AirplanePhysics/Code/Scripts/Controller.meta create mode 100644 Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs create mode 100644 Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs.meta create mode 100644 Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs create mode 100644 Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs.meta diff --git a/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs b/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs new file mode 100644 index 0000000..8f9d30e --- /dev/null +++ b/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AC_Airplane_Menus : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs.meta b/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs.meta new file mode 100644 index 0000000..302ba6e --- /dev/null +++ b/Assets/AirplanePhysics/Code/Editor/AC_Airplane_Menus.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 690721c546b711218ab8f468cd6af315 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Controller.meta b/Assets/AirplanePhysics/Code/Scripts/Controller.meta new file mode 100644 index 0000000..9acb654 --- /dev/null +++ b/Assets/AirplanePhysics/Code/Scripts/Controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9852ab806d42cc2dfba976fb35815cbc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs new file mode 100644 index 0000000..4154fd5 --- /dev/null +++ b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace AirControl +{ + public class AC_Airplane_Controller : AC_BaseRigidbody_Controller + { + #region variables + public AC_BaseAirplane_Input input; + #endregion + + #region Custom Methods + protected override void HandlePhysics() + { + + } + #endregion + } + +} diff --git a/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs.meta new file mode 100644 index 0000000..481586b --- /dev/null +++ b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_Airplane_Controller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b085ec49eb11e0c291ed42c9e2e6230 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs new file mode 100644 index 0000000..0bf5390 --- /dev/null +++ b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace AirControl +{ + [RequireComponent(typeof(Rigidbody))] + [RequireComponent(typeof(AudioSource))] + public class AC_BaseRigidbody_Controller : MonoBehaviour + { + #region Variable + private Rigidbody rb; + private AudioSource aSource; + #endregion + + #region Builtin Methods + // Start is called before the first frame update + void Start() + { + rb = GetComponent(); + aSource = GetComponent(); + // Dont allow audio to play on start + if(aSource){ + aSource.playOnAwake = false; + } + } + + // Update is called once per frame + void FixedUpdate() + { + if(rb){ + HandlePhysics(); + } + } + #endregion + + #region Custom Methods + protected virtual void HandlePhysics(){ + + } + #endregion + } + +} diff --git a/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs.meta new file mode 100644 index 0000000..881a745 --- /dev/null +++ b/Assets/AirplanePhysics/Code/Scripts/Controller/AC_BaseRigidbody_Controller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ef2f5b0380a4724ca17599b51ee6772 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Input/AC_BaseAirplane_Input.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Input/AC_BaseAirplane_Input.cs.meta index 71a3221..f637db5 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Input/AC_BaseAirplane_Input.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Input/AC_BaseAirplane_Input.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Input/AC_XboxAirplane_Input.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Input/AC_XboxAirplane_Input.cs.meta index fe29f5b..997cdc2 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Input/AC_XboxAirplane_Input.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Input/AC_XboxAirplane_Input.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_BaseAirplane_Input_Editor.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_BaseAirplane_Input_Editor.cs.meta index af6b206..689ab59 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_BaseAirplane_Input_Editor.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_BaseAirplane_Input_Editor.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_XboxAirplane_Input_Editor.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_XboxAirplane_Input_Editor.cs.meta index dcc946b..5e3fb6d 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_XboxAirplane_Input_Editor.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Input/Editor/AC_XboxAirplane_Input_Editor.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 2800000, guid: 67e26d388bdb00784afca804d201eab9, type: 3} + icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Networking/Client/SimpleClient.py b/Assets/AirplanePhysics/Code/Scripts/Networking/Client/SimpleClient.py index 0ec328f..b54195e 100755 --- a/Assets/AirplanePhysics/Code/Scripts/Networking/Client/SimpleClient.py +++ b/Assets/AirplanePhysics/Code/Scripts/Networking/Client/SimpleClient.py @@ -3,19 +3,16 @@ host, port = "127.0.0.1" , 8052 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((host,port)) -# for i in range(0,10): -# data = "0.22,{},{}".format(i*2,i*5) -# try: +for i in range(0,10): + data = '{"pitch":1.245,"roll":0.0,"yaw":5555,"throttle":0.0,"brake":0.0,"flaps":0}' + try: -# sock.sendall(data.encode("utf-8")) -# data = sock.recv(1024).decode("utf-8") -# print(data) + sock.sendall(data.encode("utf-8")) + data = sock.recv(1024).decode("utf-8") + print(data) -# except Exception as e: -# print(">>>>>>>>>>>>",e) -# time.sleep(5) -# sock.close() + except Exception as e: + print(">>>>>>>>>>>>",e) + time.sleep(5) +sock.close() -while(True): - data = sock.recv(1024).decode("utf-8") - print(data) \ No newline at end of file diff --git a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs index 6a348a3..c337c12 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs +++ b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs @@ -8,11 +8,10 @@ namespace AirControl public class InputOutputHandel { #region Variables - public AC_BaseAirplane_Input currentReadings; // public TCPTestServer networkUtils; // Output Struct // struct to send msg out of unity - struct outputStructure + public struct outputStructure { public float pitch; public float roll; @@ -24,10 +23,16 @@ struct outputStructure outputStructure outStruct; // Input Struct // struct to receive msg to unity - struct inputStructure + public struct inputStructure { - - } + public float pitch; + public float roll; + public float yaw; + public float throttle; + public float brake; + public int flaps; + }; + inputStructure inStruct; #endregion @@ -41,17 +46,21 @@ struct inputStructure #region Custom Methods // receive msg to unity - void InputHandel() + public void ParseInput(string receivedString) { - + //parse input + inputStructure inStructDeserialized = JsonConvert.DeserializeObject(receivedString); + Debug.Log("received string : " + receivedString); + // call a fucntion to set this input to the rigid body + //pending } + // send msg out of unity - public string Outputhandel() + public string ParseOutput(AC_BaseAirplane_Input currentReadings) { // Debug.Log("listening to controls : "+currentReadings.Pitch); // Put data to structure - Debug.Log("listening to controls : "+currentReadings.Pitch); outStruct.pitch = currentReadings.Pitch; outStruct.roll = currentReadings.Roll; outStruct.yaw = currentReadings.Yaw; diff --git a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs.meta index abe0b3e..f28c099 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/InputOutputHandel.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs index 942547e..45e5325 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs +++ b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs @@ -26,6 +26,8 @@ public class TCPTestServer : MonoBehaviour /// Create handle to connected tcp client. /// private TcpClient connectedTcpClient; + // provide base input to access variables + public AC_BaseAirplane_Input currentReadings; private InputOutputHandel InOutManager = new InputOutputHandel(); #endregion @@ -38,16 +40,6 @@ void Start () { tcpListenerThread.IsBackground = true; tcpListenerThread.Start(); } - #region Depricated - // Update is called once per frame - void Update () { - // if (Input.GetKeyDown(KeyCode.Space)) { - - string outputmsg = InOutManager.Outputhandel(); - SendMessage(outputmsg); - // } - } - #endregion #endregion #region Custom Methods @@ -72,10 +64,11 @@ public void ListenForIncommingRequests () { var incommingData = new byte[length]; Array.Copy(bytes, 0, incommingData, 0, length); // Convert byte array to string message. - string clientMessage = Encoding.ASCII.GetString(incommingData); - Debug.Log("client message received as: " + clientMessage); - // send message in return - // SendMessage(String); + string clientMessage = Encoding.ASCII.GetString(incommingData); + InOutManager.ParseInput(clientMessage); + // once received the message, send message in return + string outputmsg = InOutManager.ParseOutput(currentReadings); + SendMessage(outputmsg); } } } @@ -93,7 +86,6 @@ public void ListenForIncommingRequests () { if (connectedTcpClient == null) { return; } - try { // Get a stream object for writing. NetworkStream stream = connectedTcpClient.GetStream(); diff --git a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs.meta b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs.meta index 8997d20..0661022 100644 --- a/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs.meta +++ b/Assets/AirplanePhysics/Code/Scripts/Networking/Server/TCPTestServer.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/AirplanePhysics/Prefabs/Airplanes/IndiePixel_Plane.prefab b/Assets/AirplanePhysics/Prefabs/Airplanes/IndiePixel_Plane.prefab index 3794d11..8cede9a 100644 --- a/Assets/AirplanePhysics/Prefabs/Airplanes/IndiePixel_Plane.prefab +++ b/Assets/AirplanePhysics/Prefabs/Airplanes/IndiePixel_Plane.prefab @@ -2373,7 +2373,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 544299066754510615} - - component: {fileID: 6357270310726759898} m_Layer: 0 m_Name: IndiePixel_Plane m_TagString: Untagged @@ -2397,22 +2396,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6357270310726759898 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6357270310726759901} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1001 &4428820741641706452 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/AirplanePhysics/Scenes/AirplanePhysics_Dev.unity b/Assets/AirplanePhysics/Scenes/AirplanePhysics_Dev.unity index 4a3e4e7..164c13f 100644 --- a/Assets/AirplanePhysics/Scenes/AirplanePhysics_Dev.unity +++ b/Assets/AirplanePhysics/Scenes/AirplanePhysics_Dev.unity @@ -295,6 +295,7 @@ GameObject: m_Component: - component: {fileID: 687950351} - component: {fileID: 687950352} + - component: {fileID: 687950353} m_Layer: 0 m_Name: Network_GRP m_TagString: Untagged @@ -328,6 +329,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1719fd3f883993ad9bdb0e7119328ccb, type: 3} m_Name: m_EditorClassIdentifier: + currentReadings: {fileID: 687950353} +--- !u!114 &687950353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687950350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be405153293f5ea12b8f2d0e557e9170, type: 3} + m_Name: + m_EditorClassIdentifier: + maxFlapIncrements: 2 --- !u!1 &729659674 GameObject: m_ObjectHideFlags: 0 @@ -638,7 +653,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 755010503212096059} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4aceb154824b2f88596fc8cfcb350fac, type: 3} m_Name: @@ -657,6 +672,130 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxFlapIncrements: 2 +--- !u!114 &755010503212096062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755010503212096059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ef2f5b0380a4724ca17599b51ee6772, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!82 &755010503212096063 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755010503212096059} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!54 &755010503212096064 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755010503212096059} + serializedVersion: 2 + m_Mass: 800 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &5927820846799532006 PrefabInstance: m_ObjectHideFlags: 0 @@ -780,14 +919,6 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 6357270310726759898, guid: be7e18da56ed7db508088899b2b9e2b8, type: 3} - propertyPath: m_Drag - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6357270310726759898, guid: be7e18da56ed7db508088899b2b9e2b8, type: 3} - propertyPath: m_Mass - value: 8000 - objectReference: {fileID: 0} - target: {fileID: 6357270310726759901, guid: be7e18da56ed7db508088899b2b9e2b8, type: 3} propertyPath: m_Name value: IndiePixel_Plane diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 2a4cbc5..9bd6d10 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: d1c3109bdb54ad54c8a2b2838528e640 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 m_configObjects: {}