diff --git a/Assets/StreamingAssets/AVProVideoSamples.meta b/Assets/StreamingAssets/AVProVideoSamples.meta
deleted file mode 100644
index 0cb2cfb5..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e13e46625c4cb8246b59842d7a465810
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4 b/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4
deleted file mode 100644
index 973961d6..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4.meta
deleted file mode 100644
index 68cf74ef..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/AlphaLeftRight.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6894a5f53c0213a4b967de1b7f08b6a6
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4 b/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4
deleted file mode 100644
index 48807192..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4.meta
deleted file mode 100644
index 1090ddc3..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/AlphaTopBottom.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5a19342578dcd6f409da399e58f39b34
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3 b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3
deleted file mode 100644
index 50a6de26..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3.meta b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3.meta
deleted file mode 100644
index a9e4e372..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp3.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 4f746673c6abcaa458d2e762619f8c06
-AudioImporter:
- serializedVersion: 4
- format: 0
- quality: -1
- stream: 1
- 3D: 1
- forceToMono: 0
- useHardware: 0
- loopable: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4 b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4
deleted file mode 100644
index fa0f789f..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4.meta
deleted file mode 100644
index 2c94c214..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_360p30.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7527b43fd045ed54696948590f83aa55
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4 b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4
deleted file mode 100644
index f059fd9d..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4.meta
deleted file mode 100644
index b2565e28..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/BigBuckBunny_720p30.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: eeac93a986e026742ab84f895e5df439
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4 b/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4
deleted file mode 100644
index 8bc8fb72..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4.meta
deleted file mode 100644
index 1ba41671..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/Sample180.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 33aebd7d37ebbe841a76e3804eb275ae
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4 b/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4
deleted file mode 100644
index 5d294d8d..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4.meta
deleted file mode 100644
index 09186a89..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/SampleCube.mp4.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eef6c0eb13122994f969092a1ac6b438
-timeCreated: 1466700986
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4 b/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4
deleted file mode 100644
index 65e04add..00000000
Binary files a/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4.meta b/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4.meta
deleted file mode 100644
index ed794dfa..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/SampleSphere.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 52b4b65f0e008374188bacb9d2990d1f
-MovieImporter:
- serializedVersion: 1
- quality: .5
- linearTexture: 0
- userData:
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt b/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt
deleted file mode 100644
index 828bd3ec..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt
+++ /dev/null
@@ -1,20 +0,0 @@
-1
-00:00:00,000 --> 00:00:02,000
-This is a demo of the SRT subtitles...
-
-2
-00:00:02,000 --> 00:00:04,000
-Mutliple lines
-are supported!
-
-3
-00:00:04,000 --> 00:00:5,000
-Rich text colours bold and italics too!
-
-4
-00:00:05,000 --> 00:00:06,000
-Rich text colours bold and italics too!
-
-5
-00:00:06,000 --> 00:00:15,000
-Rich text colours bold and italics too!
\ No newline at end of file
diff --git a/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt.meta b/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt.meta
deleted file mode 100644
index ad1413bf..00000000
--- a/Assets/StreamingAssets/AVProVideoSamples/SampleSubtitles.srt.meta
+++ /dev/null
@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: e5b1854bd0cb0194d831a7a47aa82dc0
-DefaultImporter:
- userData:
diff --git a/Assets/StreamingAssets/Captures/1708937194911001.mp4 b/Assets/StreamingAssets/Captures/1708937194911001.mp4
deleted file mode 100644
index edf3ed4c..00000000
Binary files a/Assets/StreamingAssets/Captures/1708937194911001.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/Captures/1708937194911001.mp4.meta b/Assets/StreamingAssets/Captures/1708937194911001.mp4.meta
deleted file mode 100644
index 85c79821..00000000
--- a/Assets/StreamingAssets/Captures/1708937194911001.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f0bac725e6987de4494dc4f205fc79cf
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/StreamingAssets/Captures/1708943068645001.mp4 b/Assets/StreamingAssets/Captures/1708943068645001.mp4
deleted file mode 100644
index 04f2cf0c..00000000
Binary files a/Assets/StreamingAssets/Captures/1708943068645001.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/Captures/1708943068645001.mp4.meta b/Assets/StreamingAssets/Captures/1708943068645001.mp4.meta
deleted file mode 100644
index a5ef9871..00000000
--- a/Assets/StreamingAssets/Captures/1708943068645001.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 73d927cb7b3be4e489e1adf4bd6692bb
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/StreamingAssets/Captures/1709007920639001.mp4 b/Assets/StreamingAssets/Captures/1709007920639001.mp4
deleted file mode 100644
index 9472bf40..00000000
Binary files a/Assets/StreamingAssets/Captures/1709007920639001.mp4 and /dev/null differ
diff --git a/Assets/StreamingAssets/Captures/1709007920639001.mp4.meta b/Assets/StreamingAssets/Captures/1709007920639001.mp4.meta
deleted file mode 100644
index 7bf54d35..00000000
--- a/Assets/StreamingAssets/Captures/1709007920639001.mp4.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3970221b4d3fbd445b091def32d71ec2
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Temp/Scripts/Backpack.cs b/Assets/Temp/Scripts/Backpack.cs
index 61b39764..25ce94ea 100644
--- a/Assets/Temp/Scripts/Backpack.cs
+++ b/Assets/Temp/Scripts/Backpack.cs
@@ -114,7 +114,8 @@ public class Backpack : MonoBehaviour
return;
}
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", Id);
- _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+ MyNetMQClient.instance.Send(nowData);
+ //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
//MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
WWWForm headers = new WWWForm();
headers.AddField("id", Id);
@@ -131,7 +132,8 @@ public class Backpack : MonoBehaviour
return;
}
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", wrjid);
- _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+ MyNetMQClient.instance.Send(nowData);
+ //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
//MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
WWWForm headers = new WWWForm();
headers.AddField("id", wrjid);
diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs
index af67e333..74f7ca35 100644
--- a/Assets/Zion/Scripts/Adam/DeviceManager.cs
+++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs
@@ -1,5 +1,3 @@
-using AdamSync;
-using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System.Text;
@@ -77,16 +75,6 @@ public class DeviceManager : MonoSingleton
#endif
}
- //IEnumerator DequeueSend2roomStr()
- //{
- // while (send2roomStr.Count > 0)
- // {
- // _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue()));
- // yield return new WaitForSeconds(0.05f);
- // if (send2roomStr.Count == 0)
- // isOnlyOne = true;
- // }
- //}
public void AddDevice(EquipmentCommon d)
{
diff --git a/Assets/Zion/Scripts/Adam/DragManager.cs b/Assets/Zion/Scripts/Adam/DragManager.cs
index 89251df0..41e1c5ec 100644
--- a/Assets/Zion/Scripts/Adam/DragManager.cs
+++ b/Assets/Zion/Scripts/Adam/DragManager.cs
@@ -1,11 +1,5 @@
-using Cysharp.Threading.Tasks.Triggers;
-using LitJson;
-using System.Collections;
using System.Collections.Generic;
-using UnityEditor;
using UnityEngine;
-using UnityEngine.UI;
-using XFrame.Core.Utils;
public class DragManager : MonoSingleton
{
diff --git a/Assets/Zion/Scripts/Wzx/ModerShow.cs b/Assets/Zion/Scripts/Wzx/ModerShow.cs
new file mode 100644
index 00000000..4a8519ea
--- /dev/null
+++ b/Assets/Zion/Scripts/Wzx/ModerShow.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ModerShow : MonoBehaviour
+{
+
+ public GameObject Prefabs1;
+ // Start is called before the first frame update
+ void Awake()
+ {
+
+ }
+}
diff --git a/Assets/Zion/Scripts/Wzx/ModerShow.cs.meta b/Assets/Zion/Scripts/Wzx/ModerShow.cs.meta
new file mode 100644
index 00000000..679dcf2a
--- /dev/null
+++ b/Assets/Zion/Scripts/Wzx/ModerShow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eb7fa04e6ab6ef3478f24f79d74062f3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: