Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition

# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab

SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs

@@ -19,6 +19,7 @@ public class GameLauncher : MonoBehaviour
     [Tooltip("在编辑器下模拟运行")]
     public bool SimulationOnEditor = true;
 
+    public string sceneName;
     void Awake()
     {
 #if !UNITY_EDITOR
@@ -36,7 +37,7 @@ public class GameLauncher : MonoBehaviour
         // 创建游戏模块
         CreateGameModules();
 
-        SceneManager.LoadScene("묏야쇌");
+        SceneManager.LoadScene(sceneName);
     }
     void Update()
     {

SXElectricityInformationAcquisition/Assets/Framework/ThirdParty/NaughtyAttributes/Scripts/Test/SceneToolsBtOnClickTest.cs

@@ -2,7 +2,7 @@
 
 namespace NaughtyAttributes.Test
 {
-    public class SceneTest : MonoBehaviour
+    public class SceneToolsBtOnClickTest : MonoBehaviour
     {
         [Scene]
         public string scene0;

SXElectricityInformationAcquisition/Assets/Model/工具/Mat/yandianbishen.mat

@@ -1,83 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: yandianbishen
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.14142135
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 0.15000519, g: 0.43258724, b: 0.40619972, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []

SXElectricityInformationAcquisition/Assets/Model/工具/Mat/yandianbixianshi.mat

@@ -1,85 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: yandianbixianshi
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _ALPHAPREMULTIPLY_ON
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 660ab9da392b6a94e84d382c39ff2973, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 10
-    - _GlossMapScale: 1
-    - _Glossiness: 0.14142135
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 3
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 0
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []

SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat

@@ -7,8 +7,8 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: yandianbitou
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Name: Electroprobe_mat
+  m_Shader: {fileID: 4800000, guid: 05135f69c99a2914098b433aa80d9fbe, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -40,11 +40,11 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _EmissionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: dd71a43e709951743854a48bddfb35f8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 96679209254674a4fa01e7ee991ea5bb, type: 3}
+        m_Texture: {fileID: 2800000, guid: ad25aa5846bbe1f41afaf271bfa53e74, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -59,6 +59,34 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Tex_D:
+        m_Texture: {fileID: 2800000, guid: ad25aa5846bbe1f41afaf271bfa53e74, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex_E:
+        m_Texture: {fileID: 2800000, guid: dd71a43e709951743854a48bddfb35f8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex_MRao:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex_Mp:
+        m_Texture: {fileID: 2800000, guid: 58e7b5467a5f44e44b86d55a22b00f4c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex_N1:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Tex_N2:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
@@ -68,6 +96,12 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.14142135
     - _GlossyReflections: 1
+    - _Int_M: 1
+    - _Int_N1: 1
+    - _Int_N2: 1
+    - _Int_R: 1
+    - _Int_S: 1
+    - _Int_ao: 1
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
@@ -76,8 +110,12 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
+    - _Whiteint: 0
     - _ZWrite: 1
+    - __dirty: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Int_E: {r: 1, g: 0, b: 0, a: 0}
+    - _MainCol: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []

SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 70347b745de4a1647ac9f5c07e085ef3
+guid: a09bcf13701d86049ac4e1219d051234
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

SXElectricityInformationAcquisition/Assets/Model/工具/Prefab/验电笔.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2038441939940343167}
-  - component: {fileID: 4082963790152404584}
-  - component: {fileID: 3232903256917466313}
+  - component: {fileID: 7518206150319689926}
+  - component: {fileID: 3410143886686102134}
   m_Layer: 0
   m_Name: surface
   m_TagString: Untagged
@@ -28,12 +28,12 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0.00042, y: -0.00774, z: -0.0164}
-  m_LocalScale: {x: 0.013, y: 0.033, z: 1}
+  m_LocalScale: {x: 0.0026850183, y: 0.013216278, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1245463814537934017}
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
---- !u!33 &4082963790152404584
+--- !u!33 &7518206150319689926
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,7 +41,7 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7661601162608444638}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &3232903256917466313
+--- !u!23 &3410143886686102134
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 4bb71a41e0a8de94183ac98446acfcf7, type: 2}
+  - {fileID: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -117,19 +117,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -6.123234e-17
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -4.0767898e-24
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.00000006657903
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 68467c2fd5fa82845950ebe0d0daf4eb, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -360,7 +360,7 @@ MonoBehaviour:
   seeThroughTexture: {fileID: 0}
   seeThroughTextureUVSpace: 0
   seeThroughTextureScale: 1
-  rmsCount: 1
+  rmsCount: 2
   hitFxInitialIntensity: 0
   hitFxMode: 0
   hitFxFadeOutDuration: 0.25
@@ -381,8 +381,6 @@ MonoBehaviour:
   _modelTypeEnum: 0
   _toolsPackScene: 0
   IsClick: 1
-<<<<<<< HEAD
-=======
 --- !u!1001 &3349601928785135740
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -493,4 +491,3 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 3397580018280148513, guid: 8c6cc743aff6c8a46b16bc887a75354b, type: 3}
   m_PrefabInstance: {fileID: 3349601928785135740}
   m_PrefabAsset: {fileID: 0}
->>>>>>> ee2bdaacaf7ad6a4bf3a91c999b63789e98e44fa

SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_D.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 660ab9da392b6a94e84d382c39ff2973
+guid: ad25aa5846bbe1f41afaf271bfa53e74
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -93,6 +93,19 @@ TextureImporter:
     ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_E.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 96679209254674a4fa01e7ee991ea5bb
+guid: dd71a43e709951743854a48bddfb35f8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -93,6 +93,19 @@ TextureImporter:
     ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

SXElectricityInformationAcquisition/Assets/Model/工具/Tex/验电笔_Mp.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 58e7b5467a5f44e44b86d55a22b00f4c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 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
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SXElectricityInformationAcquisition/Assets/Model/工具/验电笔.FBX.meta

@@ -4,6 +4,11 @@ ModelImporter:
   serializedVersion: 22200
   internalIDToNameTable: []
   externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Electroprobe_mat
+    second: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
   - first:
       type: UnityEngine:Material
       assembly: UnityEngine.CoreModule
@@ -29,6 +34,21 @@ ModelImporter:
       assembly: UnityEngine.CoreModule
       name: yandianbitou
     second: {fileID: 2800000, guid: 96679209254674a4fa01e7ee991ea5bb, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: "\u9A8C\u7535\u7B14_D"
+    second: {fileID: 2800000, guid: ad25aa5846bbe1f41afaf271bfa53e74, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: "\u9A8C\u7535\u7B14_E"
+    second: {fileID: 2800000, guid: dd71a43e709951743854a48bddfb35f8, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: "\u9A8C\u7535\u7B14_Mp"
+    second: {fileID: 2800000, guid: 58e7b5467a5f44e44b86d55a22b00f4c, type: 3}
   materials:
     materialImportMode: 2
     materialName: 0
@@ -60,7 +80,7 @@ ModelImporter:
     isReadable: 0
   meshes:
     lODScreenPercentages: []
-    globalScale: 2
+    globalScale: 1.5
     meshCompression: 0
     addColliders: 0
     useSRGBMaterialColor: 1
@@ -115,7 +135,7 @@ ModelImporter:
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
-    globalScale: 0.002
+    globalScale: 1.5
     rootMotionBoneName: 
     hasTranslationDoF: 0
     hasExtraRoot: 0

SXElectricityInformationAcquisition/Assets/Scenes/Start.unity

@@ -251,6 +251,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 195
       objectReference: {fileID: 0}
+    - target: {fileID: 3598037006673712039, guid: fa12b84946083d14cb4447029910be28, type: 3}
+      propertyPath: sceneName
+      value: "\u5DE5\u5177\u95F4"
+      objectReference: {fileID: 0}
     - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
       propertyPath: m_Name
       value: APP

SXElectricityInformationAcquisition/Assets/Scenes/单独.unity.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: f119ee5d7f4db594cb4d7c9e9716c15f
-NativeFormatImporter:
+guid: c796527aade6414438447cd5375b961b
+DefaultImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

SXElectricityInformationAcquisition/Assets/Scripts/Alone.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 3632192afc114fa49b55ed3055dd9cf9
-NativeFormatImporter:
+guid: d0e0d5324d420854e843e7e915271f9f
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

SXElectricityInformationAcquisition/Assets/Scripts/Alone/SceneToolsBtOnClick.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using MotionFramework;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class SceneToolsBtOnClick : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    public GameObject textGame;
+    public GameObject selectGame;
+
+    private void Start()
+    {
+        this.GetComponent<Button>().onClick.AddListener(delegate
+        {
+            MotionEngine.GetModule<ToolsPackManager>().OnTriggerStringEvent(this.name);
+        });
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        textGame.SetActive(true);
+        selectGame.SetActive(true);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        textGame.SetActive(false);
+        selectGame.SetActive(false);
+    }
+}

SXElectricityInformationAcquisition/Assets/Scripts/Alone/SceneToolsBtOnClick.cs.meta

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

SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs

@@ -40,22 +40,22 @@ namespace DefaultNamespace
 
         public void SetProcessMode(int index)
         {
-            if (index == 0)// 教学模式
-            {
-                _processMode = DefaultNamespace.ProcessMode.ProcessMode.Teaching;
-            }
-            else if (index == 1)// 培训模式
-            {
-                _processMode = DefaultNamespace.ProcessMode.ProcessMode.Training;
-            }
-            else if (index == 2)// 练习模式
+            if (index == 0)// 练习模式 
             {
                 _processMode = DefaultNamespace.ProcessMode.ProcessMode.Practice;
             }
-            else if (index == 3)// 考核模式
+            else if (index == 1)// 考核模式
             {
                 _processMode = DefaultNamespace.ProcessMode.ProcessMode.Assessment;
             }
+            else if (index == 2)// 教学模式
+            {
+                _processMode = DefaultNamespace.ProcessMode.ProcessMode.Teaching;
+            }
+            else if (index == 3)// 培训模式
+            {
+                _processMode = DefaultNamespace.ProcessMode.ProcessMode.Training;
+            }
             
             
             

SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using HighlightPlus;
 using MotionFramework;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 using Type = System.Type;
@@ -157,28 +158,62 @@ namespace DefaultNamespace.ProcessMode
             if (currentActionIndex >= step.Actions.Count)
             {
                 Debug.Log("所有动作完成！");
-                currentActionIndex = 0; // 重置动作索引或进入下一个大步骤
-                currentStepIndex++;
-                if (currentStepIndex < processes[currentMode.ToString()].Steps.Count)
-                {
-                    // if (currentMode == ProcessMode.Practice)
-                    // {
-                    //     var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
-                    //     HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
-                    // }
 
-                    var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
-                    HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
+                if (currentMode == ProcessMode.Practice)
+                {
+                    if (currentStepIndex < processes[currentMode.ToString()].Steps.Count)
+                    {
+                        // if (currentMode == ProcessMode.Practice)
+                        // {
+                        //     var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
+                        //     HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
+                        // }
+
+                        var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
+                        HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
+                        
+                        currentActionIndex = 0; // 重置动作索引或进入下一个大步骤
+                        currentStepIndex++;
+                    }
+                    else
+                    {
+                        if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.其他)
+                        {
+                            OnCompleteEvent?.Invoke();
+                        }
+
+                        Debug.Log("全部完成了！！！！");
+                    }
                 }
                 else
                 {
-                    if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.其他)
+                    currentActionIndex = 0; // 重置动作索引或进入下一个大步骤
+                    currentStepIndex++;
+                    if (currentStepIndex < processes[currentMode.ToString()].Steps.Count)
                     {
-                        OnCompleteEvent?.Invoke();
-                    }
+                        // if (currentMode == ProcessMode.Practice)
+                        // {
+                        //     var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
+                        //     HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
+                        // }
 
-                    Debug.Log("全部完成了！！！！");
+                        var nextStep = processes[currentMode.ToString()].Steps[currentStepIndex];
+                        HandleModeFeedback(currentMode, nextStep.Actions[0]); // 准备下一个步骤
+                    }
+                    else
+                    {
+                        if (MotionEngine.GetModule<ToolsPackManager>().GetToolsPackScene() == ToolsPackScene.其他)
+                        {
+                            OnCompleteEvent?.Invoke();
+                        }
+
+                        Debug.Log("全部完成了！！！！");
+                    }
                 }
+
+
+               
+                
             }
             else
             {

SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs

@@ -17,6 +17,8 @@ namespace DefaultNamespace.ProcessMode
         [SerializeField] private ToolsPackScene _toolsPackScene;
         [SerializeField] private ProcessMode _processMode;
 
+        
+        
         private async void Start()
         {
             await Task.Delay(TimeSpan.FromSeconds(1));
@@ -65,7 +67,8 @@ namespace DefaultNamespace.ProcessMode
                 processManager.AddStepToProcess(_processMode.ToString(), step);
             }
 
-            if (_processMode == ProcessMode.Teaching)
+            //教学模式和培训模式需要初始化一下
+            if (_processMode == ProcessMode.Teaching||_processMode == ProcessMode.Training)
                 InitializeFirstStep();
         }
 

SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsSceneStepData - 副本.json

@@ -0,0 +1,70 @@
+{
+  "steps": [
+    {
+      "stepDescription": "填写工作票",
+      "score": 0,
+      "actions": [
+        {
+          "description": "填写工作票",
+          "score": 0,
+          "isSequential": true,
+          "targetObjects": [
+            "工作单"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "领取工器具及仪器设备",
+      "score": 0,
+      "actions": [
+        {
+          "description": "领取工器具及仪器设备",
+          "score": 0,
+          "isSequential": false,
+          "targetObjects": [
+            "螺丝刀",
+            "剥线钳",
+            "绝缘胶带",
+            "验电笔",
+            "盒装封印",
+            "安全帽",
+            "纱布手套",
+            "工作服",
+            "l型集中器",
+            "梯子",
+            "工作证"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "佩戴装备检视",
+      "score": 0,
+      "actions": [
+        {
+          "description": "佩戴装备检视",
+          "score": 0,
+          "isSequential": false,
+          "targetObjects": [
+            "梳妆镜"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "前往现场",
+      "score": 0,
+      "actions": [
+        {
+          "description": "前往现场",
+          "score": 0,
+          "isSequential": false,
+          "targetObjects": [
+            "null"
+          ]
+        }
+      ]
+    }
+  ]
+}

SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsSceneStepData - 副本.json.meta

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

SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsSceneStepData.json

@@ -23,17 +23,7 @@
           "score": 0,
           "isSequential": false,
           "targetObjects": [
-            "螺丝刀",
-            "剥线钳",
-            "绝缘胶带",
-            "验电笔",
-            "盒装封印",
-            "安全帽",
-            "纱布手套",
-            "工作服",
-            "l型集中器",
-            "梯子",
-            "工作证"
+            "螺丝刀"
           ]
         }
       ]

SXElectricityInformationAcquisition/Assets/StreamingAssets/info.ini

@@ -1 +1 @@
-2024-06-14 15:04:12#'sxfz://;lyht,0,18,userId,username,token,90;/'|
+2024-06-14 15:04:12#'sxfz://;lyht,3,18,userId,username,token,90;/'|

SXElectricityInformationAcquisition/ProjectSettings/EditorBuildSettings.asset

@@ -20,4 +20,7 @@ EditorBuildSettings:
   - enabled: 1
     path: "Assets/Scenes/\u73B0\u573A _Test.unity"
     guid: 4108ee5a75cc45f4dbd6f2342a9936e0
+  - enabled: 1
+    path: "Assets/Scenes/\u5355\u72EC.unity"
+    guid: c796527aade6414438447cd5375b961b
   m_configObjects: {}