Compare commits

...

3 Commits

Author SHA1 Message Date
YangHua f7bdeededb 1 2023-09-16 21:32:47 +08:00
YangHua 5e7cab268c 融合 2023-09-16 21:30:34 +08:00
YangHua 73c70b3d28 添加试卷接口,修改跳场景逻辑。 2023-09-16 21:29:09 +08:00
24 changed files with 1770 additions and 65 deletions

View File

@ -0,0 +1,258 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230916
//@company QianHuo
//
//@description:
//============================================================
namespace EData
{
[Serializable]
public class Root
{
/// <summary>
///
/// </summary>
public string state;
/// <summary>
///
/// </summary>
public string message;
/// <summary>
///
/// </summary>
public Data data;
}
[Serializable]
public class Data
{
/// <summary>
///
/// </summary>
public ExamusersData exam;
/// <summary>
///
/// </summary>
public List<ListItem> list;
}
[Serializable]
public class ListItem
{
/// <summary>
///
/// </summary>
public string id;
/// <summary>
///
/// </summary>
public string exam_id;
/// <summary>
/// 用户9600001129
/// </summary>
public string user_no;
/// <summary>
/// 仪征市弘桥路
/// </summary>
public string Address;
/// <summary>
/// 刘生萍
/// </summary>
public string UserName;
/// <summary>
///
/// </summary>
public string AreaID;
/// <summary>
///
/// </summary>
public string AreaName;
/// <summary>
///
/// </summary>
public string UserType;
/// <summary>
///
/// </summary>
public string BiaoType;
/// <summary>
/// 自建房场景
/// </summary>
public string Scene;
/// <summary>
/// 干扰
/// </summary>
public string UserState;
/// <summary>
///
/// </summary>
public int A;
/// <summary>
///
/// </summary>
public int V;
/// <summary>
///
/// </summary>
public int AA;
/// <summary>
///
/// </summary>
public int AV;
/// <summary>
///
/// </summary>
public int BA;
/// <summary>
///
/// </summary>
public int BV;
/// <summary>
///
/// </summary>
public int CA;
/// <summary>
///
/// </summary>
public int CV;
/// <summary>
///
/// </summary>
public int Beilv;
/// <summary>
///
/// </summary>
public int PVW;
/// <summary>
///
/// </summary>
public int PVNumber;
/// <summary>
///
/// </summary>
public int DCW;
/// <summary>
/// 电流异常
/// </summary>
public string WarningType;
/// <summary>
/// 电能表短接
/// </summary>
public string OnSite;
/// <summary>
///
/// </summary>
public int Angle;
/// <summary>
///
/// </summary>
public string IsChange;
/// <summary>
///
/// </summary>
public string create_time;
/// <summary>
///
/// </summary>
public string r1;
/// <summary>
///
/// </summary>
public string r2;
/// <summary>
///
/// </summary>
public string r3;
/// <summary>
///
/// </summary>
public string r4;
/// <summary>
///
/// </summary>
public string r5;
/// <summary>
///
/// </summary>
public int v1;
/// <summary>
///
/// </summary>
public int v2;
/// <summary>
///
/// </summary>
public int v3;
/// <summary>
///
/// </summary>
public int v4;
/// <summary>
///
/// </summary>
public int v5;
}
[Serializable]
public class ExamusersData
{
/// <summary>
///
/// </summary>
public string id;
/// <summary>
/// 试卷11
/// </summary>
public string exam_name;
/// <summary>
/// 已发布
/// </summary>
public string state;
/// <summary>
///
/// </summary>
public string start_time;
/// <summary>
///
/// </summary>
public string end_time;
/// <summary>
///
/// </summary>
public string create_time;
/// <summary>
///
/// </summary>
public string create_user_id;
/// <summary>
///
/// </summary>
public string r1;
/// <summary>
///
/// </summary>
public string r2;
/// <summary>
///
/// </summary>
public string r3;
/// <summary>
///
/// </summary>
public string r4;
/// <summary>
///
/// </summary>
public string r5;
/// <summary>
///
/// </summary>
public string state_dsc;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c78b90f0637536c4b9c7713726a02763
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -15,24 +15,15 @@ namespace Data
[Serializable]
public class SceneInfoData
{
public bool state;
public string message;
public string data;
public string info0;
public string info1;
public string info2;
public SceneInfoData(bool state, string message, string data)
public SceneInfoData(string info0, string info1, string info2)
{
this.state = state;
this.message = message;
this.data = data;
this.info0 = info0;
this.info1 = info1;
this.info2 = info2;
}
}
//public class Data
//{
// public string Isguangfu;pu
// public string jxfs;
// public string zhbl;
//}
}

View File

@ -0,0 +1,40 @@
using EData;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Utility;
//============================================================
//支持中文文件使用UTF-8编码
//@author YangHua
//@create 20230916
//@company Adam
//
//@description:
//============================================================
namespace Adam
{
public class ExamusersController : MonoSingleton<ExamusersController>
{
public string url = "http://111.229.30.246:10013/Handler/Banzugz.ashx?action=examusers";
public Root root = new Root();
// Use this for initialization
private async void Start()
{
root = await AsyncWebReq.Get<Root>(url);
}
public string GetSceneInfoByUseNo(string useNo)
{
string sceneInfo = "";
for (int i = 0; i < root.data.list.Count; i++)
{
int index = i;
string userNoTemp = ToolUtility.GetEliminateInfo(root.data.list[index].user_no, "用户");
if (useNo == userNoTemp)
sceneInfo = root.data.list[index].BiaoType + "_" + root.data.list[index].Scene;
}
return sceneInfo;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f51dce460a1c6684fb8711c5ef6f2bb7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,53 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ExitCheckController : MonoBehaviour
{
public GameObject ExitCheckPanel;
public Button QDButton;
public Button QXButton;
public Text text_sub;
public int num_click;
public Toggle AbnormalRecords;
public GameObject toEcitCheckPanel;
// Start is called before the first frame update
void Start()
{
num_click = 0;
QDButton.onClick.AddListener(() =>
{
num_click++;
ResetPlane();
});
QXButton.onClick.AddListener(() =>
{
num_click = 0;
ExitCheckPanel.SetActive(false);
});
toEcitCheckPanel.SetActive(false);
}
public void ResetPlane()
{
switch (num_click)
{
case 0:
text_sub.text = "是否确认退出检查!!!";
break;
case 1:
text_sub.text = "结束检查后无法重回现场检查,请填写纸质通知单及处理单。";
break;
case 2:
ExitCheckPanel.SetActive(false);
AbnormalRecords.isOn = true;
AbnormalRecords.onValueChanged.Invoke(true);
toEcitCheckPanel.SetActive(true);
break;
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0f503fa20332e6b488c75fb12b572837
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -13,39 +13,52 @@ using Utility;
//
//@description:
//============================================================
namespace QianHuo
namespace Adam
{
public class GoToSceneController : MonoBehaviour
{
public Button goToSceneBtn;
public InputField userID;
public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=changjing&bianhao=";
public GameObject GoToTheScenePlane;
// Use this for initialization
private void Start()
{
goToSceneBtn.onClick.AddListener(OnGo);
}
public async void OnGo()
public void OnGo()
{
string _url = url + userID.text;
SceneInfoData sceneInfoData = await AsyncWebReq.Get<SceneInfoData>(_url);
string sceneInfo = ExamusersController.Instance.GetSceneInfoByUseNo(userID.text);
string[] tt = ToolUtility.GetInfo(sceneInfo, '_');
SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
GlobalFlag.sceneData = sceneInfoData;
string[] tt = ToolUtility.GetInfo(sceneInfoData.message,'_');
foreach (var item in tt)
switch (tt[3])
{
Debug.Log(item);
case "自建房场景":
SceneLoad.Instance.SceneChange("居民自建");
break;
case "农家乐场景":
SceneLoad.Instance.SceneChange("农家乐");
break;
case "小商户场景":
SceneLoad.Instance.SceneChange("小商户");
break;
case "农贸市场场景":
SceneLoad.Instance.SceneChange("农贸市场");
break;
}
SwitchPanel();
UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
}
if (tt[tt.Length-1].Equals("小商户"))
{
SceneLoad.Instance.SceneChange("农家乐");
}
Debug.Log(sceneInfoData.message);
Debug.Log(GlobalFlag.sceneData.message);
public void SwitchPanel()
{
GoToTheScenePlane.SetActive(false);
}
}
}

View File

@ -0,0 +1,47 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
using static UnityEditor.Progress;
public class NameplateController : MonoSingleton<NameplateController>
{
public GameObject NameplatePanel;
public RectTransform backTransform;
public RectTransform mtTransform;
public Image NameplateImage;
public List<TextMeshProUGUI> NameplateTextUGUI;
public GameObject[] Obj_Nameplate;
public Dictionary<string, TextMeshProUGUI> DictextMeshPro;
private void Start()
{
AddNameplateClick();
}
public void AddNameplateClick()
{
DictextMeshPro = new Dictionary<string, TextMeshProUGUI>();
DictextMeshPro.Add("低压互感器铭牌", NameplateTextUGUI[0]);
DictextMeshPro.Add("光伏并网逆变器_铭牌", NameplateTextUGUI[1]);
DictextMeshPro.Add("光伏板_铭牌", NameplateTextUGUI[2]);
Obj_Nameplate = GameObject.FindGameObjectsWithTag("铭牌");
foreach (GameObject item in Obj_Nameplate)
{
item.AddComponent<ShowNameplate>();
}
}
public void RefreshShown()
{
foreach (TextMeshProUGUI item in NameplateTextUGUI)
{
item.gameObject.SetActive(false);
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cc25b72920da7264484d0ba561f50593
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,54 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ShowNameplate : MonoBehaviour
{
private string myName;
private float multiple;
private void Start()
{
myName = gameObject.name;
multiple = 1.0f;
}
private void OnMouseDown()
{
NameplateController.Instance.RefreshShown();
if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName))
{
return;
}
Sprite sprite = Resources.Load<Sprite>("Texture/" + myName);
NameplateController.Instance.NameplateImage.overrideSprite = sprite;
NameplateController.Instance.NameplateImage.SetNativeSize();
switch (myName)
{
case "低压互感器铭牌":
multiple = 1.0f;
break;
case "光伏并网逆变器_铭牌":
multiple = 3.0f;
break;
case "光伏板_铭牌":
multiple = 1.5f;
break;
}
Vector2 bg = NameplateController.Instance.NameplateImage.rectTransform.sizeDelta;
NameplateController.Instance.backTransform.sizeDelta = bg / multiple + new Vector2(40, 40);
NameplateController.Instance.NameplateImage.rectTransform.sizeDelta = bg / multiple;
Vector2 mt = NameplateController.Instance.mtTransform.sizeDelta;
NameplateController.Instance.mtTransform.sizeDelta = new Vector2(NameplateController.Instance.backTransform.sizeDelta.x, mt.y);
NameplateController.Instance.DictextMeshPro[myName].text = "300";
NameplateController.Instance.DictextMeshPro[myName].gameObject.SetActive(true);
NameplateController.Instance.NameplatePanel.SetActive(true);
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d375468b78f47204f972759e4bd1ca64
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -19,20 +19,33 @@ public class UIManager : MonoSingleton<UIManager>
public AssignmentController assignmentController;
public BottomController bottomCotroller;
public JobCardController jobCardController;
public ExitCheckController exitCheckController;
public Button exitBtn;
public Button backToToolBtn;
// Use this for initialization
private void Start()
{
exitBtn.onClick.AddListener(OnExit);
exitBtn.onClick.AddListener(() =>
{
if (exitCheckController.num_click != 2)
{
exitCheckController.ResetPlane();
exitCheckController.ExitCheckPanel.SetActive(true);
}
else
{
Application.Quit();
}
});
exitBtn.gameObject.SetActive(false);
backToToolBtn.onClick.AddListener(BackToTool);
backToToolBtn.gameObject.SetActive(false);
DontDestroyOnLoad(this);
}
public void OnExit()
private void BackToTool()
{
Application.Quit();
}
SceneLoad.Instance.SceneChange("工具间场景");
}
}

View File

@ -18,10 +18,22 @@ namespace Utility
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
public static string[] GetInfo(string info,char t)
public static string[] GetInfo(string info, char t)
{
string[] result = info.Split(t);
return result;
}
/// <summary>
/// 剔除字符串
/// </summary>
/// <param name="info"></param>
/// <param name="eliminate"></param>
/// <returns></returns>
public static string GetEliminateInfo(string info, string eliminate)
{
string result = info.Replace(eliminate, "");
return result;
}
}
}

View File

@ -2,7 +2,10 @@ fileFormatVersion: 2
guid: 13e6757fcb98e1e4bbc94e07f67e0dbb
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects:
- first:
type: UnityEngine:Material

View File

@ -2,7 +2,10 @@ fileFormatVersion: 2
guid: 52b05e392bba9ba47979c46f8f9277cc
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects:
- first:
type: UnityEngine:Material

View File

@ -2,7 +2,10 @@ fileFormatVersion: 2
guid: 6fbd9caa46e05824fb3eba389c7d1b27
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects:
- first:
type: UnityEngine:Material

View File

@ -2,7 +2,10 @@ fileFormatVersion: 2
guid: e3e9f4bb87aa03546b0aa500d71c9a5f
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects:
- first:
type: UnityEngine:Material

View File

@ -2,7 +2,10 @@ fileFormatVersion: 2
guid: 6b79bb0092bf09c4c8044d9cc6913f3e
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
internalIDToNameTable:
- first:
74: 1827226128182048838
second: Take 001
externalObjects:
- first:
type: UnityEngine:Material

View File

@ -0,0 +1,106 @@
fileFormatVersion: 2
guid: faddc18007c78aa45be01ef04f74ceae
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 1
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -35,12 +35,12 @@
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.rider": "3.0.15",
"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.2.2"
"com.unity.testtools.codecoverage": "1.0.1"
}
},
"com.unity.ide.rider": {
@ -92,7 +92,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.services.core": {
"version": "1.6.0",
"version": "1.4.2",
"depth": 1,
"source": "registry",
"dependencies": {
@ -121,7 +121,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.2",
"version": "1.0.1",
"depth": 1,
"source": "registry",
"dependencies": {

View File

@ -16,5 +16,14 @@ EditorBuildSettings:
guid: 9c3f2fccc37312b468a01a18ac50fcd9
- enabled: 1
path: "Assets/Scenes/\u519C\u5BB6\u4E50.unity"
guid: de0336ee94e67ab4c833d43d5a4b97bc
guid: 078bf002eeddc4148b312262d92ea4a2
- enabled: 1
path: "Assets/Scenes/\u519C\u8D38\u5E02\u573A.unity"
guid: 8f5e8de28c5defb4cafaabb4ec174d27
- enabled: 1
path: "Assets/Scenes/\u5C0F\u5546\u6237.unity"
guid: 3242dae0c87324f41b8f009209999228
- enabled: 1
path: "Assets/Scenes/\u5C45\u6C11\u81EA\u5EFA.unity"
guid: fe407f4f4fc16f84d875eb2e09717046
m_configObjects: {}

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.15f1c1
m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)
m_EditorVersion: 2021.3.10f1c2
m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5)