Merge branch 'master' of http://git.umayle.com/chenxiangxue/FuZhou_Custom_BulkCargo_3D

FuZhou_FirstPage/Assets/Scenes/MainScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1077,7 +1077,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!81 &459500707
 AudioListener:
   m_ObjectHideFlags: 0
@@ -1725,7 +1725,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!108 &719187030
 Light:
   m_ObjectHideFlags: 0

FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs

@@ -63,6 +63,9 @@ public class FirstPanel : MonoBehaviour
 
     void Awake()
     {
+        //限制30帧
+        Application.targetFrameRate = 30;
+
         currentChoseCustonItem = null;
         instance = this;
         backbtn.onClick.AddListener(() => 
@@ -105,9 +108,20 @@ public class FirstPanel : MonoBehaviour
                 Debug.Log("福清配置读取成功："+ fuqingWorkPlaceJson);
             }
         }));
+
+        style = new GUIStyle();
+        style.fontSize = 20;
+        style.normal.textColor= Color.white;
     }
 
-    
+    GUIStyle style;
+#if UNITY_EDITOR
+    private void OnGUI()
+    {
+        GUI.Label(new Rect(500f,500f,2000f,1000f),"帧率："+ showFram, style);
+    }
+#endif
+
     /// <summary>
     /// 前端调用初始化传IP
     /// </summary>
@@ -119,8 +133,21 @@ public class FirstPanel : MonoBehaviour
     }
 
 
+    int fram = 0;
+    float tmptime=0;
+    int showFram;
+
     private void Update()
     {
+        fram++;
+        tmptime+= Time.deltaTime;
+        if(tmptime>=1)
+        {
+            showFram = fram;
+            tmptime = 0;
+            fram = 0;
+        }
+
         int index = 0;
         foreach (Image image in checkImages) 
         {

FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs

@@ -75,5 +75,7 @@ public class CustomItem : MonoBehaviour
 
         //隐藏所有办事处地图
         FirstPanel.instance.workPlace.SetActive(false);
+
+        Application.ExternalCall("ClickCustom", "");
     }
 }

FuZhou_FirstPage/Assets/StreamingAssets/驻福清办事处.txt

@@ -3,49 +3,49 @@
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "福州新港国际集装箱码头有限公司",
-                "MapLongitude": "0.585",
+                "MapLongitude": "0.67",
-                "MapLatitude": "0.525"
+                "MapLatitude": "0.21"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "国电福州电厂有限公司",
-                "MapLongitude": "0.605",
+                "MapLongitude": "0.68",
-                "MapLatitude": "0.315"
+                "MapLatitude": "0.25"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "福建中民新能源有限公司",
-                "MapLongitude": "0.775",
+                "MapLongitude": "0.68",
-                "MapLatitude": "0.555"
+                "MapLatitude": "0.28"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "福建中江化工码头有限公司",
-                "MapLongitude": "0.425",
+                "MapLongitude": "0.623",
-                "MapLatitude": "0.455"
+                "MapLatitude": "0.32"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "福建中远海运有限公司",
-                "MapLongitude": "0.665",
+                "MapLongitude": "0.59",
-                "MapLatitude": "0.575"
+                "MapLatitude": "0.20"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "福建闽海能源有限公司",
-                "MapLongitude": "0.355",
+                "MapLongitude": "0.60",
-                "MapLatitude": "0.545"
+                "MapLatitude": "0.24"
             },
             {
                 "EnterpriseCode": "",
                 "DistrictCode": "3505",
                 "ModelName": "万华(福建)码头有限公司",
-                "MapLongitude": "0.445",
+                "MapLongitude": "0.61",
-                "MapLatitude": "0.555"
+                "MapLatitude": "0.28"
             }
 ]