Commit e1003010 authored by Alex Peake's avatar Alex Peake

made dlls not conflict

parent c7509868
......@@ -3,13 +3,37 @@ guid: cb88198be396c95478fe76b9ecc3d358
timeCreated: 1488204952
licenseType: Free
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
Any:
- first:
'': Any
second:
enabled: 0
settings:
Exclude Android: 0
Exclude Editor: 0
Exclude Linux: 0
Exclude Linux64: 0
Exclude LinuxUniversal: 0
Exclude OSXIntel: 0
Exclude OSXIntel64: 0
Exclude OSXUniversal: 0
Exclude Win: 1
Exclude Win64: 0
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 1
settings:
Exclude Editor: 0
......@@ -22,45 +46,77 @@ PluginImporter:
Exclude Win: 1
Exclude Win64: 0
Exclude WindowsStoreApps: 0
Editor:
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
Linux:
- first:
Facebook: Win
second:
enabled: 0
settings:
CPU: None
- first:
Facebook: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Standalone: Linux
second:
enabled: 1
settings:
CPU: x86
Linux64:
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: x86_64
LinuxUniversal:
- first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel:
- first:
Standalone: OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel64:
- first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
OSXUniversal:
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
Win:
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
Win64:
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
WindowsStoreApps:
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 1
settings:
CPU: AnyCPU
......
......@@ -45,3 +45,46 @@
2017-11-05 16:38:03,753 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 16:38:03,816 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:142c82b2-c8c1-4713-94f2-6892068c23a5,port:8288
2017-11-05 16:39:38,352 [10] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:26:02,060 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:26:02,130 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:9add4924-bc7e-4b6e-b550-56b520c818d8,port:8941
2017-11-05 17:26:11,031 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:27:28,507 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:27:28,571 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:6f754c4d-11e2-4194-9309-228bc64d17bc,port:8038
2017-11-05 17:27:45,481 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:27:56,935 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:27:56,999 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:78544f0c-81f4-4d1a-8002-eacc9f8bbd3a,port:8050
2017-11-05 17:28:11,747 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:28:49,372 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:28:49,443 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:97e5159e-26be-44a0-9e25-ebf9621b95b0,port:8742
2017-11-05 17:29:58,482 [10] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:31:09,246 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:31:09,335 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:a054ba9d-0756-4931-80a5-ecf44df56537,port:8515
2017-11-05 17:32:08,473 [3] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:39:39,272 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:39:39,335 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:7d1f33bc-09a9-472a-b611-369140a28f6b,port:8719
2017-11-05 17:40:23,167 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:40:56,242 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:40:56,306 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:3a9688f6-3acb-4cb3-8487-8936b6075232,port:8105
2017-11-05 17:41:19,474 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:41:41,043 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:41:41,107 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:c831f094-271d-400b-a818-429bc9a9bcb9,port:8622
2017-11-05 17:42:08,077 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:42:28,826 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:42:28,893 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:f4eb1862-c60b-43da-a04f-9996f85ceded,port:8918
2017-11-05 17:44:53,722 [10] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 17:44:53,770 [1] ERROR SharedPluginServer.Program [(null)] - CefRuntime return 0
2017-11-05 17:47:10,865 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 17:47:10,928 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:ff3d4eee-4b88-4cb9-a28b-3fe0c748a16a,port:8927
2017-11-05 17:50:39,782 [7] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 18:03:03,775 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 18:03:03,847 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:6f4b0ec9-7966-4d2b-a44d-96dc30c709e9,port:8724
2017-11-05 18:05:35,821 [11] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-05 18:09:24,797 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-05 18:09:24,866 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:548e4a94-babb-42a8-9624-7866bdf02707,port:8409
2017-11-05 18:12:02,766 [12] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-06 16:32:16,220 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-06 16:32:16,337 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:9c0e7ea2-73a6-4e45-82cd-59af6222ac8f,port:8837
2017-11-06 16:39:17,314 [3] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
2017-11-14 22:43:31,296 [1] INFO SharedPluginServer.Program [(null)] - ===============START================
2017-11-14 22:43:31,377 [1] INFO SharedPluginServer.Program [(null)] - Starting plugin, settings:width:1024,height:600,url:http://www.archive.org,memfile:27446ebe-6d50-4bf9-af15-5324d2194858,port:8245
2017-11-14 22:47:49,026 [3] INFO SharedPluginServer.App [(null)] - ==============SHUTTING DOWN==========
......@@ -3,13 +3,37 @@ guid: c0a4c24775a580346b291ad713bb2a79
timeCreated: 1488209027
licenseType: Free
PluginImporter:
serializedVersion: 1
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
Any:
- first:
'': Any
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Editor: 1
Exclude Linux: 0
Exclude Linux64: 0
Exclude LinuxUniversal: 0
Exclude OSXIntel: 0
Exclude OSXIntel64: 0
Exclude OSXUniversal: 0
Exclude Win: 0
Exclude Win64: 1
- first:
Android: Android
second:
enabled: 0
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings:
Exclude Editor: 1
......@@ -22,45 +46,77 @@ PluginImporter:
Exclude Win: 0
Exclude Win64: 0
Exclude WindowsStoreApps: 1
Editor:
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
Linux:
- first:
Facebook: Win
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
Facebook: Win64
second:
enabled: 1
settings:
CPU: None
- first:
Standalone: Linux
second:
enabled: 1
settings:
CPU: x86
Linux64:
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: x86_64
LinuxUniversal:
- first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel:
- first:
Standalone: OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel64:
- first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
OSXUniversal:
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: AnyCPU
Win:
- first:
Standalone: Win
second:
enabled: 1
settings:
CPU: AnyCPU
Win64:
enabled: 1
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
WindowsStoreApps:
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: X86
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using SimpleWebBrowser;
public class SimpleUnityBrowserVRTK : MonoBehaviour {
public List<SimpleWebBrowser.WebBrowser> browsers;
public Camera mainCamera;
// Use this for initialization
void Awake () {
mainCamera = Camera.main;
foreach (SimpleWebBrowser.WebBrowser browser in browsers)
{
if (mainCamera != null)
{
browser.MainCamera = mainCamera;
}
}
}
// Update is called once per frame
void Update () {
}
}
fileFormatVersion: 2
guid: a4cf1ec79525bb74398f5db58daa500c
timeCreated: 1509931977
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -6,5 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/_VARchive P1/_VARChive P2/Scenes/004 VRTK ASDay.unity
guid: 63d47e5d30786f44da786fc94136e565
- enabled: 0
path: Assets/_VARchive P1/Scenes/003 VRTK.unity
guid: d9543e59a2dfd8a42b86445b6148bf4e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment