fix: minor merge fixes
This commit is contained in:
parent
5d28e1ffb5
commit
9849c2352f
3 changed files with 117 additions and 134 deletions
|
|
@ -17489,12 +17489,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 8.175112, y: 18.691149, z: 2.014586}
|
||||
- {x: 7.4201384, y: 18.816559, z: 3.3359876}
|
||||
- {x: 6.6239944, y: 18.837559, z: 4.638878}
|
||||
- {x: 5.7910953, y: 18.754036, z: 5.9160295}
|
||||
- {x: 4.926064, y: 18.566456, z: 7.160355}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 8.175111, y: 18.691149, z: 2.0145864}
|
||||
- {x: 7.4201374, y: 18.816559, z: 3.3359883}
|
||||
- {x: 6.623993, y: 18.837559, z: 4.6388793}
|
||||
- {x: 5.7910933, y: 18.754036, z: 5.916032}
|
||||
- {x: 4.9260616, y: 18.566456, z: 7.1603575}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -19667,11 +19667,11 @@ LineRenderer:
|
|||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 14.520694, y: 14.461042, z: 0.5270029}
|
||||
- {x: 13.507401, y: 15.41047, z: 0.5634762}
|
||||
- {x: 12.432094, y: 16.289145, z: 0.5973624}
|
||||
- {x: 11.299705, y: 17.09303, z: 0.628506}
|
||||
- {x: 10.115435, y: 17.818438, z: 0.65676385}
|
||||
- {x: 8.884723, y: 18.462034, z: 0.6820063}
|
||||
- {x: 13.507401, y: 15.41047, z: 0.56347626}
|
||||
- {x: 12.432094, y: 16.289145, z: 0.59736246}
|
||||
- {x: 11.299705, y: 17.09303, z: 0.6285061}
|
||||
- {x: 10.115435, y: 17.818438, z: 0.65676403}
|
||||
- {x: 8.884723, y: 18.462034, z: 0.6820065}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -22578,12 +22578,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 14.513824, y: 14.172317, z: 2.9570763}
|
||||
- {x: 13.260205, y: 15.446397, z: 2.4136653}
|
||||
- {x: 11.896462, y: 16.592197, z: 1.8502092}
|
||||
- {x: 10.433919, y: 17.600199, z: 1.2713876}
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200666}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 14.513823, y: 14.172317, z: 2.9570763}
|
||||
- {x: 13.260203, y: 15.446398, z: 2.4136653}
|
||||
- {x: 11.89646, y: 16.592197, z: 1.8502089}
|
||||
- {x: 10.433918, y: 17.600199, z: 1.2713866}
|
||||
- {x: 8.884721, y: 18.462032, z: 0.68200576}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -23548,8 +23548,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 343335076}
|
||||
- component: {fileID: 343335080}
|
||||
- component: {fileID: 343335079}
|
||||
- component: {fileID: 343335078}
|
||||
- component: {fileID: 343335077}
|
||||
m_Layer: 0
|
||||
m_Name: Pixel
|
||||
|
|
@ -23617,22 +23615,6 @@ MonoBehaviour:
|
|||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!81 &343335078
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 343335075}
|
||||
m_Enabled: 1
|
||||
--- !u!124 &343335079
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 343335075}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &343335080
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -37075,12 +37057,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 8.914363, y: 18.38562, z: 1.6592621}
|
||||
- {x: 8.923602, y: 18.267134, z: 2.6327207}
|
||||
- {x: 8.912417, y: 18.106842, z: 3.600154}
|
||||
- {x: 8.880838, y: 17.905113, z: 4.5593486}
|
||||
- {x: 8.828936, y: 17.662407, z: 5.5081096}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 8.914363, y: 18.38562, z: 1.6592633}
|
||||
- {x: 8.923601, y: 18.267134, z: 2.6327226}
|
||||
- {x: 8.912417, y: 18.106838, z: 3.6001573}
|
||||
- {x: 8.880839, y: 17.905111, z: 4.559353}
|
||||
- {x: 8.828936, y: 17.662405, z: 5.5081143}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -40956,11 +40938,11 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 15.458863, y: 13.149572, z: 2.891763}
|
||||
- {x: 15.251955, y: 13.502558, z: 2.3040683}
|
||||
- {x: 15.026436, y: 13.83907, z: 1.7135621}
|
||||
- {x: 14.782583, y: 14.158695, z: 1.1209651}
|
||||
- {x: 15.026436, y: 13.83907, z: 1.7135624}
|
||||
- {x: 14.782583, y: 14.158695, z: 1.1209652}
|
||||
- {x: 14.520693, y: 14.461044, z: 0.52700037}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
|
|
@ -41260,11 +41242,11 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 8.57078, y: 18.401255, z: 2.861055}
|
||||
- {x: 8.157913, y: 18.128092, z: 5.0070815}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 8.570779, y: 18.401255, z: 2.8610551}
|
||||
- {x: 8.157912, y: 18.128092, z: 5.0070815}
|
||||
- {x: 7.650886, y: 17.645693, z: 7.0953164}
|
||||
- {x: 7.055555, y: 16.95963, z: 9.101658}
|
||||
- {x: 7.055555, y: 16.95963, z: 9.101657}
|
||||
- {x: 6.378788, y: 16.07782, z: 11.002948}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
|
|
@ -46632,9 +46614,9 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.148402, y: 12.9489355, z: 4.8063464}
|
||||
- {x: 14.576113, y: 13.054264, z: 6.113354}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 15.148402, y: 12.9489355, z: 4.806347}
|
||||
- {x: 14.576113, y: 13.054264, z: 6.113355}
|
||||
- {x: 13.932828, y: 13.09601, z: 7.390587}
|
||||
- {x: 13.2216835, y: 13.073971, z: 8.631823}
|
||||
- {x: 12.44614, y: 12.988254, z: 9.831015}
|
||||
|
|
@ -49720,9 +49702,9 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 16.316082, y: 11.796306, z: 3.8577983}
|
||||
- {x: 16.9246, y: 10.768219, z: 4.225326}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 16.316082, y: 11.796306, z: 3.8577988}
|
||||
- {x: 16.9246, y: 10.768219, z: 4.2253265}
|
||||
- {x: 17.470198, y: 9.7001, z: 4.577146}
|
||||
- {x: 17.950848, y: 8.59592, z: 4.9119496}
|
||||
- {x: 18.364763, y: 7.4597826, z: 5.2284923}
|
||||
|
|
@ -50217,12 +50199,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.122936, y: 13.546136, z: 2.8370776}
|
||||
- {x: 14.553306, y: 14.270832, z: 2.1896603}
|
||||
- {x: 13.939736, y: 14.952446, z: 1.5356323}
|
||||
- {x: 13.2840805, y: 15.588914, z: 0.876968}
|
||||
- {x: 12.588318, y: 16.178314, z: 0.21565536}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 15.122936, y: 13.546136, z: 2.8370779}
|
||||
- {x: 14.553306, y: 14.270832, z: 2.1896605}
|
||||
- {x: 13.939736, y: 14.952444, z: 1.5356325}
|
||||
- {x: 13.2840805, y: 15.588914, z: 0.8769683}
|
||||
- {x: 12.588318, y: 16.178314, z: 0.21565567}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -55585,12 +55567,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 16.083271, y: 12.31908, z: 3.1334755}
|
||||
- {x: 16.499708, y: 11.8423605, z: 2.78714}
|
||||
- {x: 16.895704, y: 11.35097, z: 2.4373517}
|
||||
- {x: 17.270767, y: 10.845517, z: 2.0845437}
|
||||
- {x: 17.624437, y: 10.326629, z: 1.7291533}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 16.083271, y: 12.31908, z: 3.1334758}
|
||||
- {x: 16.499708, y: 11.842361, z: 2.7871406}
|
||||
- {x: 16.895704, y: 11.35097, z: 2.437352}
|
||||
- {x: 17.270767, y: 10.845517, z: 2.0845442}
|
||||
- {x: 17.624437, y: 10.326629, z: 1.7291535}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -58035,11 +58017,11 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 15.760122, y: 12.409893, z: 4.226476}
|
||||
- {x: 15.846579, y: 12.018178, z: 4.969847}
|
||||
- {x: 15.846579, y: 12.018178, z: 4.9698477}
|
||||
- {x: 15.906129, y: 11.606057, z: 5.7047806}
|
||||
- {x: 15.938674, y: 11.174231, z: 6.430028}
|
||||
- {x: 15.938674, y: 11.17423, z: 6.430028}
|
||||
- {x: 15.944158, y: 10.723432, z: 7.144359}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
|
|
@ -61325,12 +61307,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 7.4485693, y: 19.097145, z: -0.26066768}
|
||||
- {x: 5.952959, y: 19.579819, z: -1.2012609}
|
||||
- {x: 4.4098306, y: 19.9062, z: -2.132265}
|
||||
- {x: 2.8315034, y: 20.073689, z: -3.0462496}
|
||||
- {x: 1.2305717, y: 20.080942, z: -3.9359176}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 7.448569, y: 19.097145, z: -0.26066747}
|
||||
- {x: 5.952959, y: 19.579819, z: -1.2012607}
|
||||
- {x: 4.4098306, y: 19.906199, z: -2.132265}
|
||||
- {x: 2.8315034, y: 20.073689, z: -3.046249}
|
||||
- {x: 1.2305723, y: 20.080942, z: -3.935917}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -78472,11 +78454,11 @@ LineRenderer:
|
|||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 11.036027, y: 16.993761, z: 3.1093743}
|
||||
- {x: 10.630454, y: 17.33007, z: 2.6290886}
|
||||
- {x: 10.212025, y: 17.64542, z: 2.145624}
|
||||
- {x: 9.781245, y: 17.93943, z: 1.6595639}
|
||||
- {x: 9.338635, y: 18.211742, z: 1.171497}
|
||||
- {x: 8.884731, y: 18.462029, z: 0.6820126}
|
||||
- {x: 10.630453, y: 17.33007, z: 2.6290877}
|
||||
- {x: 10.212023, y: 17.645422, z: 2.1456223}
|
||||
- {x: 9.781242, y: 17.93943, z: 1.6595614}
|
||||
- {x: 9.338631, y: 18.211744, z: 1.1714934}
|
||||
- {x: 8.884725, y: 18.462032, z: 0.6820085}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -79386,12 +79368,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 9.387679, y: 18.120638, z: 1.9401073}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 9.387679, y: 18.120638, z: 1.9401076}
|
||||
- {x: 9.847024, y: 17.695063, z: 3.1891959}
|
||||
- {x: 10.260622, y: 17.18728, z: 4.423468}
|
||||
- {x: 10.626554, y: 16.599655, z: 5.6371903}
|
||||
- {x: 10.943116, y: 15.934912, z: 6.8247247}
|
||||
- {x: 10.626554, y: 16.599655, z: 5.63719}
|
||||
- {x: 10.943117, y: 15.934912, z: 6.824724}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -80871,12 +80853,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 16.079329, y: 11.688531, z: 5.008337}
|
||||
- {x: 16.36912, y: 10.492845, z: 6.49632}
|
||||
- {x: 16.513712, y: 9.204083, z: 7.926677}
|
||||
- {x: 16.511822, y: 7.8336773, z: 9.286724}
|
||||
- {x: 16.363466, y: 6.3937864, z: 10.564394}
|
||||
- {x: 16.363468, y: 6.3937855, z: 10.564394}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -95879,11 +95861,11 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 8.365843, y: 18.676586, z: 1.2032968}
|
||||
- {x: 7.835276, y: 18.86505, z: 1.7229065}
|
||||
- {x: 7.2937646, y: 19.027163, z: 2.2401094}
|
||||
- {x: 6.7420654, y: 19.162699, z: 2.7541835}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 8.365842, y: 18.676586, z: 1.203297}
|
||||
- {x: 7.8352757, y: 18.86505, z: 1.7229068}
|
||||
- {x: 7.2937636, y: 19.027163, z: 2.24011}
|
||||
- {x: 6.7420654, y: 19.162699, z: 2.754184}
|
||||
- {x: 6.1809483, y: 19.271467, z: 3.2644105}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
|
|
@ -102797,31 +102779,31 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.17921835
|
||||
value: 0.17921834
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 15.811041
|
||||
value: 15.811039
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 12.246588
|
||||
value: 12.246586
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.89784414
|
||||
value: 0.8978443
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.44019264
|
||||
value: -0.4401926
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.008109807
|
||||
value: 0.008109838
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.0063629216
|
||||
value: 0.006362956
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
@ -106741,8 +106723,8 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 14.472342, y: 13.972715, z: 3.945196}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 14.472342, y: 13.972715, z: 3.9451964}
|
||||
- {x: 13.193735, y: 15.064445, z: 4.386102}
|
||||
- {x: 11.820281, y: 16.047876, z: 4.7954774}
|
||||
- {x: 10.361853, y: 16.915945, z: 5.170378}
|
||||
|
|
@ -115858,8 +115840,8 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 14.821708, y: 13.5293455, z: 4.1861444}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 14.821708, y: 13.5293455, z: 4.186145}
|
||||
- {x: 13.934923, y: 14.22194, z: 4.8789663}
|
||||
- {x: 12.990244, y: 14.855446, z: 5.5515175}
|
||||
- {x: 11.9915905, y: 15.427229, z: 6.2010026}
|
||||
|
|
@ -118896,10 +118878,10 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 15.503062, y: 12.289933, z: 5.372392}
|
||||
- {x: 15.216894, y: 11.686504, z: 7.2195363}
|
||||
- {x: 14.791035, y: 10.975792, z: 9.000403}
|
||||
- {x: 14.791035, y: 10.975792, z: 9.000404}
|
||||
- {x: 14.22939, y: 10.164321, z: 10.698646}
|
||||
- {x: 13.537118, y: 9.25954, z: 12.298674}
|
||||
m_Parameters:
|
||||
|
|
@ -119352,8 +119334,8 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 15.646909, y: 12.780539, z: 3.475929}
|
||||
- {x: 14.829323, y: 13.732846, z: 3.4278498}
|
||||
- {x: 15.646909, y: 12.780539, z: 3.4759293}
|
||||
- {x: 14.829323, y: 13.732846, z: 3.4278502}
|
||||
- {x: 13.956065, y: 14.633598, z: 3.3669028}
|
||||
- {x: 13.030417, y: 15.479415, z: 3.2933154}
|
||||
- {x: 12.055854, y: 16.267122, z: 3.2073655}
|
||||
|
|
@ -124267,12 +124249,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 7.5734305, y: 18.994596, z: 1.4486189}
|
||||
- {x: 6.2154493, y: 19.410063, z: 2.2063007}
|
||||
- {x: 4.819149, y: 19.705864, z: 2.9503808}
|
||||
- {x: 3.39314, y: 19.88018, z: 3.6762729}
|
||||
- {x: 1.9462125, y: 19.93194, z: 4.3794994}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 7.57343, y: 18.994596, z: 1.4486191}
|
||||
- {x: 6.2154484, y: 19.410063, z: 2.206301}
|
||||
- {x: 4.8191485, y: 19.705864, z: 2.9503808}
|
||||
- {x: 3.3931394, y: 19.88018, z: 3.6762724}
|
||||
- {x: 1.9462119, y: 19.93194, z: 4.3795}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -125264,12 +125246,12 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 8.884724, y: 18.462032, z: 0.68200624}
|
||||
- {x: 7.946636, y: 18.838963, z: 1.4813827}
|
||||
- {x: 6.977138, y: 19.141432, z: 2.274904}
|
||||
- {x: 5.9800615, y: 19.368242, z: 3.0594332}
|
||||
- {x: 4.959348, y: 19.518496, z: 3.8318696}
|
||||
- {x: 3.9190328, y: 19.5916, z: 4.58916}
|
||||
- {x: 8.884723, y: 18.462032, z: 0.6820065}
|
||||
- {x: 7.9466352, y: 18.838963, z: 1.481383}
|
||||
- {x: 6.977137, y: 19.141432, z: 2.2749043}
|
||||
- {x: 5.98006, y: 19.368242, z: 3.0594335}
|
||||
- {x: 4.9593477, y: 19.518496, z: 3.83187}
|
||||
- {x: 3.919032, y: 19.5916, z: 4.58916}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -140182,11 +140164,11 @@ LineRenderer:
|
|||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 12.588318, y: 16.178312, z: 0.21565716}
|
||||
- {x: 11.888418, y: 16.69788, z: 0.31040576}
|
||||
- {x: 11.166772, y: 17.186903, z: 0.4045866}
|
||||
- {x: 10.424694, y: 17.644482, z: 0.4980272}
|
||||
- {x: 9.663548, y: 18.069786, z: 0.59055674}
|
||||
- {x: 8.884725, y: 18.46203, z: 0.682006}
|
||||
- {x: 11.888418, y: 16.69788, z: 0.3104058}
|
||||
- {x: 11.166772, y: 17.186903, z: 0.40458664}
|
||||
- {x: 10.424694, y: 17.644482, z: 0.49802724}
|
||||
- {x: 9.663548, y: 18.069786, z: 0.5905568}
|
||||
- {x: 8.884725, y: 18.46203, z: 0.68200606}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 1
|
||||
|
|
@ -141529,15 +141511,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.8932575
|
||||
value: -1.8932574
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 8.969069
|
||||
value: 8.969068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 17.775585
|
||||
value: 17.775583
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
|
|
@ -141545,15 +141527,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.22935377
|
||||
value: -0.22935383
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.054837935
|
||||
value: -0.054837853
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.025902938
|
||||
value: -0.02590293
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7965170655419664431, guid: 6fa1678ce2080e44ca5b11723d197651, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
@ -142240,9 +142222,9 @@ LineRenderer:
|
|||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 17.177565, y: 10.989216, z: -2.1020052}
|
||||
- {x: 16.988894, y: 11.430499, z: -0.98547715}
|
||||
- {x: 16.740519, y: 11.831605, z: 0.13451432}
|
||||
- {x: 16.43331, y: 12.191134, z: 1.2540333}
|
||||
- {x: 16.988894, y: 11.430499, z: -0.9854772}
|
||||
- {x: 16.740519, y: 11.831605, z: 0.13451417}
|
||||
- {x: 16.43331, y: 12.191134, z: 1.2540337}
|
||||
- {x: 16.068344, y: 12.507816, z: 2.3691442}
|
||||
- {x: 15.646907, y: 12.780539, z: 3.4759293}
|
||||
m_Parameters:
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ SphereCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.5
|
||||
m_Radius: 2
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6039747573752144155
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using System.Collections.Generic;
|
||||
|
||||
[ExecuteAlways]
|
||||
public class Node : MonoBehaviour
|
||||
|
|
@ -49,6 +48,7 @@ public class Node : MonoBehaviour
|
|||
UpdateTransform();
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
private void OnDestroy()
|
||||
{
|
||||
GameManager gm = FindFirstObjectByType<GameManager>();
|
||||
|
|
@ -63,6 +63,7 @@ public class Node : MonoBehaviour
|
|||
|
||||
gm.FetchAllNodes();
|
||||
}
|
||||
#endif
|
||||
|
||||
public void UpdateTransform()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue