diff --git a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity index 5e77aa2d..6db9c94c 100644 --- a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity +++ b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity @@ -335,7 +335,7 @@ RectTransform: - {fileID: 2063374074} - {fileID: 1406166284} m_Father: {fileID: 1630019883} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -977,7 +977,7 @@ RectTransform: - {fileID: 2020987139} - {fileID: 511419853} m_Father: {fileID: 1630019883} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2009,7 +2009,7 @@ RectTransform: - {fileID: 491504347} - {fileID: 1038666920} m_Father: {fileID: 1630019883} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4183,7 +4183,7 @@ RectTransform: - {fileID: 1350211544} - {fileID: 55745640} m_Father: {fileID: 1630019883} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4939,6 +4939,7 @@ GameObject: - component: {fileID: 1406166283} - component: {fileID: 1406166282} - component: {fileID: 1406166281} + - component: {fileID: 1406166285} m_Layer: 5 m_Name: "\u9A7B\u798F\u6E05\u529E\u4E8B\u5904" m_TagString: Untagged @@ -5016,6 +5017,51 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1406166285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406166280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 7 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1406166281} + m_TargetAssemblyTypeName: WorkPlacePanel, Assembly-CSharp + m_MethodName: OnScorll + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 5 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1406166281} + m_TargetAssemblyTypeName: WorkPlacePanel, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1421219887 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8856219313163689187, guid: 06acf0d7bf4af584f97c5720760b436e, @@ -5412,11 +5458,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1918092860} - {fileID: 736029548} - {fileID: 1234750085} - {fileID: 110618937} - {fileID: 331429612} + - {fileID: 1918092860} m_Father: {fileID: 1750630380} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6150,7 +6196,7 @@ RectTransform: m_Children: - {fileID: 408945112} m_Father: {fileID: 1630019883} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6171,7 +6217,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -6500,6 +6546,7 @@ GameObject: - component: {fileID: 2063374076} - component: {fileID: 2063374075} - component: {fileID: 2063374077} + - component: {fileID: 2063374078} m_Layer: 5 m_Name: "\u9A7B\u7F57\u6E90\u6E7E\u529E\u4E8B\u5904" m_TagString: Untagged @@ -6577,6 +6624,51 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 44e6072eb03814747acf65d17160bdd2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &2063374078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2063374073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 7 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2063374077} + m_TargetAssemblyTypeName: WorkPlacePanel, Assembly-CSharp + m_MethodName: OnScorll + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 5 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2063374077} + m_TargetAssemblyTypeName: WorkPlacePanel, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &2081707619 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FuZhou_FirstPage/Assets/Scripts/WorkPlacePanel.cs b/FuZhou_FirstPage/Assets/Scripts/WorkPlacePanel.cs index 2645719a..83aa92ce 100644 --- a/FuZhou_FirstPage/Assets/Scripts/WorkPlacePanel.cs +++ b/FuZhou_FirstPage/Assets/Scripts/WorkPlacePanel.cs @@ -5,14 +5,17 @@ using System.Collections.Generic; using System.IO; using System.Linq; using UnityEngine; +using UnityEngine.EventSystems; public class WorkPlacePanel : MonoBehaviour { WorkPlaceItem workPlaceItem; + RectTransform rectTransform; public void Init(string custCodes, WorkPlaceItem workPlaceItem) { this.workPlaceItem = workPlaceItem; InitModel(custCodes); + rectTransform = GetComponent(); } /// /// 生成企业图标 @@ -82,4 +85,22 @@ public class WorkPlacePanel : MonoBehaviour } })); } + + public void OnMove(BaseEventData baseEvent) + { + PointerEventData evnetdata = (PointerEventData)baseEvent; + if (evnetdata.button == PointerEventData.InputButton.Middle) + { + rectTransform.anchoredPosition += evnetdata.delta; + Application.ExternalCall("OnBanShiChuChange", rectTransform.localScale.x, rectTransform.anchoredPosition.x, rectTransform.anchoredPosition.y); + } + } + public void OnScorll(BaseEventData baseEvent) + { + PointerEventData evnetdata = (PointerEventData)baseEvent; + float value = (rectTransform.localScale.x + evnetdata.scrollDelta.y* 0.1f); + value = Mathf.Clamp(value, 1f, 2.5f); + rectTransform.localScale=new Vector3(value, value, value); + Application.ExternalCall("OnBanShiChuChange", rectTransform.localScale.x, rectTransform.anchoredPosition.x, rectTransform.anchoredPosition.y); + } } diff --git a/FuZhou_FirstPage/Assets/StreamingAssets/椹荤娓呭姙浜嬪.txt b/FuZhou_FirstPage/Assets/StreamingAssets/椹荤娓呭姙浜嬪.txt index 5ef4a4f4..5ee6b213 100644 --- a/FuZhou_FirstPage/Assets/StreamingAssets/椹荤娓呭姙浜嬪.txt +++ b/FuZhou_FirstPage/Assets/StreamingAssets/椹荤娓呭姙浜嬪.txt @@ -2,50 +2,57 @@ { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "绂忓窞鏂版腐鍥介檯闆嗚绠辩爜澶存湁闄愬叕鍙", - "MapLongitude": "0.67", - "MapLatitude": "0.21" + "ModelNameQuan": "绂忓窞鏂版腐鍥介檯闆嗚绠辩爜澶存湁闄愬叕鍙", + "ModelName": "鏂版腐闆嗚绠", + "MapLongitude": "0.49", + "MapLatitude": "0.30" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "鍥界數绂忓窞鐢靛巶鏈夐檺鍏徃", - "MapLongitude": "0.68", - "MapLatitude": "0.25" + "ModelNameQuan": "鍥界數绂忓窞鐢靛巶鏈夐檺鍏徃", +"ModelName": "鍥界數绂忓窞鐢靛巶", + "MapLongitude": "0.50", + "MapLatitude": "0.35" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "绂忓缓涓皯鏂拌兘婧愭湁闄愬叕鍙", - "MapLongitude": "0.68", - "MapLatitude": "0.28" + "ModelNameQuan": "绂忓缓涓皯鏂拌兘婧愭湁闄愬叕鍙", +"ModelName": "涓皯鏂拌兘婧", + "MapLongitude": "0.48", + "MapLatitude": "0.33" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "绂忓缓涓睙鍖栧伐鐮佸ご鏈夐檺鍏徃", - "MapLongitude": "0.623", - "MapLatitude": "0.32" + "ModelNameQuan": "绂忓缓涓睙鍖栧伐鐮佸ご鏈夐檺鍏徃", +"ModelName": "涓睙鍖栧伐", + "MapLongitude": "0.46", + "MapLatitude": "0.33" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "绂忓缓涓繙娴疯繍鏈夐檺鍏徃", - "MapLongitude": "0.59", - "MapLatitude": "0.20" + "ModelNameQuan": "绂忓缓涓繙娴疯繍鏈夐檺鍏徃", +"ModelName": "涓繙娴疯繍", + "MapLongitude": "0.47", + "MapLatitude": "0.29" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "绂忓缓闂芥捣鑳芥簮鏈夐檺鍏徃", - "MapLongitude": "0.60", - "MapLatitude": "0.24" + "ModelNameQuan": "绂忓缓闂芥捣鑳芥簮鏈夐檺鍏徃", +"ModelName": "闂芥捣鑳芥簮", + "MapLongitude": "0.46", + "MapLatitude": "0.30" }, { "EnterpriseCode": "", "DistrictCode": "3505", - "ModelName": "涓囧崕(绂忓缓)鐮佸ご鏈夐檺鍏徃", - "MapLongitude": "0.61", - "MapLatitude": "0.28" + "ModelNameQuan": "涓囧崕(绂忓缓)鐮佸ご鏈夐檺鍏徃", +"ModelName": "涓囧崕鐮佸ご", + "MapLongitude": "0.46", + "MapLatitude": "0.36" } ] \ No newline at end of file