zhuyayu
/
E_ElecCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: zhuyayu:8e8edbc041a17786ba5c802f2bdb87dcad751027
Branches Tags
zhuyayu:master
zhuyayu:3d_latest
zhuyayu:E_vue
zhuyayu:后端
..
compare: zhuyayu:e67477d2b2675b1ea71fc5265c73e856f4cafa0f
Branches Tags
zhuyayu:3d_latest
zhuyayu:master
zhuyayu:E_vue
zhuyayu:后端

No commits in common. "8e8edbc041a17786ba5c802f2bdb87dcad751027" and "e67477d2b2675b1ea71fc5265c73e856f4cafa0f" have entirely different histories.
8e8edbc041 ... e67477d2b2

3 changed files with 11 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs
View File

@ -28,9 +28,9 @@ namespace Adam
public void OnGo()
{
string sceneInfo = ExamusersController.Instance.GetSceneInfoByUseNo(userID.text);
GlobalFlag.userId = userID.text;
Debug.Log(GlobalFlag.userId);
string[] tt = ToolUtility.GetInfo(sceneInfo, '_');
SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
GlobalFlag.sceneData = sceneInfoData;

15
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Views/ThreeTransformerPhotovoltaicView.cs
View File

@ -16,25 +16,22 @@ namespace Views
{
public class ThreeTransformerPhotovoltaicView : MonoBehaviour
{
public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=zhengchang&bianhao=";
public string trainStateUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=isright&bianhao=";
public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=rdjdydl&bianhao=";
public string trainStateUrl;
public SpriteRenderer spriteRenderer;
public TextMesh textMesh;
public string isFD;
public Sprite[] sprites;
public List<string> infos = new List<string>();
public ThreeTransformerPhotovoltaicData ttpData;
public TrainState trainData;
// Use this for initialization
private async void Start()
{
string _url = url + GlobalFlag.userId;
string trainUrl = trainStateUrl + GlobalFlag.userId;
Debug.Log(_url);
ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
ThreeTransformerPhotovoltaicData ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
infos = ttpData.data.rdj.ToList();
trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
Debug.Log(trainData);
TrainState trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
if (trainData.message == "正常")
{
infos.Add(ttpData.data.qxA);
@ -46,11 +43,9 @@ namespace Views
}
else
{
List<string> listTemp = ExamusersController.Instance.GetABCcurrentAndvoltage();
foreach (string info in listTemp)
foreach (string info in ExamusersController.Instance.GetABCcurrentAndvoltage())
{
infos.Add(info);
Debug .Log (info);
}
}
}

8
Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
View File

@ -35,12 +35,12 @@
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
"com.unity.test-framework": "1.1.31",
"com.unity.testtools.codecoverage": "1.0.1"
"com.unity.testtools.codecoverage": "1.2.2"
}
},
"com.unity.ide.rider": {
@ -92,7 +92,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.services.core": {
"version": "1.4.2",
"version": "1.6.0",
"depth": 1,
"source": "registry",
"dependencies": {
@ -121,7 +121,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.testtools.codecoverage": {
"version": "1.0.1",
"version": "1.2.2",
"depth": 1,
"source": "registry",
"dependencies": {