From 6fb4e3e2b7c075847db5e97f826457f2df1ab007 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 28 Jun 2024 12:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8C=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Adam/Scenes/Main.unity | 655 +++++++++++++++++- .../Assets/Adam/Scripts/Bootstrap.cs | 48 +- .../Assets/Adam/Scripts/Camera/CameraRT.cs | 46 +- 3 files changed, 714 insertions(+), 35 deletions(-) diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity index f64d349..1dc16a0 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity +++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity @@ -11154,7 +11154,7 @@ GameObject: - component: {fileID: 34156465} - component: {fileID: 34156467} - component: {fileID: 34156466} - m_Layer: 5 + m_Layer: 0 m_Name: LandMarks m_TagString: Untagged m_Icon: {fileID: 0} @@ -166527,7 +166527,7 @@ GameObject: - component: {fileID: 469512067} - component: {fileID: 469512069} - component: {fileID: 469512068} - m_Layer: 5 + m_Layer: 0 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -421301,6 +421301,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1621379512} m_Modifications: + - target: {fileID: -9117868731255180394, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -9114895796772237266, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421311,6 +421316,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -8896380907106900806, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8852756019365480031, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -8810975747313904345, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421371,6 +421386,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8578614358339425997, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -8551437617220282788, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421401,6 +421421,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -8263472382665572764, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -8193325197024304100, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421411,11 +421436,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7903881397890615546, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7720364111919089049, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7689599058989589270, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -7507593609015437411, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7469521298724967233, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7350779131471524169, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -7348889930445142269, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421426,6 +421476,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7160636853399288061, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7042722860802657992, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6807336983480499069, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6689031556083319306, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -6669856173414596954, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421436,6 +421506,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -6524066803579225172, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -6508549461037873732, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421446,6 +421521,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -6374525291153788697, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6348149907417404398, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -6198443561045436262, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421456,6 +421541,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -6145540922908613906, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6104909704676562310, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6075888463284062090, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -6070357902204296510, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421476,6 +421576,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5905758846290380927, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -5880800093006601032, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -5702202560580644188, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -5594890150400422718, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421496,6 +421611,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5490805968419150251, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -5482329663558577510, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421506,6 +421626,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5344355137901987107, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -5329952964679480583, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421521,6 +421646,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5251453219929246675, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -5133319025106796600, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421531,6 +421661,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -5001846300578494681, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -4978743135224810957, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421541,6 +421676,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -4813035270094612947, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -4769467913465595639, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421561,11 +421701,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -4626626108985876194, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4559893524998040797, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4553390864003748891, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -4496054629988448283, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -4464356889801736841, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -4404732987135575587, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421576,16 +421736,46 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -4278041812594971956, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -3890985200346400859, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -3844334620393657265, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -3786683150220638095, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -3582344293871497720, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -3451445403050846054, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -3377472388016409995, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -3338238971263976884, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -3268379123961816276, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421621,6 +421811,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -2829043367736451316, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -2779815943975262163, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421651,11 +421846,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -2457462747111970919, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2303650512673271542, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -2263620377120588981, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -2036831455719784839, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -1998961473228679000, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421666,11 +421876,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -1920445875005256993, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -1904254298254243128, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -1704651835917818156, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -1602921270051516899, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -1535140362566212178, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -1463954481021445635, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -1185659126921614886, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421686,6 +421921,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -978815348427884975, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -939991045525945479, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421696,6 +421936,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -854948385554258385, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -789506585746241427, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -732007577542194738, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -557725827617673409, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -443441086081755422, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421706,6 +421966,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -347537090679518733, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -336590841490379976, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -266012896192272264, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421716,6 +421986,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -255005861760792102, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: -187787781143176408, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421726,16 +422001,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 98421863082590690, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 211028430687993414, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 433874737838241077, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 453771205762356678, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 553888363404945614, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 655345512064516651, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421746,6 +422036,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 690821735291525554, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 706457559889329909, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421791,6 +422086,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1281022728179531812, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1291851957085006080, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1318247314953208178, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1344422962285191114, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1352587715562589014, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1379995904357928778, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421806,16 +422126,66 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1577176978921061910, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1654471097153288825, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1786750289149739591, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1874814792360738642, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1931308054299549346, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2103264116278811843, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2132357973956936265, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2164926831780364571, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2205739318830926310, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2263527108353327594, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2264471526085416039, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2325043333355433323, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2370866152145319543, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421826,6 +422196,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2560410166510258935, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2658109883299378237, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2706334426300837495, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2800460600890837423, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2943805210896697522, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2969153867130474618, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421846,6 +422241,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3382833204485849643, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3451398390558605359, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421856,16 +422256,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3564717051169200896, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3616369287144897995, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3814098085637603828, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3820752729517655578, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3852280748910156779, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4015934811725222810, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421881,11 +422296,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4159042597763217020, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4180601530638080455, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4265387662436637908, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4389412044504616229, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421896,16 +422321,46 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4437387193278870379, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4561001154773635685, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4591715056634712286, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4637005642652265840, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4658660588040196262, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4744966678101641383, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4771384385323826998, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4822663838668886839, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4867694899807993938, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421921,11 +422376,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5247000268368807431, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5276711382594226684, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5299439173849060890, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5328946777625651944, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5369315246202029184, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5511009017121518224, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5592544986641503396, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421946,31 +422426,91 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5694069833525747821, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5880317824733802837, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6036463683901090730, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6098125445744907517, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6217447723792638544, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6233910569937174742, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6293447250675081135, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6437643238582135834, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6479246066257566177, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6528517851369816040, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6547882018700404981, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6561986563356291037, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6638490755897303405, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6672156973314253569, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6772454058195418327, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6984972033323225726, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7000918805374763778, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7108740605404633978, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -421981,21 +422521,46 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7206813075760090306, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7445403798049030505, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7571819142736427246, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7627488845535808163, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7654795777790509729, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7678920085724377201, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7726087711636944696, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7730243902873529052, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7803029521313252081, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -422011,11 +422576,71 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8094449135943464943, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8121711455343620252, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8256602808492233190, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8294366873201558782, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8312548064856040808, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8322851775152594605, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8335905648629855643, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8336018459515395553, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8388790785201485679, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8414929746360769075, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8451261220406412834, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8464793110912283853, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8472306742977609395, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8512527332093872440, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -422031,16 +422656,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8615245259882434287, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8700652042886861238, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8782054496054692131, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8793675088380646732, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8890940647912001669, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8953387727570715689, guid: c322347789ca0e84599e9bb0484de1de, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} - target: {fileID: 9044020546773889092, guid: c322347789ca0e84599e9bb0484de1de, type: 3} propertyPath: m_IsActive @@ -575026,7 +575671,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: head: Basicc2FiZXI6c2FiZXJfc2VjcmV0 - token: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTc4MDQ3OTc3MjU5ODQ3MjcwNSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNzE5NTEwMzY4LCJkZXB0X2lkIjoiMTc4MDQ3OTc4MDAyNjU4NTA5MCIsImp0aSI6ImNmZmJkNzk0LWIyM2QtNGI4NC04MTY5LTA4ZDA0MDgyOTA4MCIsImFjY291bnQiOiJhZG1pbiJ9.1McTWNACtvANqtCBQFjIkhiQ_AbPcxb5HUqtny-ZDHE + token: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTc4MDQ3OTc3MjU5ODQ3MjcwNSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNzE5NTQzNjIzLCJkZXB0X2lkIjoiMTc4MDQ3OTc4MDAyNjU4NTA5MCIsImp0aSI6IjI1MTYwNzVkLWZlNGQtNDJjYS1iNWQxLThjYjZhYTUwZmE3OSIsImFjY291bnQiOiJhZG1pbiJ9.jlU4DbCgJMNijOCaUYVvKdsrhqzgEIAxd-pWtSKi2Ok onStation: m_PersistentCalls: m_Calls: [] @@ -629010,7 +629655,7 @@ GameObject: - component: {fileID: 1765164875} - component: {fileID: 1765164878} - component: {fileID: 1765164877} - m_Layer: 5 + m_Layer: 0 m_Name: Info m_TagString: Untagged m_Icon: {fileID: 0} @@ -760784,7 +761429,7 @@ GameObject: m_Component: - component: {fileID: 2125774924} - component: {fileID: 2125774925} - m_Layer: 5 + m_Layer: 0 m_Name: LandMarksAndInfo m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs index e9eb580..e812df2 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs +++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs @@ -79,6 +79,7 @@ public class Bootstrap : MonoSingleton public List dependencyLevel = new List(); public int clickCurrentLevel = 2; + private RaycastHit hit; [ContextMenu("1")] private void Awake() { @@ -108,35 +109,19 @@ public class Bootstrap : MonoSingleton { //landMarks = new List { "网络负荷：49.84 kw", "上网负荷：49.84 kw", "削峰负荷：49.84 kw", "填谷负荷：49.84 kw", "发电负荷：49.84 kw" }; landMarkAndInfoCotroller.gameObject.SetActive(false); - cameraRt.OnLimitScroll += (s) => + cameraRt.onLimitScroll += (s) => { SwitchLand(s); webAdapter.OnLevelChange(s); }; - + cameraRt.onLeftMouseDown += OnLeftClick; } private void Update() { - var hit = rayHitTester.HitTest(); - if (Input.GetMouseButtonDown(0)) - { - if (hit.collider != null) - { - Debug.Log("clickCurrentLevel==" + clickCurrentLevel); - if (cameraRt.currentLevelIndex == 0) return; - clickCurrentLevel--; - if (clickCurrentLevel <= 0) - { - clickCurrentLevel = 0; - } - cameraRt.currentLevelIndex = clickCurrentLevel; - //currentLevel = clickCurrentLevel; - SwitchLand(clickCurrentLevel); - cameraRt.SetTarget(hit.collider.transform); - } - } + hit = rayHitTester.HitTest(); + if (hit.collider != null) { landMarks.Clear(); @@ -156,13 +141,31 @@ public class Bootstrap : MonoSingleton } + public void OnLeftClick() + { + if (hit.collider != null) + { + Debug.Log("clickCurrentLevel==" + clickCurrentLevel); + if (cameraRt.currentLevelIndex == 0) return; + clickCurrentLevel--; + if (clickCurrentLevel <= 0) + { + clickCurrentLevel = 0; + } + cameraRt.currentLevelIndex = clickCurrentLevel; + //currentLevel = clickCurrentLevel; + SwitchLand(clickCurrentLevel); + cameraRt.SetTarget(hit.collider.transform); + } + } + /// /// 展示地标 /// /// - public async void ShowLandMark() + public void ShowLandMark() { if (currentLand == null) return; currentLand.GetComponent().materials = select; @@ -170,7 +173,8 @@ public class Bootstrap : MonoSingleton lastLand = currentLand; SwitchLevel(-1); AreaData areaData = currentLand.GetComponent().areaData; - if (areaData != null && !bool.Parse(areaData.success)) return; + + if (areaData != null && !string.IsNullOrEmpty(areaData.success) && !bool.Parse(areaData.success)) return; for (int i = 0; i < areaData.data.items.Count; i++) { string info = $"{areaData.data.items[i].label}:{areaData.data.items[i].value}{areaData.data.items[i].unit}"; diff --git a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs index 0d73054..83d8c65 100644 --- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs +++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs @@ -179,20 +179,46 @@ public class CameraRT : MonoBehaviour } } - + private Vector3 startPosition; + private bool isDragging; + public Action onLeftMouseDown; void Move() { - if (EventSystem.current.IsPointerOverGameObject()) - return; - - if (Input.GetMouseButton(0)) + //if (EventSystem.current.IsPointerOverGameObject()) + // return; + if (Input.GetMouseButtonDown(0)) + { + startPosition = Input.mousePosition; + isDragging = false; + } + else if (Input.GetMouseButton(0)) + { + if (!isDragging && Vector3.Distance(Input.mousePosition, startPosition) > 10) + { + isDragging = true; + Debug.Log("Started dragging."); + } + } + else if (Input.GetMouseButtonUp(0)) + { + if (isDragging) + { + Debug.Log("Ended dragging."); + } + else + { + onLeftMouseDown?.Invoke(); + Debug.Log("Clicked."); + } + isDragging = false; + } + if (isDragging) { float h = Input.GetAxis("Mouse X") * Time.deltaTime * xSpeed_move; float v = Input.GetAxis("Mouse Y") * Time.deltaTime * ySpeed_move; target.Translate(-h, 0, -v); - if (!isRangeClamped) return; float targetX = target.position.x; @@ -202,6 +228,10 @@ public class CameraRT : MonoBehaviour target.position = new Vector3(targetX, target.position.y, targetZ); } + else + { + + } } void Rotate() @@ -226,7 +256,7 @@ public class CameraRT : MonoBehaviour } - public Action OnLimitScroll; + public Action onLimitScroll; public int currentLevelIndex = 2; public int lastLevelIndex = 2; void Scroll() @@ -248,7 +278,7 @@ public class CameraRT : MonoBehaviour if (currentLevelIndex != lastLevelIndex) { Debug.Log($"UnityLog=currentLevelIndex=={currentLevelIndex}"); - OnLimitScroll?.Invoke(currentLevelIndex); + onLimitScroll?.Invoke(currentLevelIndex); lastLevelIndex = currentLevelIndex; }