From da2a92853ee7dc9be58f6221fe49b69f1ffb67ea Mon Sep 17 00:00:00 2001 From: wulongxiao <2545507770@qq.com> Date: Fri, 20 Dec 2024 16:37:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E8=88=B9=E7=9A=84bug?= =?UTF-8?q?=E4=BF=AE=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meng_yao/Assets/Scenes/scene_Main.unity | 462 +++++++++--------- meng_yao/Assets/common | 2 +- .../script/scene_jinshakuang/jskPanel.cs | 2 +- .../scene_jinshakuang/roomcontroller.cs | 2 +- .../script/scene_jishadao/jishadao_buy.cs | 2 +- 5 files changed, 239 insertions(+), 231 deletions(-) diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 8494121d6..9abc99ce3 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -26695,83 +26695,83 @@ 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: 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: 1745005862614175136, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_IsActive @@ -26779,35 +26779,35 @@ PrefabInstance: 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: 2186939255280341675, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -26903,419 +26903,419 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 313.16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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 - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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 - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 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: 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: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 557.86066 + 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 - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 576.32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 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: 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: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 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: 390.9071 + 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 @@ -27323,131 +27323,131 @@ 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: 223.95355 + 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 - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 49.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 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: 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: 4905329732822886045, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: PersonID @@ -31916,7 +31916,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 @@ -41254,9 +41254,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 @@ -83767,83 +83767,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 @@ -108385,19 +108385,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 @@ -108405,51 +108405,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 @@ -108461,19 +108461,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 @@ -115464,7 +115464,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 @@ -121163,9 +121163,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 @@ -156268,6 +156268,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 1477323885343120432} flyDuration: 1 + id: 0 --- !u!114 &924268791607708460 MonoBehaviour: m_ObjectHideFlags: 0 @@ -156283,6 +156284,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 1477323885343120432} flyDuration: 1 + id: 0 --- !u!114 &924268792840249349 MonoBehaviour: m_ObjectHideFlags: 0 @@ -156298,6 +156300,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 1477323885343120432} flyDuration: 1 + id: 0 --- !u!114 &1066468052626369803 MonoBehaviour: m_ObjectHideFlags: 0 @@ -157581,9 +157584,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 @@ -158466,9 +158469,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 @@ -159641,9 +159644,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 @@ -159679,9 +159682,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 @@ -160641,6 +160644,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 0} flyDuration: 1 + id: 0 --- !u!224 &1635682451688820537 RectTransform: m_ObjectHideFlags: 0 @@ -160658,9 +160662,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 @@ -164299,6 +164303,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 0} flyDuration: 1 + id: 0 --- !u!1 &5030294901345889888 GameObject: m_ObjectHideFlags: 0 @@ -164537,6 +164542,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 0} flyDuration: 1 + id: 0 --- !u!1 &5886320606151238136 GameObject: m_ObjectHideFlags: 0 @@ -165799,6 +165805,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 0} flyDuration: 1 + id: 0 --- !u!222 &7864017317208561165 CanvasRenderer: m_ObjectHideFlags: 0 @@ -166120,6 +166127,7 @@ MonoBehaviour: DropBtn: {fileID: 0} targetPosition: {fileID: 0} flyDuration: 1 + id: 0 --- !u!114 &8533826443837745445 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index 4d4a9e5b0..5a778abdb 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 4d4a9e5b0bae004fcd6f9d0c48da0467bfeaa7aa +Subproject commit 5a778abdbc07bcac0d2382db6ef0eef9a8842836 diff --git a/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs b/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs index 8b3b1eb82..01a93c078 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs @@ -32,7 +32,7 @@ public class jskPanel : mount for (int i = 0; i < 5; i++) { boxTypes.Add(new BoxType { Name = index.ToString() + "文本", prompt = "第" + ArabicToChineseNumberConverter.ConvertToChineseNumbers(index.ToString()) + "层", Type = 4, is_required = true }); - boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "捕鱼" + 1, Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] }); + boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "捕鱼" + 1, Type = 3, goldNumerobj = lands[index].GetComponent().ActivateValue.ToString(), icon = iconS[index - 1] }); index++; } diff --git a/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs b/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs index 2e546fa08..de9244ea7 100644 --- a/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs +++ b/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs @@ -132,9 +132,9 @@ public class roomcontroller : MonoBehaviour fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos); Debug.Log("更新船时间"); - return; } + musk.gameObject.SetActive(false); fishMan = GameObject.Instantiate(fishManPrefab, this.transform); fishMan.transform.position = startPos.position; diff --git a/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs b/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs index e716dfd8e..c9e77571d 100644 --- a/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs +++ b/meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs @@ -30,7 +30,7 @@ public class jishadao_buy :mount for (int i = 0; i < 3; i++) { boxTypes.Add(new BoxType { Name = index.ToString() + "文本", prompt = "第" + ArabicToChineseNumberConverter.ConvertToChineseNumbers(index.ToString()) + "层", Type = 4, is_required = true }); - boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "捕鱼" + 1, Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] }); + boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "捕鱼" + 1, Type = 3, goldNumerobj = lands[index].GetComponent().ActivateValue.ToString(), icon = iconS[index - 1] }); index++; }