generated from VR-Sexe/Unity3DTemplate
merge + hand for screwdriver
This commit is contained in:
Axel Galand
parent
671dabc673
commit
171a64d061
@ -11,6 +11,7 @@ GameObject:
|
||||
- component: {fileID: 5290343921484584014}
|
||||
- component: {fileID: 2991921771696845434}
|
||||
- component: {fileID: 4695026017945986165}
|
||||
- component: {fileID: 4401397110049476693}
|
||||
m_Layer: 0
|
||||
m_Name: Low-Poly Plant_
|
||||
m_TagString: Untagged
|
||||
@ -83,6 +84,19 @@ MeshRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!65 &4401397110049476693
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 999207089627997314}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.46242094, y: 0.4626884, z: 0.39726856}
|
||||
m_Center: {x: -0.0006460771, y: -0.00008407235, z: 0.16253324}
|
||||
--- !u!1 &5022219494863929666
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -92,6 +106,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5690670490328783864}
|
||||
- component: {fileID: 2962965480065639428}
|
||||
m_Layer: 0
|
||||
m_Name: IndoorPlant01
|
||||
m_TagString: Untagged
|
||||
@ -116,6 +131,22 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &2962965480065639428
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5022219494863929666}
|
||||
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!1 &8294151951189356629
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -127,6 +158,7 @@ GameObject:
|
||||
- component: {fileID: 1171425573176347497}
|
||||
- component: {fileID: 13326192116113386}
|
||||
- component: {fileID: 1971294045591473939}
|
||||
- component: {fileID: 9016718629509090105}
|
||||
m_Layer: 0
|
||||
m_Name: Low-Poly Plant_.001
|
||||
m_TagString: Untagged
|
||||
@ -199,3 +231,17 @@ MeshRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!136 &9016718629509090105
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8294151951189356629}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 0.30235288
|
||||
m_Height: 1.0554479
|
||||
m_Direction: 2
|
||||
m_Center: {x: 0.028538108, y: -0.034282655, z: 0.7626465}
|
||||
|
||||
@ -11,6 +11,8 @@ GameObject:
|
||||
- component: {fileID: 5869846997090749818}
|
||||
- component: {fileID: 7411298994668946143}
|
||||
- component: {fileID: 4701421984937096725}
|
||||
- component: {fileID: 2966059419517524822}
|
||||
- component: {fileID: 8484002625320914911}
|
||||
m_Layer: 0
|
||||
m_Name: IndoorPlant02
|
||||
m_TagString: Untagged
|
||||
@ -86,3 +88,32 @@ MeshRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!54 &2966059419517524822
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6502689968648656832}
|
||||
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!65 &8484002625320914911
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6502689968648656832}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1.945082, y: 2.0702388, z: 6.223421}
|
||||
m_Center: {x: -0.04922211, y: -0.01309447, z: 3.1023586}
|
||||
|
||||
@ -98,8 +98,8 @@ BoxCollider:
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.4912855, y: 0.82858396, z: 0.2350294}
|
||||
m_Center: {x: 0.009628491, y: -0.010703472, z: 0.12372286}
|
||||
m_Size: {x: 0.45713696, y: 0.82858396, z: 0.23502941}
|
||||
m_Center: {x: -0.0074458206, y: -0.010703454, z: 0.12372286}
|
||||
--- !u!1 &6637160171134098244
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
2945
Assets/Models/hammer.prefab
Normal file
2945
Assets/Models/hammer.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -103,10 +103,10 @@ CapsuleCollider:
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 0.975318
|
||||
m_Height: 11.624478
|
||||
m_Direction: 2
|
||||
m_Center: {x: 0.016420316, y: -0.49450693, z: 3.5446322}
|
||||
m_Radius: 1.1447892
|
||||
m_Height: 11.7702055
|
||||
m_Direction: 1
|
||||
m_Center: {x: -0.010061374, y: 3.5248175, z: -0.6070304}
|
||||
--- !u!1 &1897611713971714310 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
|
||||
@ -122,10 +122,10 @@ CapsuleCollider:
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 2.4462943
|
||||
m_Height: 18.52887
|
||||
m_Direction: 2
|
||||
m_Center: {x: -2.3329592, y: -8.697551e-15, z: -3.736883}
|
||||
m_Radius: 1.7870617
|
||||
m_Height: 18.439774
|
||||
m_Direction: 1
|
||||
m_Center: {x: 2.387984, y: -3.5306828, z: -0.07516412}
|
||||
--- !u!1 &2096603271310898739 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
|
||||
@ -340,7 +340,7 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -516098083770646512, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
|
||||
m_PrefabInstance: {fileID: 1286279349039090530}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!136 &8228600816443438243
|
||||
--- !u!136 &63192343701829226
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -350,7 +350,7 @@ CapsuleCollider:
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 2.4462943
|
||||
m_Height: 18.52887
|
||||
m_Direction: 2
|
||||
m_Center: {x: 2.5, y: -8.697551e-15, z: -3.736883}
|
||||
m_Radius: 1.7870617
|
||||
m_Height: 18.439774
|
||||
m_Direction: 1
|
||||
m_Center: {x: -2.387984, y: -3.5306828, z: -0.07516412}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -21,7 +21,11 @@ MonoBehaviour:
|
||||
pinkyFingerMovementType: 0
|
||||
ignoreRootPoseData: 1
|
||||
ignoreWristPoseData: 1
|
||||
<<<<<<< Updated upstream
|
||||
position: {x: -0.004079017, y: 0.07426304, z: -0.014719886}
|
||||
=======
|
||||
position: {x: -0.007730892, y: 0.119067214, z: 0.030084359}
|
||||
>>>>>>> Stashed changes
|
||||
rotation: {x: -0.38252518, y: 0.011014178, z: -0.026590543, w: -0.9234967}
|
||||
bonePositions:
|
||||
- {x: -0, y: 0, z: 0}
|
||||
@ -96,7 +100,11 @@ MonoBehaviour:
|
||||
pinkyFingerMovementType: 0
|
||||
ignoreRootPoseData: 1
|
||||
ignoreWristPoseData: 1
|
||||
<<<<<<< Updated upstream
|
||||
position: {x: 0.004079017, y: 0.07426304, z: -0.014719886}
|
||||
=======
|
||||
position: {x: 0.007838003, y: 0.12038135, z: 0.031398486}
|
||||
>>>>>>> Stashed changes
|
||||
rotation: {x: 0.38252518, y: 0.011014178, z: -0.026590543, w: 0.9234967}
|
||||
bonePositions:
|
||||
- {x: -0, y: 0, z: 0}
|
||||
|
||||
@ -2893,11 +2893,78 @@ Transform:
|
||||
m_LocalPosition: {x: -0.03935372, y: -0.07567404, z: 0.047048334}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1909341456}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &61999208
|
||||
=======
|
||||
m_Children:
|
||||
- {fileID: 1378541949}
|
||||
- {fileID: 363747407}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &158967039
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 2.421
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.009
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 3.2877958
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.70710784
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.70710576
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6502689968648656832, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: IndoorPlant02 (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
--- !u!1 &165972124
|
||||
>>>>>>> Stashed changes
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -24453,7 +24520,68 @@ Transform:
|
||||
m_Father: {fileID: 629613198}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
<<<<<<< Updated upstream
|
||||
--- !u!1 &1028843119
|
||||
=======
|
||||
--- !u!1001 &220302986
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5022219494863929666, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: IndoorPlant01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -3.150633
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.009
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 3.178
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.70710784
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.70710576
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5690670490328783864, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9297f267b46c6fac0abd71ad6e9c91b5, type: 3}
|
||||
--- !u!1 &223162554
|
||||
>>>>>>> Stashed changes
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -26164,6 +26292,7 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< Updated upstream
|
||||
m_GameObject: {fileID: 1088702340}
|
||||
m_LocalRotation: {x: 0.7367927, y: -0.6347571, z: -0.14393571, w: -0.18303718}
|
||||
m_LocalPosition: {x: -0.038340144, y: -0.09098663, z: 0.08257892}
|
||||
@ -26270,6 +26399,167 @@ Transform:
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1094837478
|
||||
=======
|
||||
m_Name: pb_Mesh79252
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
firstByte: 0
|
||||
indexCount: 12
|
||||
topology: 0
|
||||
baseVertex: 0
|
||||
firstVertex: 0
|
||||
vertexCount: 8
|
||||
localAABB:
|
||||
m_Center: {x: -7, y: 1.5, z: 0.5}
|
||||
m_Extent: {x: 7, y: 2.5, z: 0.5}
|
||||
m_Shapes:
|
||||
vertices: []
|
||||
shapes: []
|
||||
channels: []
|
||||
fullWeights: []
|
||||
m_BindPose: []
|
||||
m_BoneNameHashes:
|
||||
m_RootBoneNameHash: 0
|
||||
m_BonesAABB: []
|
||||
m_VariableBoneCountWeights:
|
||||
m_Data:
|
||||
m_MeshCompression: 0
|
||||
m_IsReadable: 1
|
||||
m_KeepVertices: 1
|
||||
m_KeepIndices: 1
|
||||
m_IndexFormat: 0
|
||||
m_IndexBuffer: 000001000200010003000200040005000600050007000600
|
||||
m_VertexData:
|
||||
serializedVersion: 3
|
||||
m_VertexCount: 8
|
||||
m_Channels:
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 3
|
||||
- stream: 0
|
||||
offset: 12
|
||||
format: 0
|
||||
dimension: 3
|
||||
- stream: 0
|
||||
offset: 24
|
||||
format: 0
|
||||
dimension: 4
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 40
|
||||
format: 0
|
||||
dimension: 2
|
||||
- stream: 0
|
||||
offset: 48
|
||||
format: 0
|
||||
dimension: 2
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
m_DataSize: 448
|
||||
_typelessdata: 00000000000080bf000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000080bfaed8a33c0bd7a33c000060c1000080bf000000000000000000000000000080bf0000803f0000000000000000000080bf000060c1000080bf1a467b3f0bd7a33c0000000000008040000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000080400bd7a33c6d10ba3e000060c100008040000000000000000000000000000080bf0000803f0000000000000000000080bf000060c1000080400d467b3f6d10ba3e000060c1000080bf0000000000000000000080bf00000000000080bf0000000000000000000080bf00006041000000000bd7a33cdd4dc43e00000000000080bf0000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000016467b3fdd4dc43e000060c1000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000060410000803f91d7a33c0f78e73e00000000000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f1a467b3f0f78e73e
|
||||
m_CompressedMesh:
|
||||
m_Vertices:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_UV:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Normals:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Tangents:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Weights:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_NormalSigns:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_TangentSigns:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_FloatColors:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_BoneIndices:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Triangles:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_UVInfo: 0
|
||||
m_LocalAABB:
|
||||
m_Center: {x: -7, y: 1.5, z: 0.5}
|
||||
m_Extent: {x: 7, y: 2.5, z: 0.5}
|
||||
m_MeshUsageFlags: 0
|
||||
m_BakedConvexCollisionMesh:
|
||||
m_BakedTriangleCollisionMesh:
|
||||
m_MeshMetrics[0]: 1
|
||||
m_MeshMetrics[1]: 1
|
||||
m_MeshOptimizationFlags: 1
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
--- !u!1001 &421181811
|
||||
>>>>>>> Stashed changes
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
@ -26378,9 +26668,17 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 1061905805}
|
||||
m_Father: {fileID: 43971106}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
- {fileID: 1888977164}
|
||||
- {fileID: 260965695}
|
||||
- {fileID: 1288997560}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 12
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1099673543
|
||||
GameObject:
|
||||
@ -26732,10 +27030,23 @@ Transform:
|
||||
m_LocalScale: {x: -1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 507471427}
|
||||
- {fileID: 1959080169}
|
||||
m_Father: {fileID: 49977090}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
- {fileID: 705507995}
|
||||
- {fileID: 1104026040}
|
||||
- {fileID: 165972130}
|
||||
- {fileID: 214563614}
|
||||
- {fileID: 571422167}
|
||||
- {fileID: 62645263}
|
||||
- {fileID: 223162560}
|
||||
- {fileID: 1031756479}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &1110631085
|
||||
Animator:
|
||||
@ -28444,6 +28755,7 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< Updated upstream
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1241345585}
|
||||
@ -28525,6 +28837,167 @@ Transform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1242768243
|
||||
=======
|
||||
m_Name: pb_Mesh79662
|
||||
serializedVersion: 10
|
||||
m_SubMeshes:
|
||||
- serializedVersion: 2
|
||||
firstByte: 0
|
||||
indexCount: 6
|
||||
topology: 0
|
||||
baseVertex: 0
|
||||
firstVertex: 0
|
||||
vertexCount: 4
|
||||
localAABB:
|
||||
m_Center: {x: 6, y: 1, z: 3.5}
|
||||
m_Extent: {x: 7, y: 0, z: 4.5}
|
||||
m_Shapes:
|
||||
vertices: []
|
||||
shapes: []
|
||||
channels: []
|
||||
fullWeights: []
|
||||
m_BindPose: []
|
||||
m_BoneNameHashes:
|
||||
m_RootBoneNameHash: 0
|
||||
m_BonesAABB: []
|
||||
m_VariableBoneCountWeights:
|
||||
m_Data:
|
||||
m_MeshCompression: 0
|
||||
m_IsReadable: 1
|
||||
m_KeepVertices: 1
|
||||
m_KeepIndices: 1
|
||||
m_IndexFormat: 0
|
||||
m_IndexBuffer: 000001000200010003000200
|
||||
m_VertexData:
|
||||
serializedVersion: 3
|
||||
m_VertexCount: 4
|
||||
m_Channels:
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 3
|
||||
- stream: 0
|
||||
offset: 12
|
||||
format: 0
|
||||
dimension: 3
|
||||
- stream: 0
|
||||
offset: 24
|
||||
format: 0
|
||||
dimension: 4
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 40
|
||||
format: 0
|
||||
dimension: 2
|
||||
- stream: 0
|
||||
offset: 48
|
||||
format: 0
|
||||
dimension: 2
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
- stream: 0
|
||||
offset: 0
|
||||
format: 0
|
||||
dimension: 0
|
||||
m_DataSize: 224
|
||||
_typelessdata: 000080bf0000803f00000041000000000000803f000000000000803f0000000000000000000080bf000080bf0000004117467b3f9d5c233f000050410000803f00000041000000000000803f000000000000803f0000000000000000000080bf00005041000000410bd7a33c9d5c233f000080bf0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf000080bf000080bf1a467b3f0bd7a33c000050410000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00005041000080bf7cd7a33c0bd7a33c
|
||||
m_CompressedMesh:
|
||||
m_Vertices:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_UV:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Normals:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Tangents:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Weights:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_NormalSigns:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_TangentSigns:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_FloatColors:
|
||||
m_NumItems: 0
|
||||
m_Range: 0
|
||||
m_Start: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_BoneIndices:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_Triangles:
|
||||
m_NumItems: 0
|
||||
m_Data:
|
||||
m_BitSize: 0
|
||||
m_UVInfo: 0
|
||||
m_LocalAABB:
|
||||
m_Center: {x: 6, y: 1, z: 3.5}
|
||||
m_Extent: {x: 7, y: 0, z: 4.5}
|
||||
m_MeshUsageFlags: 0
|
||||
m_BakedConvexCollisionMesh:
|
||||
m_BakedTriangleCollisionMesh:
|
||||
m_MeshMetrics[0]: 1
|
||||
m_MeshMetrics[1]: 1
|
||||
m_MeshOptimizationFlags: 1
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
--- !u!1 &705507993
|
||||
>>>>>>> Stashed changes
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -31626,9 +32099,18 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 1866466402}
|
||||
m_Father: {fileID: 2027213556}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
- {fileID: 1317084064}
|
||||
- {fileID: 891532972}
|
||||
- {fileID: 2128333932}
|
||||
- {fileID: 197140882}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1390079871
|
||||
GameObject:
|
||||
@ -36006,9 +36488,25 @@ Transform:
|
||||
m_LocalPosition: {x: -0.03935372, y: -0.07567404, z: 0.047048334}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1006130642}
|
||||
m_RootOrder: 3
|
||||
=======
|
||||
m_Children:
|
||||
- {fileID: 1727196004}
|
||||
- {fileID: 831384191}
|
||||
- {fileID: 933062238}
|
||||
- {fileID: 649314558}
|
||||
- {fileID: 366020802}
|
||||
- {fileID: 1800385761}
|
||||
- {fileID: 682384935}
|
||||
- {fileID: 469899576}
|
||||
- {fileID: 514595226}
|
||||
- {fileID: 651997085}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1695254330
|
||||
PrefabInstance:
|
||||
@ -37809,9 +38307,24 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 2060804994}
|
||||
m_Father: {fileID: 1525327007}
|
||||
m_RootOrder: 4
|
||||
=======
|
||||
- {fileID: 13513600}
|
||||
- {fileID: 1796368674}
|
||||
- {fileID: 1962807156}
|
||||
- {fileID: 1941597268}
|
||||
- {fileID: 466555362}
|
||||
- {fileID: 544536298}
|
||||
- {fileID: 1837151161}
|
||||
- {fileID: 671271521}
|
||||
- {fileID: 1557224834}
|
||||
- {fileID: 133861093}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1786406400
|
||||
GameObject:
|
||||
@ -37942,6 +38455,7 @@ Transform:
|
||||
--- !u!137 &1793390308
|
||||
SkinnedMeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@ -38025,6 +38539,65 @@ SkinnedMeshRenderer:
|
||||
m_DirtyAABB: 0
|
||||
--- !u!1 &1795947507
|
||||
GameObject:
|
||||
=======
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Player
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3.2490008
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.6180005
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.66935176
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.7429457
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -264.034
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 114000013786455312, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
|
||||
--- !u!43 &1290856804
|
||||
Mesh:
|
||||
>>>>>>> Stashed changes
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
@ -38563,9 +39136,20 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 1315836121}
|
||||
m_Father: {fileID: 1832494992}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
- {fileID: 1989420948}
|
||||
- {fileID: 296012511}
|
||||
- {fileID: 1846013734}
|
||||
- {fileID: 1889890278}
|
||||
- {fileID: 1620530528}
|
||||
- {fileID: 788326936}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 9
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1819826322
|
||||
GameObject:
|
||||
@ -38707,6 +39291,7 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
<<<<<<< Updated upstream
|
||||
m_GameObject: {fileID: 1831002816}
|
||||
m_LocalRotation: {x: 0.6235274, y: -0.66380864, z: -0.29373443, w: -0.29033053}
|
||||
m_LocalPosition: {x: -0.04041555, y: -0.043017667, z: 0.019344581}
|
||||
@ -38718,6 +39303,67 @@ Transform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1831314487
|
||||
GameObject:
|
||||
=======
|
||||
--- !u!1001 &1627882858
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 5.0298414
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.009
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 3.2877958
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.70710784
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.70710576
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5869846997090749818, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6502689968648656832, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: IndoorPlant02
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9cd2b55d7736d196bb33fe0246532f34, type: 3}
|
||||
--- !u!1001 &1670087242
|
||||
PrefabInstance:
|
||||
>>>>>>> Stashed changes
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
@ -38776,9 +39422,25 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
<<<<<<< Updated upstream
|
||||
- {fileID: 1587168354}
|
||||
m_Father: {fileID: 2133015773}
|
||||
m_RootOrder: 0
|
||||
=======
|
||||
- {fileID: 1892014276}
|
||||
- {fileID: 817029044}
|
||||
- {fileID: 1808715995}
|
||||
- {fileID: 1804142041}
|
||||
- {fileID: 248339544}
|
||||
- {fileID: 2044401915}
|
||||
- {fileID: 1370273504}
|
||||
- {fileID: 374513605}
|
||||
- {fileID: 1914260021}
|
||||
- {fileID: 1403294835}
|
||||
- {fileID: 527112788}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 11
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1832494991
|
||||
GameObject:
|
||||
@ -38871,9 +39533,29 @@ Transform:
|
||||
m_LocalPosition: {x: -0.04041555, y: -0.043017667, z: 0.019344581}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
<<<<<<< Updated upstream
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1032390162}
|
||||
m_RootOrder: 2
|
||||
=======
|
||||
m_Children:
|
||||
- {fileID: 1163077229}
|
||||
- {fileID: 1569489522}
|
||||
- {fileID: 758260947}
|
||||
- {fileID: 1181210857}
|
||||
- {fileID: 1598743398}
|
||||
- {fileID: 644532390}
|
||||
- {fileID: 129052249}
|
||||
- {fileID: 1962727918}
|
||||
- {fileID: 1842731890}
|
||||
- {fileID: 1423881352}
|
||||
- {fileID: 2059485182}
|
||||
- {fileID: 2047637402}
|
||||
- {fileID: 1695254331}
|
||||
- {fileID: 1180503448}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
>>>>>>> Stashed changes
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1837151160
|
||||
GameObject:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user