333

2024-06-27 16:04:41 +08:00 · 2024-06-27 16:04:41 +08:00 · 336ed418dd
parent f9129738b1
commit 336ed418dd
8 changed files with 93 additions and 15 deletions
--- a/u3d-ShanDongVirtualPowerPlant/.vs/u3d-ShanDongVirtualPowerPlant/v17/.suo
+++ b/u3d-ShanDongVirtualPowerPlant/.vs/u3d-ShanDongVirtualPowerPlant/v17/.suo
--- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scenes/Main.unity
@ -149768,6 +149768,79 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1001 &789817517
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_Name
+      value: ShanDongMap-AT
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: c322347789ca0e84599e9bb0484de1de,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c322347789ca0e84599e9bb0484de1de, type: 3}
 --- !u!1 &789863382
 GameObject:
  m_ObjectHideFlags: 0
@ -302721,7 +302794,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  head: Basicc2FiZXI6c2FiZXJfc2VjcmV0
-  token: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTc4MDQ3OTc3MjU5ODQ3MjcwNSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNzE5MzMzMjI2LCJkZXB0X2lkIjoiMTc4MDQ3OTc4MDAyNjU4NTA5MCIsImp0aSI6IjA5MzllN2UwLTM0MmQtNDIyYy1hOTE3LWJmMzRhZDVhZGFlMSIsImFjY291bnQiOiJhZG1pbiJ9.qV_RPA2tZKzqzHYhZks2CqbHPw1KTGyiOA7_LYkoJ1s
+  token: bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTc4MDQ3OTc3MjU5ODQ3MjcwNSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNzE5Mzc1NzI5LCJkZXB0X2lkIjoiMTc4MDQ3OTc4MDAyNjU4NTA5MCIsImp0aSI6IjY4YmUzODU3LWEwMDItNDFiNi1hZDYzLWI4MjE5ZWMwMDljZCIsImFjY291bnQiOiJhZG1pbiJ9.zJ4tDzH1rWbcvtIrrC5jnyueFfCTydrDk45fvS2blbQ
  onStation:
    m_PersistentCalls:
      m_Calls: []
@ -419757,3 +419830,4 @@ SceneRoots:
  - {fileID: 982446487}
  - {fileID: 66276271572638083}
  - {fileID: 1422694239}
+  - {fileID: 789817517}
--- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Bootstrap.cs
@ -116,6 +116,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
        {
            if (hit.collider != null)
            {
+                Debug.Log("clickCurrentLevel==" + clickCurrentLevel);
                if (cameraRt.currentLevelIndex == 1) return;
                clickCurrentLevel--;
                if (clickCurrentLevel <= 1)
@ -126,7 +127,6 @@ public class Bootstrap : MonoSingleton<Bootstrap>
                //currentLevel = clickCurrentLevel;
                SwitchLand(clickCurrentLevel);
                cameraRt.SetTarget(hit.collider.transform);
-                Debug.Log("clickCurrentLevel==" + clickCurrentLevel);
            }
        }
        if (hit.collider != null)
@ -196,7 +196,6 @@ public class Bootstrap : MonoSingleton<Bootstrap>
    public void SwitchLand(int _currentLevel)
    {
        if (currentLand == null) return;
-        webAdapter.LevelChange(_currentLevel.ToString());
        landMarkAndInfoCotroller.gameObject.SetActive(false);
        currentLevel = _currentLevel;
        clickCurrentLevel = _currentLevel;
@ -247,6 +246,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
                Debug.Log("ÇøÏØ");
                break;
        }
+        webAdapter.OnLevelChange(_currentLevel);
    }


--- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/Camera/CameraRT.cs
@ -245,7 +245,7 @@ public class CameraRT : MonoBehaviour

        if (currentLevelIndex != lastLevelIndex)
        {
-            //Debug.Log($"currentLevelIndex=={currentLevelIndex}");
+            Debug.Log($"UnityLog=currentLevelIndex=={currentLevelIndex}");
            OnLimitScroll?.Invoke(currentLevelIndex);
            lastLevelIndex = currentLevelIndex;
        }
--- a/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/WebAdapter.cs
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Adam/Scripts/WebAdapter.cs
@ -10,31 +10,35 @@ public class WebAdapter : MonoBehaviour
    public string head;
    public string token;
    [DllImport("__Internal")]
-    private static extern void OnLevelChange(string level);
+    private static extern void LevelChange(int _level);
 #else
    public string head;
    public string token;
-    private static void OnLevelChange(string level)
+    private static void LevelChange(int _level)
    {
-        Debug.Log(level);
+        //Debug.Log(level);
    }
 #endif
    public UnityEvent<string> onStation;
-    public void LevelChange(string level)
+    public void OnLevelChange(int _level)
    {
-        OnLevelChange(level);
+        //LevelChange(_level);
+        //Debug.Log("UnityLog==level==" + _level);
    }

    public void OnStation(string station)
    {
        onStation?.Invoke(station);
+        Debug.Log("UnityLog==station==" + station);
    }

    public void SetHeadAndToken(string _headAndToken)
    {
        string[] data = _headAndToken.Split("+");
-        head = data[0].Replace(" ", "");
-        token = data[1].Replace(" ", "");
+        head = data[0];
+        token = data[1];
+        Debug.Log("UnityLog==head==" + head);
+        Debug.Log("UnityLog==token==" + token);
    }

 }
--- a/u3d-ShanDongVirtualPowerPlant/Assets/Plugins/api.jslib
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Plugins/api.jslib
@ -1,5 +1,5 @@
 mergeInto(LibraryManager.library, {
-  OnLevelChange: function (level) {
-    _OnLevelChange(Pointer_stringify(level))
-  }
+LevelChange: function(level){
+OnLevelChange(level);
+}
 });
--- a/u3d-ShanDongVirtualPowerPlant/Assets/Plugins/api.jslib.meta
+++ b/u3d-ShanDongVirtualPowerPlant/Assets/Plugins/api.jslib.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ff73f99e1c44b6343b9263813d2918fb
+guid: ae6e8e62919c37440ac1dcf99066b1e3
 PluginImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/u3d-ShanDongVirtualPowerPlant/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/u3d-ShanDongVirtualPowerPlant/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache