huqibin
/
10006_YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1101工程同步

This commit is contained in:
huqibin 2024-11-01 10:50:18 +08:00
parent e32d3b58e6
commit 683d70d90b
15 changed files with 626 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Sprites/低压台区/召测按钮.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

123
Assets/Resources/Sprites/低压台区/召测按钮.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: b0d0e691ccc06b14c9e91426887a7e19
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/低压台区/数据采集监控_搜索结果.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB

123
Assets/Resources/Sprites/低压台区/数据采集监控_搜索结果.jpg.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: dda7a6f24e0356647bbed869e22c32cf
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/低压台区/选中.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 805 B

123
Assets/Resources/Sprites/低压台区/选中.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 3feb94aa7398fe240bc09e6398989145
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Resources/Sprites/低压台区/透抄按钮.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

123
Assets/Resources/Sprites/低压台区/透抄按钮.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 3c65d4c668f596c468570daee20c003b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

43
Assets/Scripts/ComputerSystem/UI_ComputerSystemBasePanel.cs
View File

@ -1,11 +1,14 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class UI_ComputerSystemBasePanel : BasePanel
{
Button backObj;
Button closeObj;
protected Button backObj;
protected Button closeObj;
protected List<ImageTips> tipList;
protected Tween tween;
public override void ShowMe()
{
@ -18,6 +21,16 @@ public class UI_ComputerSystemBasePanel : BasePanel
closeObj = GetControl<Button>("closeBtn");
if (closeObj != null) closeObj.gameObject.SetActive(false);
tipList = ToolFuncManager.FindChildrenWithComponent<ImageTips>(this.transform);
foreach (var item in tipList)
{
if (item.gameObject.name == "ImageTips_1")
{
ActiveEmbededTip(item.gameObject);
}
}
}
else
{
@ -28,4 +41,30 @@ public class UI_ComputerSystemBasePanel : BasePanel
if (closeObj != null) closeObj.gameObject.SetActive(true);
}
}
public override void HideMe()
{
if (tween != null)
tween.Kill(true);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)//学习模式下隐藏关闭和回退按钮
if (tipList != null)
foreach (var item in tipList)
item.gameObject.SetActive(false);
}
public void ActiveEmbededTip(GameObject tip, Tween tween = null)
{
if (tween != null)
tween.Kill(true);
tip.gameObject.SetActive(true);
Image image = tip.GetComponent<Image>();
image.enabled = true;
if (tween == null) tween = this.tween;
tween = DOVirtual.Float(1, 0.3f, 0.5f, t =>
{
Color finalColor = image.color;
finalColor.a = t;
image.color = finalColor;
}).SetLoops(-1, LoopType.Yoyo);//HQB 原始数值：1,0.
}
}

13
Assets/Scripts/ComputerSystem/UI_ComputerSystemHomePagePanel.cs
View File

@ -1,18 +1,21 @@
using DG.Tweening;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using static UnityEngine.GraphicsBuffer;
public class UI_ComputerSystemHomePagePanel : UI_ComputerSystemBasePanel
{
public override void ShowMe()
{
base.ShowMe();
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
//GameManager.UIMgr.imageTips.ShowTips(GetControl<Button>("loginBtn").GetComponent<RectTransform>());
}
}
public override void HideMe()
{
base.HideMe();
}
/// <summary>
@ -32,4 +35,6 @@ public class UI_ComputerSystemHomePagePanel : UI_ComputerSystemBasePanel
break;
}
}
}

75
Assets/Scripts/ComputerSystem/UI_ComputerSystemJLZXJCPanel.cs
View File

