This commit is contained in:
parent
2fb543e382
commit
3fae2be142
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: e13e46625c4cb8246b59842d7a465810
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 6894a5f53c0213a4b967de1b7f08b6a6
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 5a19342578dcd6f409da399e58f39b34
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -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:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 7527b43fd045ed54696948590f83aa55
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: eeac93a986e026742ab84f895e5df439
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 33aebd7d37ebbe841a76e3804eb275ae
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: eef6c0eb13122994f969092a1ac6b438
|
|
||||||
timeCreated: 1466700986
|
|
||||||
licenseType: Store
|
|
||||||
DefaultImporter:
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 52b4b65f0e008374188bacb9d2990d1f
|
|
||||||
MovieImporter:
|
|
||||||
serializedVersion: 1
|
|
||||||
quality: .5
|
|
||||||
linearTexture: 0
|
|
||||||
userData:
|
|
|
@ -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 <font color="cyan">colours</font> <b>bold</b> and <i>italics</i> too!
|
|
||||||
|
|
||||||
4
|
|
||||||
00:00:05,000 --> 00:00:06,000
|
|
||||||
Rich text <font color="yellow">colours</font> <b>bold</b> and <i>italics</i> too!
|
|
||||||
|
|
||||||
5
|
|
||||||
00:00:06,000 --> 00:00:15,000
|
|
||||||
Rich text <font color="#00ff00">colours</font> <b>bold</b> and <i>italics</i> too!
|
|
|
@ -1,4 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: e5b1854bd0cb0194d831a7a47aa82dc0
|
|
||||||
DefaultImporter:
|
|
||||||
userData:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: f0bac725e6987de4494dc4f205fc79cf
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 73d927cb7b3be4e489e1adf4bd6692bb
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
Binary file not shown.
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 3970221b4d3fbd445b091def32d71ec2
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -114,7 +114,8 @@ public class Backpack : MonoBehaviour
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", Id);
|
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);
|
//MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
|
||||||
WWWForm headers = new WWWForm();
|
WWWForm headers = new WWWForm();
|
||||||
headers.AddField("id", Id);
|
headers.AddField("id", Id);
|
||||||
|
@ -131,7 +132,8 @@ public class Backpack : MonoBehaviour
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", wrjid);
|
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);
|
//MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
|
||||||
WWWForm headers = new WWWForm();
|
WWWForm headers = new WWWForm();
|
||||||
headers.AddField("id", wrjid);
|
headers.AddField("id", wrjid);
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
using AdamSync;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
@ -77,16 +75,6 @@ public class DeviceManager : MonoSingleton<DeviceManager>
|
||||||
#endif
|
#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)
|
public void AddDevice(EquipmentCommon d)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
using Cysharp.Threading.Tasks.Triggers;
|
|
||||||
using LitJson;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEditor;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
|
||||||
using XFrame.Core.Utils;
|
|
||||||
|
|
||||||
public class DragManager : MonoSingleton<DragManager>
|
public class DragManager : MonoSingleton<DragManager>
|
||||||
{
|
{
|
||||||
|
|
|
@ -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()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: eb7fa04e6ab6ef3478f24f79d74062f3
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue