修复冲突
This commit is contained in:
huyulong
parent
da9598e483
commit
f43fe7bf66
@ -122,11 +122,6 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &6351547 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
m_PrefabInstance: {fileID: 88234507}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &19367787
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -755,7 +750,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994198998571858, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -779,7 +774,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199002865535, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -803,7 +798,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199012160355, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -827,7 +822,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199015510579, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -851,7 +846,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199351914701, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -875,7 +870,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199364566401, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -899,7 +894,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199367752913, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -923,7 +918,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199381439712, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -947,7 +942,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199579568693, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -971,7 +966,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199605647877, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -995,7 +990,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199822841271, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1019,7 +1014,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994199865689479, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1043,7 +1038,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200088200840, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1067,7 +1062,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200119438923, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1091,7 +1086,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200202021572, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1115,7 +1110,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200215251258, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1139,7 +1134,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200216218262, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1163,7 +1158,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200223690320, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1187,7 +1182,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200265872643, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1211,7 +1206,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200321997717, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1235,7 +1230,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200407654905, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1259,7 +1254,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200439351610, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1283,7 +1278,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200473900071, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1307,7 +1302,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200514263729, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1331,7 +1326,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200564549256, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1355,7 +1350,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200571807012, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1379,7 +1374,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200572723682, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1403,7 +1398,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200584889718, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1427,7 +1422,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994200859684096, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1451,7 +1446,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 110
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 731994201009488562, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1463,119 +1458,119 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445394997355119, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 888.3673
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395074489332, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395159360376, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 1599.0612
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445395180919523, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 1243.7142
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396082773764, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396136588959, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 533.0204
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396604014141, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1402445396689156006, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 517.0341
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 177.67346
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729707515507, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -258.51706
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729759097803, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -1599,7 +1594,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487729838770152, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 382
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_Name
|
||||
@ -1607,7 +1602,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768968, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730057768969, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -1695,7 +1690,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2368487730601593689, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 64.4652
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f7325740e682bf04a909abba74479379, type: 3}
|
||||
@ -20625,7 +20620,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2613237551969927833, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2613237551969927838, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -20725,7 +20720,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 1526740604}
|
||||
- target: {fileID: 5723411038301894439, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -259.1844
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 2613237552794096493, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
@ -20752,13 +20747,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: cbbd01de5b390ce43acc02c7496a905f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< HEAD
|
||||
connectBtn: {fileID: 0}
|
||||
=======
|
||||
FreePanel02: {fileID: 6351547}
|
||||
>>>>>>> dba8c4a9750ededdb2198165abaa956cb8527657
|
||||
timerText: {fileID: 510191599}
|
||||
connectBtn: {fileID: 1943285844}
|
||||
--- !u!1 &1584174923 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2613237552794096495, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
@ -23789,17 +23779,6 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 431404, guid: 406416920addf5d408961e0385a837f5, type: 3}
|
||||
m_PrefabInstance: {fileID: 1912789160}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1943285844 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2613237551265623805, guid: 452c94fdff2ec8b4b8e900c3582bd8d9, type: 3}
|
||||
m_PrefabInstance: {fileID: 1584174919}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1948499801
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,33 +1,29 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor.Build.Reporting;
|
||||
using UnityEditor.UI;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class FreePanel01 : MonoBehaviour
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
public Button connectBtn;
|
||||
=======
|
||||
|
||||
public GameObject FreePanel02;
|
||||
>>>>>>> dba8c4a9750ededdb2198165abaa956cb8527657
|
||||
|
||||
//这里是计时器相关变量
|
||||
public Text timerText;
|
||||
private float timeElapsed; // 游戏运行时间
|
||||
private bool isRunning = true; //是否在计时
|
||||
|
||||
public Button connectBtn;
|
||||
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
timeElapsed = 0f;
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
connectBtn.onClick.AddListener(OnClickConnectBtn);
|
||||
}
|
||||
@ -37,22 +33,6 @@ public class FreePanel01 : MonoBehaviour
|
||||
{
|
||||
return;
|
||||
}
|
||||
=======
|
||||
connectBtn.onClick.AddListener(OnClickConnectBtn);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void OnClickConnectBtn()
|
||||
{
|
||||
FreePanel02.gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
|
||||
>>>>>>> dba8c4a9750ededdb2198165abaa956cb8527657
|
||||
|
||||
|
||||
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
@ -102,4 +82,17 @@ public class FreePanel01 : MonoBehaviour
|
||||
{
|
||||
timeElapsed = 0f;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user