@ -1,3 +1,4 @@
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -10,15 +11,45 @@ public class UI_ComputerSystemJLZXJCPanel : UI_ComputerSystemBasePanel
public GameObject TransResultPanel;//结果面板
public GameObject InterrogationPanel;//召测面板
public GameObject ResultPanel;//结果面板
public GameObject transcribeBtn;//透抄按钮
public GameObject interrogationBtn;//召测按钮
bool IsTranscribed = false;//已经透抄
bool IsInterrogation = false;//已经召测
Tween tween3;
Tween tween4;
/// <summary>
/// 查询结果选中后出发
/// </summary>
/// <param name="b"></param>
public void ActiveBtn(bool b)
{
transcribeBtn.SetActive(b);
interrogationBtn.SetActive(b);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
GameObject tip3 = ToolFuncManager.GetChild(this.transform, "ImageTips_3").gameObject;
ActiveEmbededTip(tip3, tween3);
GameObject tip4 = ToolFuncManager.GetChild(this.transform, "ImageTips_4").gameObject;
ActiveEmbededTip(tip4, tween4);
}
}
public override void ShowMe()
{
base.ShowMe();
TransResultPanel.SetActive(false);//透抄结果面板关闭
InterrogationPanel.SetActive(false);//召测面板关闭
IsTranscribed = false;//透抄结果为false
IsInterrogation = false;//召测结果为false
ResultPanel.SetActive(false);//结果面板关闭
transcribeBtn.SetActive(false);//透抄按钮关闭
interrogationBtn.SetActive(false);//召测按钮关闭
IsTranscribed = false;//透抄结果为false
IsInterrogation = false;//召测结果为false
GetControl<Button>("closeBtn").gameObject.SetActive(true);
}
@ -34,6 +65,15 @@ public class UI_ComputerSystemJLZXJCPanel : UI_ComputerSystemBasePanel
GameManager.UIMgr.HidePanel<UI_ComputerSystemJLZXJCPanel>();
GameManager.UIMgr.ShowPanel<UI_ComputerSystemHomePagePanel>();
break;
case "searchBtn":
ResultPanel.SetActive(true);//显示结果面板
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
ToolFuncManager.GetChild(this.transform, "ImageTips_1").gameObject.SetActive(false);//隐藏提示
GameObject tip2 = ToolFuncManager.GetChild(this.transform, "ImageTips_2").gameObject;
ActiveEmbededTip(tip2);
}
break;
case "transcribeBtn":
if (!IsTranscribed)
{
@ -52,6 +92,13 @@ public class UI_ComputerSystemJLZXJCPanel : UI_ComputerSystemBasePanel
{
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
ScoreManager.instance.Check(triggerName, "透抄检查完成");
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
if (tween != null)
tween.Kill(true);
GameObject tip5 = ToolFuncManager.GetChild(this.transform, "ImageTips_5").gameObject;
tip5.SetActive(false);
}
}
break;
}
@ -67,6 +114,18 @@ public class UI_ComputerSystemJLZXJCPanel : UI_ComputerSystemBasePanel
yield return new WaitForSeconds(3);
TransResultPanel.SetActive(false);//隐藏透抄结果面板
IsTranscribed = true;//透抄结果为true
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
if (tween3 != null)
tween3.Kill(true);
GameObject tip3 = ToolFuncManager.GetChild(this.transform, "ImageTips_3").gameObject;
tip3.SetActive(false);
if (IsInterrogation)
{
GameObject tip5 = ToolFuncManager.GetChild(this.transform, "ImageTips_5").gameObject;
ActiveEmbededTip(tip5);
}
}
}
protected IEnumerator Interrogation()
@ -75,5 +134,17 @@ public class UI_ComputerSystemJLZXJCPanel : UI_ComputerSystemBasePanel
yield return new WaitForSeconds(3);
InterrogationPanel.SetActive(false);//隐藏召测面板
IsInterrogation = true;//召测结果为true
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
if (tween4 != null)
tween4.Kill(true);
GameObject tip4 = ToolFuncManager.GetChild(this.transform, "ImageTips_4").gameObject;
tip4.SetActive(false);
if (IsTranscribed)
{
GameObject tip5 = ToolFuncManager.GetChild(this.transform, "ImageTips_5").gameObject;
ActiveEmbededTip(tip5);
}
}
}
}

1
Assets/StreamingAssets/Config/URLConfig.txt Normal file
View File

@ -0,0 +1 @@
练习学习,/member/pro/simulationStepRecord/addSubmitDetail

7
Assets/StreamingAssets/Config/URLConfig.txt.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0b473877c36c5cc4b999f390cb520900
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/StreamingAssets/WorkOrderAndWorkTicket.json
View File

@ -1,7 +1,7 @@
{
"workTicketItems": [
{
"schemeID": "4001",
"schemeID": "6001",
"workTicketLabels": [
"工作前开好开工会，工作负责人向工作班成员交代工作内容，安全注意事项和危险点",
"不得将未注册计算机接入内网，禁止违规外联",

3
ProjectSettings/ProjectSettings.asset
View File

@ -622,7 +622,8 @@ PlayerSettings:
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
webGLPowerPreference: 2
scriptingDefineSymbols: {}
scriptingDefineSymbols:
Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}