nibo7451/NNMDETGroupProject
1
0
Fork 1
mirror of https://github.com/nick7ass/NNMDETGroupProject.git synced 2025-04-14 01:40:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small adjustments

Browse Source
This commit is contained in:
Nicklas 2024-03-14 11:59:33 +01:00
parent 31e0101562
commit 5c75ae875e
8 changed files with 164 additions and 126 deletions
.DS_Store
Assets
.DS_Store
1OurESP32Scripts
.DS_Store
TouchServo
TouchServo.ino
1OurScripts
BoundFireScript.cs
OurESP32Scripts
.DS_Store
TouchServo
TouchServo.ino
Scenes
MainScene.unity

BIN
.DS_Store vendored

Binary file not shown.

BIN
Assets/.DS_Store vendored

Binary file not shown.

BIN
Assets/1OurESP32Scripts/.DS_Store vendored

Binary file not shown.

28
Assets/1OurESP32Scripts/TouchServo/TouchServo.ino

@ -53,10 +53,12 @@ void loop() {
if (msg.data().equalsIgnoreCase("Need Touch")) {
Serial.println("Reading value from touch sensor!");
//touchValue = touchRead(4);
//Serial.println(touchRead(4));
while (touchRead(4) < 40000) {
if (touchRead(4) >= 40000) {
while (touchRead(4) < 30000) {
Serial.println(touchRead(4));
delay(400);
if (touchRead(4) >= 30000) {
Serial.println("Value above threshold");
rotateServo();
@ -67,7 +69,7 @@ void loop() {
}
}
}
delay(500);
//delay(500);
}
client.close();
}
@ -77,14 +79,14 @@ void loop() {
void rotateServo() {
// Rotate the servo motor 180 degrees
for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
servo1.write(posDegrees);
delay(10); // Adjust the delay for smooth rotation
}
for(int posDegrees = 180; posDegrees >= 0; posDegrees--) {
servo1.write(posDegrees);
delay(10);
}
for (int posDegrees = 0; posDegrees <= 180; posDegrees++) {
servo1.write(posDegrees);
delay(5); // Adjust the delay for smooth rotation
}
for (int posDegrees = 180; posDegrees >= 0; posDegrees--) {
servo1.write(posDegrees);
delay(10);
}
}

3
Assets/1OurScripts/BoundFireScript.cs

@ -12,6 +12,7 @@ public class BoundFireScript : MonoBehaviour
public AudioClip narrationClip;
public AudioClip narrationClipTwo;
public GameObject fireObjectToThrow;
public GameObject fireObjectToCollect;
private bool objectHasBeenCollected = false;
@ -42,7 +43,7 @@ public class BoundFireScript : MonoBehaviour
audioSource.PlayOneShot(narrationClip);
yield return new WaitForSeconds(narrationClip.length);
fireObjectToThrow.SetActive(true);
narrationHasFinished = true;
}

BIN
Assets/OurESP32Scripts/.DS_Store vendored

Binary file not shown.

7
Assets/OurESP32Scripts/TouchServo/TouchServo.ino

@ -55,13 +55,14 @@ void loop() {
//touchValue = touchRead(4);
//Serial.println(touchRead(4));
while (touchRead(4) < 40000) {
if (touchRead(4) >= 40000) {
while (touchRead(4) < 30000) {
if (touchRead(4) >= 30000) {
Serial.println("Value above threshold");
Serial.println(touchRead(4));
rotateServo();
client.send(String(40000));
client.send(String(30000));
break;
}

252
Assets/Scenes/MainScene.unity

@ -279,8 +279,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1988268903}
- {fileID: 666773947}
- {fileID: 500083349}
- {fileID: 1396305046}
- {fileID: 887901107}
- {fileID: 642366919}
- {fileID: 1633025412}
@ -2176,9 +2176,13 @@ PrefabInstance:
propertyPath: m_Name
value: earthVase
objectReference: {fileID: 0}
- target: {fileID: 100006, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.x
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.y
@ -2186,7 +2190,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.z
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalPosition.x
@ -2194,7 +2198,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalPosition.y
value: -2.3
value: -2.339
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalPosition.z
@ -2232,6 +2236,30 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400002, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 400002, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 400006, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 400008, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 400008, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
propertyPath: m_LocalScale.z
value: 1.3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 100010, guid: f74defbe1b9a23449aef9a881263fe0c, type: 3}
@ -4599,7 +4627,7 @@ Transform:
m_GameObject: {fileID: 297646202}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.388697, y: -2.32, z: -2.4067612}
m_LocalPosition: {x: 6.388697, y: -2.32, z: -2.614}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children:
@ -5584,15 +5612,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: 5.1718516
value: 0.41
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 2.2501156
value: 1.79
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: 24.447979
value: 20.56
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
@ -7400,6 +7428,11 @@ PrefabInstance:
propertyPath: m_Name
value: FirewoodToThrow
objectReference: {fileID: 0}
- target: {fileID: 7809210389736380859, guid: 3a9b7854188d4405280e2aee6b228fc7,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@ -7688,15 +7721,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: -12.81
value: -10.17
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.83
value: 0.84
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: -8.66
value: -7.41
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
@ -8913,15 +8946,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.x
value: 21.371807
value: 10.6
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5724797
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.z
value: 19.904654
value: 11.65
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalRotation.w
@ -9268,15 +9301,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.x
value: -9.27
value: -8.89
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.y
value: 0.46
value: 0.47
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.z
value: 7.73
value: 9.11
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalRotation.w
@ -10397,6 +10430,7 @@ MonoBehaviour:
audioSource: {fileID: 171465764}
narrationClip: {fileID: 8300000, guid: bc06e403323bf5a4ca12eef6b12390dd, type: 3}
narrationClipTwo: {fileID: 8300000, guid: deff384217dfb4266aa229b913f8fd03, type: 3}
fireObjectToThrow: {fileID: 494961671}
fireObjectToCollect: {fileID: 282901708}
boundControl: {fileID: 979159588}
--- !u!1001 &636743900
@ -10615,6 +10649,73 @@ Transform:
- {fileID: 556884796}
m_Father: {fileID: 1617586590}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &666773946
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 22262623}
m_Modifications:
- target: {fileID: 1195488190180710, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_Name
value: Rubble_01_Large (10)
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.x
value: 1.0000002
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.y
value: 1.000001
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.z
value: 1.0000008
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: 1.03
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.65
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: -11.16
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
value: 0.0022259203
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.07129584
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.y
value: -0.000015306285
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.z
value: 0.9974528
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
--- !u!4 &666773947 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c,
type: 3}
m_PrefabInstance: {fileID: 666773946}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &693393391
PrefabInstance:
m_ObjectHideFlags: 0
@ -12635,15 +12736,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.x
value: -14.06
value: -13.32
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5725369
value: 0.53
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.z
value: 11.29
value: 2.02
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalRotation.w
@ -13720,15 +13821,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: 36.66219
value: 12.58
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5922314
value: 0.71
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: 12.820381
value: 6.68
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
@ -17390,15 +17491,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: -30.136988
value: 1.82
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5922317
value: 0.74
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: 23.48971
value: 18.26
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
@ -17455,7 +17556,7 @@ Transform:
m_GameObject: {fileID: 1166565588}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.19, y: 0.65, z: 0.45}
m_LocalPosition: {x: -1.01, y: 0.65, z: 0.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -17500,8 +17601,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.9521153, y: 2.6310592, z: 0.74838775}
m_Center: {x: -0.39272606, y: 0.8155296, z: -0.12580612}
m_Size: {x: 0.9521153, y: 2.6310592, z: 4.5547028}
m_Center: {x: -0.39272606, y: 0.8155296, z: -0.21766186}
--- !u!54 &1166565592
Rigidbody:
m_ObjectHideFlags: 0
@ -17610,15 +17711,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.x
value: -10.15
value: -10.17
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.y
value: 0.49
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.z
value: 2.89
value: 4.17
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalRotation.w
@ -23470,7 +23571,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.x
value: -11.27
value: -10.67
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.y
@ -23478,7 +23579,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalPosition.z
value: -2.53
value: -2.57
objectReference: {fileID: 0}
- target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3}
propertyPath: m_LocalRotation.w
@ -24025,73 +24126,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1382736793}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1396305045
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 22262623}
m_Modifications:
- target: {fileID: 1195488190180710, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_Name
value: Rubble_01_Large (2)
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.x
value: 1.0000002
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.y
value: 1.000001
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalScale.z
value: 1.0000008
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: 13.98
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 1.0184942
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6815663
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.18561731
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6635266
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.z
value: 0.24646722
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
--- !u!4 &1396305046 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c,
type: 3}
m_PrefabInstance: {fileID: 1396305045}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1404469707
PrefabInstance:
m_ObjectHideFlags: 0
@ -32444,7 +32478,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.34, y: -0.63, z: -0.3}
m_LocalScale: {x: 0.1, y: 1, z: 0.1}
m_LocalScale: {x: 0.1, y: 1, z: 0.4}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1166565589}
@ -41979,7 +42013,7 @@ Transform:
m_GameObject: {fileID: 1909354518}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.6, y: 3.5883074, z: 5.04}
m_LocalPosition: {x: -5.6, y: 3.5883074, z: 4.89}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -42538,15 +42572,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.x
value: 18.312654
value: 11.12
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.y
value: 0.57237405
value: 0.55
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalPosition.z
value: 3.523658
value: 1.01
objectReference: {fileID: 0}
- target: {fileID: 4820514527977402, guid: bc3316724907acc499f7aa324f7a5d68, type: 3}
propertyPath: m_LocalRotation.w
@ -42727,15 +42761,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.x
value: 12.019136
value: 12.55
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5922296
value: 0.59
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalPosition.z
value: -0.24040343
value: -3.93
objectReference: {fileID: 0}
- target: {fileID: 4971715806377316, guid: 8b89c66bcbc4662448c7c75248947c5c, type: 3}
propertyPath: m_LocalRotation.w