diff --git a/meng_yao/Assets/Resources/Prefabs/sxcarditem.prefab b/meng_yao/Assets/Resources/Prefabs/sxcarditem.prefab index a061c8f9..a583aa07 100644 --- a/meng_yao/Assets/Resources/Prefabs/sxcarditem.prefab +++ b/meng_yao/Assets/Resources/Prefabs/sxcarditem.prefab @@ -260,6 +260,7 @@ GameObject: - component: {fileID: 7733483716990088035} - component: {fileID: 3335798973629821471} - component: {fileID: 6642128994121697517} + - component: {fileID: 3076726767603001194} m_Layer: 5 m_Name: sxcarditem m_TagString: Untagged @@ -328,6 +329,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3076726767603001194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842424130508822905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d11d008e8fe37cb45a056fc92114465f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6456615796520121862 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 20547132..bc3a254b 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -33370,19 +33370,19 @@ PrefabInstance: objectReference: {fileID: 1743557964} - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -530 + value: 0 objectReference: {fileID: 0} - target: {fileID: 362676243581000638, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y @@ -33394,99 +33394,99 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 284 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -134 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 428 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 284 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 428 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2562232161644998510, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.x @@ -33606,35 +33606,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -370 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 106.99179 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y @@ -33654,67 +33654,67 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 49.333332 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.666664 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y @@ -33746,19 +33746,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593011467209, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y @@ -33766,35 +33766,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 790.55896 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -530 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593223604693, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_FillAmount @@ -33802,35 +33802,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.666664 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593425406785, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive @@ -33854,19 +33854,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 546.09827 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y @@ -33886,35 +33886,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593644270110, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive @@ -33938,19 +33938,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_RootOrder @@ -33994,19 +33994,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 49.333332 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593759919821, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive @@ -34014,19 +34014,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 448.77536 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593852809512, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_RootOrder @@ -34054,19 +34054,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593986977004, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive @@ -34078,19 +34078,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 383.0655 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594115621021, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: boundaryRect @@ -34098,51 +34098,51 @@ PrefabInstance: objectReference: {fileID: 599549935} - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 220.03275 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 49.333332 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y @@ -34162,19 +34162,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -370 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594366639349, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x @@ -34190,55 +34190,55 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 49.333332 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.666664 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.666664 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3215173789656602693, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_SizeDelta.y - value: 733 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4905329732822886045, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: mygameObject @@ -40318,7 +40318,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &426100837 Transform: m_ObjectHideFlags: 0 @@ -51763,9 +51763,9 @@ RectTransform: m_Father: {fileID: 1477323886473665161} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -496.75} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &555829219 @@ -100338,7 +100338,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1073200880 RectTransform: m_ObjectHideFlags: 0 @@ -111578,83 +111578,83 @@ PrefabInstance: objectReference: {fileID: 1607805909} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -109 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 266.89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -109 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 483.78 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -109 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 700.67 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -109 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 917.56 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: -109 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2278414502976399296, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_IsActive @@ -126919,35 +126919,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 284 objectReference: {fileID: 0} - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 428 objectReference: {fileID: 0} - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -43 objectReference: {fileID: 0} - target: {fileID: 4284489242025471100, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3} propertyPath: m_IsActive @@ -143029,19 +143029,19 @@ PrefabInstance: objectReference: {fileID: 426100836} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -109 objectReference: {fileID: 0} - target: {fileID: 2278414502376877128, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_IsActive @@ -143049,51 +143049,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 266.89 objectReference: {fileID: 0} - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -109 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 483.78 objectReference: {fileID: 0} - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -109 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 700.67 objectReference: {fileID: 0} - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -109 objectReference: {fileID: 0} - target: {fileID: 2278414502826152887, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_IsActive @@ -143105,19 +143105,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 917.56 objectReference: {fileID: 0} - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -109 objectReference: {fileID: 0} - target: {fileID: 2278414503729634016, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3} propertyPath: m_IsActive @@ -149974,7 +149974,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1607805910 Transform: m_ObjectHideFlags: 0 @@ -158329,9 +158329,9 @@ RectTransform: m_Father: {fileID: 1477323885727800918} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -355.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1684710737 @@ -205802,9 +205802,9 @@ RectTransform: m_Father: {fileID: 1477323886473665161} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -208.25} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1477323885311605773 @@ -206687,9 +206687,9 @@ RectTransform: m_Father: {fileID: 1477323885727800918} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -209.7} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1477323885819143781 @@ -207862,9 +207862,9 @@ RectTransform: m_Father: {fileID: 1477323885727800918} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -64} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1477323886531312264 @@ -207900,9 +207900,9 @@ RectTransform: m_Father: {fileID: 1477323886473665161} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -352.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1477323886569317696 @@ -208897,9 +208897,9 @@ RectTransform: m_Father: {fileID: 1477323886473665161} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -64} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1682967232464333744 diff --git a/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs b/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs index 8eb2f71c..162e59de 100644 --- a/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs +++ b/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs @@ -55,7 +55,7 @@ public class Scene_main_jiekou :MonoBehaviour Auctioncertificate auctioncertificate=new Auctioncertificate(); Islandownerbidding islandownerbidding=new Islandownerbidding(); petdraw petdraw = new petdraw(); - + treeachievement treeachievement = new treeachievement(); public static Scene_main_jiekou instance; //public PlayerInfoData infoData; @@ -392,4 +392,10 @@ public class Scene_main_jiekou :MonoBehaviour body.trade_password = tradepassword; return await petdraw.PetdrawInfosInfo(body); } + + public async Task Treeachievements() + { + return await treeachievement.Treeachievement(); + } + } diff --git a/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs b/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs new file mode 100644 index 00000000..2fe50716 --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class sxcarditem : MonoBehaviour +{ + public Image sxcarbg; + public Image CardSprite; + public Image sxcardupblue; + public Text name; + + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs.meta b/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs.meta new file mode 100644 index 00000000..f553c770 --- /dev/null +++ b/meng_yao/Assets/script/scene_Main/ui/sxcarditem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d11d008e8fe37cb45a056fc92114465f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs b/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs index 869837c9..0f25d2ff 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs @@ -59,7 +59,7 @@ public class minerControl : MonoBehaviour } - public void init(List path,float pathsNeedTimer,float fishingNeedTimer,float restTimer,Transform startPos,Transform endPos) + public async void init(List path,float pathsNeedTimer,float fishingNeedTimer,float restTimer,Transform startPos,Transform endPos) { this.paths = path; this.pathsNeedTimer = pathsNeedTimer+Random.Range(0,10); @@ -68,18 +68,21 @@ public class minerControl : MonoBehaviour this.startPos = startPos; this.endPos = endPos; - - if (Vector3.Distance(this.transform.position, startPos.position) <= 0.01f) - { - //Debug.LogWarning("11111111111111"); - MoveToFishingPos(); - } - else - { - // Debug.LogWarning("22222222222222222"); - dig(); - } + // 等待移动完成 + await MoveToEndPositionAsync(endPos.position); + + // 挖矿操作 + dig(); + } + + private async System.Threading.Tasks.Task MoveToEndPositionAsync(Vector3 targetPosition) + { + // 使用 DOTween 进行移动，并等待动画完成 + Tweener tweener = transform.DOMove(targetPosition, 3f); + + // 等待动画完成 + await tweener.AsyncWaitForCompletion(); } public void SetState(minerState newState) @@ -123,7 +126,7 @@ public class minerControl : MonoBehaviour } //改变朝向 - ChangeShipLook(pathPoints[0], pathPoints[path.Count - 1]); + ChangeShipLook(this.transform.position, pathPoints[path.Count - 1]); diff --git a/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs b/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs index b1d4cf54..27d6b33e 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs @@ -133,6 +133,8 @@ public class roomcontroller : MonoBehaviour Vector3 pos = new Vector3(Random.Range((endPos.position.x-startPos.position.x)/2, endPos.position.x), endPos.position.y, endPos.position.z); fishMan.transform.position = pos; + //fishMan.transform.position = endPos.position; + fishManShipContorl = fishMan.GetComponent(); fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);