gemercheung 2 years ago
parent
commit
e24862efd9

+ 15 - 1
packages/qjkankan-view/public/showviewer/lib/krpano/plugins/webvr.xml

@@ -134,8 +134,8 @@
 		<!-- tween(layer[webvr_setupbutton].alpha,0); -->
 		
 		webvr_show_fakemode_info(false);
-
 		webvr_restore_layers();
+		js(window.onExitVrStatus);
 	</action>
 
 
@@ -147,6 +147,13 @@
 				set(lr.visible, false);
 			  );
 		  );
+		for(set(i,0), i LT hotspot.count, inc(i),
+			copy(lh, hotspot[get(i)]);
+			if(lh.vr !== true,
+				copy(lh.vr_backup_visible, lh.visible);
+				set(lh.visible, false);
+			  );
+		  );
 	</action>
 
 	<action name="webvr_restore_layers">
@@ -157,6 +164,13 @@
 				delete(lr.vr_backup_visible);
 			  );
 		  );
+		for(set(i,0), i LT hotspot.count, inc(i),
+			copy(lh, hotspot[get(i)]);
+			if(lh.vr_backup_visible,
+				copy(lh.visible, lh.vr_backup_visible);
+				delete(lh.vr_backup_visible);
+			  );
+		  );
 	</action>
 	
 	<action name="webvr_show_fakemode_info">

+ 1 - 1
packages/qjkankan-view/public/showviewer/lib/krpano/tooltip.xml

@@ -1,7 +1,7 @@
 <krpano>
     <!-- 1.20. 新热点模式 -->
     <action name="addJQHotspot">
-        <!-- showlog(); -->
+        showlog();
         set(hsp_name,%1); 
         set(hsp_type,%2); 
         txtadd(iconUrl,'',%4);

+ 1 - 1
packages/qjkankan-view/src/sdk/QJKanKan/modules/Scene.js

@@ -54,7 +54,7 @@ export default class Scene extends Emiter {
       "events[skin_events].onloadcomplete": "js(window.onPanoReady());",
       "events[skin_events].onviewchanged": "js(window.onPanoViewChanged());",
       "events[skin_events].onnewpano": "js(window.onNewPano());",
-      "plugin[WebVR].onexitvr": "js(window.onExitVrStatus());",
+      // "plugin[WebVR].onexitvr": "js(window.onExitVrStatus());",
     };
     if (this.locked) {
       await this.locked;