111

SXElectricalInspection/Assets/Adam/Scenes/UI.unity

@@ -1561,7 +1561,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1050494125}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI
         m_MethodName: set_isOn
         m_Mode: 6
@@ -1985,7 +1985,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -55.900024, y: 11.099976}
+  m_AnchoredPosition: {x: -55.899902, y: 11.099976}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &161696237
@@ -5526,7 +5526,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.76862746}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.20784314}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6311,14 +6311,15 @@ RectTransform:
   - {fileID: 1869687406}
   - {fileID: 1183006622}
   - {fileID: 963964477}
+  - {fileID: 793225531}
   - {fileID: 1569486687}
   m_Father: {fileID: 258325414}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 26.764893, y: -120.6}
+  m_AnchoredPosition: {x: 26.764893, y: -118.9}
-  m_SizeDelta: {x: 299.7542, y: 142.27}
+  m_SizeDelta: {x: 300, y: 184}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &414392648
 MonoBehaviour:
@@ -6340,7 +6341,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8b2b941a6b1a1c045b1ced8acbf9f952, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 32223dc2fb3a5774e856bd9d5b931fe1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7537,6 +7538,7 @@ MonoBehaviour:
   userName: 
   PassWord: 
   nameTex: {fileID: 1869687407}
+  scenenameTex: {fileID: 793225532}
   im: {fileID: 342271194}
 --- !u!1 &467759764
 GameObject:
@@ -14865,6 +14867,86 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &793225530
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 793225531}
+  - component: {fileID: 793225533}
+  - component: {fileID: 793225532}
+  m_Layer: 5
+  m_Name: "\u573A\u666F\u540D\u79F0"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &793225531
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 793225530}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 414392647}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 31.2, y: 21.1}
+  m_SizeDelta: {x: 210, y: 31}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &793225532
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 793225530}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.06666667, g: 0.31764707, b: 0.6, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 8c07bd6e3e50e7f4f8060ddf2f0819aa, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 124
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8003\u751F\u73AF\u8282\uFF1A\u8003\u8BD5"
+--- !u!222 &793225533
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 793225530}
+  m_CullTransparentMesh: 1
 --- !u!1 &798819123
 GameObject:
   m_ObjectHideFlags: 0
@@ -16062,7 +16144,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 1050494125}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI
         m_MethodName: set_isOn
         m_Mode: 6
@@ -17554,7 +17636,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 31.2, y: -39.6}
+  m_AnchoredPosition: {x: 31.2, y: -60.2}
   m_SizeDelta: {x: 210, y: 31}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &963964478
@@ -18872,8 +18954,8 @@ GameObject:
   - component: {fileID: 1050494123}
   - component: {fileID: 1050494127}
   - component: {fileID: 1050494126}
-  - component: {fileID: 1050494125}
   - component: {fileID: 1050494124}
+  - component: {fileID: 1050494128}
   m_Layer: 5
   m_Name: "\u524D\u5F80\u73B0\u573A"
   m_TagString: Untagged
@@ -18917,54 +18999,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tipsContent: {fileID: 0}
   selfToggle: {fileID: 0}
---- !u!114 &1050494125
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1050494122}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 2
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 21300000, guid: 11dafa5094fa3ed4a96dbc694e370ced, type: 3}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1050494126}
-  toggleTransition: 1
-  graphic: {fileID: 0}
-  m_Group: {fileID: 0}
-  onValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_IsOn: 0
 --- !u!114 &1050494126
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -19003,6 +19037,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1050494122}
   m_CullTransparentMesh: 1
+--- !u!114 &1050494128
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1050494122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 2
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 21300000, guid: 11dafa5094fa3ed4a96dbc694e370ced, type: 3}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1050494126}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1052689575
 GameObject:
   m_ObjectHideFlags: 0
@@ -19853,13 +19931,11 @@ MonoBehaviour:
   - {fileID: 2047386840}
   - {fileID: 754664720}
   - {fileID: 439778730}
-  - {fileID: 1050494125}
   - {fileID: 659455338}
   panels:
   - {fileID: 5090827398298492658}
   - {fileID: 1052689575}
   - {fileID: 7718130227357316763}
-  - {fileID: 1189450973}
   - {fileID: 1906731477}
   buttomPanel: {fileID: 1309201382}
   firstPersonController: {fileID: 0}
@@ -19872,6 +19948,7 @@ MonoBehaviour:
   systemBtn: {fileID: 15852021}
   functionObj: {fileID: 1935876357}
   systemObj: {fileID: 519105125}
+  goToSceneBtn: {fileID: 1050494128}
 --- !u!114 &1067605748
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -22092,7 +22169,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 31.2, y: 0.000030517578}
+  m_AnchoredPosition: {x: 31.2, y: -20.1}
   m_SizeDelta: {x: 210, y: 31}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1183006623
@@ -22128,7 +22205,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8003\u751F\u73AF\u8282\uFF1A\u8003\u8BD5"
+  m_Text: "\u6A21\u5F0F\uFF1A\u8003\u8BD5"
 --- !u!222 &1183006624
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -29683,7 +29760,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 414392647}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -35768,7 +35845,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 40.4, y: 41.235}
+  m_AnchoredPosition: {x: 40, y: 60.209}
   m_SizeDelta: {x: 210, y: 31}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1869687407

SXElectricalInspection/Assets/Adam/Scripts/BottomController.cs

@@ -28,6 +28,7 @@ namespace Adam
         public Toggle systemBtn;
         public GameObject functionObj;
         public GameObject systemObj;
+        public Button goToSceneBtn;
         // Use this for initialization
         private void Start()
         {
@@ -60,6 +61,13 @@ namespace Adam
                     systemBtn.isOn = false;
                 });
             }
+            goToSceneBtn.onClick.AddListener(() =>
+            {
+                UIManager.Instance.goToScene.OnGo();
+                systemBtn.isOn = false;
+                functionBtn.isOn = false;
+                //systemObj.gameObject.SetActive(false);
+            });
             SwitchPanel(false);
             ladderTips = updownLadder.transform.GetChild(0).GetComponent<Image>();
             updownLadder.onValueChanged.AddListener((isOn) =>

SXElectricalInspection/Assets/Adam/Scripts/GoToSceneController.cs

@@ -22,14 +22,14 @@ namespace Adam
         public GameObject GoToTheScenePlane;
         public Text request;
         // Use this for initialization
-        private void Start()
+        //private void Start()
-        {
+        //{
-            goToSceneBtn.onClick.AddListener(OnGo);
+        //    //goToSceneBtn.onClick.AddListener(OnGo);
-        }
+        //}
-        private void OnEnable()
+        //private void OnEnable()
-        {
+        //{
-            userID.text = GlobalFlag.currentSceneName;
+        //    userID.text = GlobalFlag.currentSceneName;
-        }
+        //}
         public void OnGo()
         {
             if (UIManager.Instance.toolsItemManager.recoverBtn.gameObject.activeSelf)
@@ -41,12 +41,11 @@ namespace Adam
             SceneLoad.Instance.isOnece = true;
             SceneLoad.Instance.MaskLoadInfoPanel();
             //ExamusersController.Instance.Init();
-            string sceneInfo = userID.text;
             UIManager.Instance.toolsItemManager.ResetState(false);
             SwitchPanel();
             UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
             UIManager.Instance.threeDTip.transform.parent.gameObject.SetActive(false);
-            SceneLoad.Instance.SceneChange(sceneInfo);
+            SceneLoad.Instance.SceneChange(GlobalFlag.currentSceneName);
         }
 
         public void SwitchPanel()

SXElectricalInspection/Assets/Adam/Scripts/LoginController.cs

@@ -29,6 +29,7 @@ public class LoginController : MonoBehaviour
     public string userName;
     public string PassWord;
     public Text nameTex;
+    public Text scenenameTex;
     [SerializeField] Image im;
     private void Awake()
     {
@@ -82,6 +83,7 @@ public class LoginController : MonoBehaviour
         //{
         //    Debug.Log(item);
         //}
+        scenenameTex.text =$"场景：{GlobalFlag.currentSceneName}";
     }
 
     public void OnLogin()

SXElectricalInspection/Assets/Adam/Textures/菜单_slices/信息@2x.png.meta

@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: 8b2b941a6b1a1c045b1ced8acbf9f952
+guid: 32223dc2fb3a5774e856bd9d5b931fe1
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -51,7 +51,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1

SXElectricalInspection/Assets/Adam/Textures/菜单_slices/信息@2xOld.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 8b2b941a6b1a1c045b1ced8acbf9f952
+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
+  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: 0
+    wrapV: 0
+    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: 0
+  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: Server
+    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: Android
+    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: 

SXElectricalInspection/Assets/Script/Timers.cs

@@ -20,7 +20,7 @@ public class Timers : MonoBehaviour
     {
         //StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/Timer.config"));
         limitTime = _time * 60;
-        guiTimer.text = "考试时间：" + StringHelper.GetCountDownStr((int)limitTime);
+        guiTimer.text = "剩余时间：" + StringHelper.GetCountDownStr((int)limitTime);
     }
 
     public string GetCurrentTime()
@@ -65,13 +65,13 @@ public class Timers : MonoBehaviour
         if (limitTime >= 0)
         {
             limitTime -= Time.deltaTime;
-            guiTimer.text = "考试时间：" + StringHelper.GetCountDownStr((int)limitTime);
+            guiTimer.text = "剩余时间：" + StringHelper.GetCountDownStr((int)limitTime);
         }
         else
         {
             //Debug.Log("¼Æʱ½áÊø");
             limitTime = 0;
-            guiTimer.text = "考试时间：" + StringHelper.GetCountDownStr((int)limitTime);
+            guiTimer.text = "剩余时间：" + StringHelper.GetCountDownStr((int)limitTime);
             timeOver?.Invoke(limitTime.ToString());
             isRun = false;
         }

SXElectricalInspection/Assets/StreamingAssets/AnswerRecord.json

@@ -1 +1 @@
-{"userName":"username","userId":"1","examId":41,"classId":1,"useTime":"5180","examClassId":622,"stepList":[{"stepName":"柜门验电","testPoint":"拿出验电笔在有电的地方测试验电笔是否好坏。如果验电笔是好的验过并网柜门之后再次在有电的地方测试验电笔好坏。确保并网柜外壳确无电压。验电流程经过第一个三步之后，后续开门只需要一步","setScore":30.0,"score":0.0},{"stepName":"联系客户","testPoint":"打开服务记录仪、全程记录","setScore":10.0,"score":0.0},{"stepName":"检查工器具","testPoint":"在工具间选择需要带到现场的工器具（验电笔、安全帽、绝缘鞋（设置日期）、钳形表、万用表、螺丝刀（绝缘包裹）、钢丝钳、服务记录仪、绝缘手套、钳形电流表_大、工作卡（背包默认存在工作证、移动作业终端）迷惑项：金属梯子、螺丝刀金属部分未绝缘包裹，日期超期）","setScore":10.0,"score":5.0},{"stepName":"联系客户","testPoint":"出示工作证、告知用户来进行用电检查","setScore":10.0,"score":10.0},{"stepName":"现场检查","testPoint":"使用万用表对表计电压进行检查是否正常，无断相现象。（电压检测出0V，为异常）","setScore":10.0,"score":10.0},{"stepName":"现场检查","testPoint":"选择钳形电流表合适的量程对一次回路及二次回路电流进行检查。（在配电箱测出的数值无法与计量箱测出数值对应，则为异常，需打开电缆沟寻找窃电位置）","setScore":10.0,"score":10.0},{"stepName":"填写工作单","testPoint":"填写现场工作卡（通过下拉菜单来填写）","setScore":10.0,"score":1.25},{"stepName":"填写异常记录","testPoint":"随时可填写相关现场检查出的问题","setScore":10.0,"score":0.0}]}
+{"userName":"username","userId":"1","examId":41,"classId":1,"useTime":"5249","examClassId":622,"stepList":[{"stepName":"柜门验电","testPoint":"拿出验电笔在有电的地方测试验电笔是否好坏。如果验电笔是好的验过并网柜门之后再次在有电的地方测试验电笔好坏。确保并网柜外壳确无电压。验电流程经过第一个三步之后，后续开门只需要一步","setScore":30.0,"score":0.0},{"stepName":"现场检查","testPoint":"选择钳形电流表合适的量程对一次回路及二次回路电流进行检查。（在配电箱测出的数值无法与计量箱测出数值对应，则为异常，需打开电缆沟寻找窃电位置）","setScore":10.0,"score":0.0},{"stepName":"联系客户","testPoint":"打开服务记录仪、全程记录","setScore":10.0,"score":0.0},{"stepName":"检查工器具","testPoint":"在工具间选择需要带到现场的工器具（验电笔、安全帽、绝缘鞋（设置日期）、钳形表、万用表、螺丝刀（绝缘包裹）、钢丝钳、服务记录仪、绝缘手套、钳形电流表_大、工作卡（背包默认存在工作证、移动作业终端）迷惑项：金属梯子、螺丝刀金属部分未绝缘包裹，日期超期）","setScore":10.0,"score":8.33},{"stepName":"联系客户","testPoint":"出示工作证、告知用户来进行用电检查","setScore":10.0,"score":10.0},{"stepName":"现场检查","testPoint":"使用万用表对表计电压进行检查是否正常，无断相现象。（电压检测出0V，为异常）","setScore":10.0,"score":10.0},{"stepName":"填写工作单","testPoint":"填写现场工作卡（通过下拉菜单来填写）","setScore":10.0,"score":0.0},{"stepName":"填写异常记录","testPoint":"随时可填写相关现场检查出的问题","setScore":10.0,"score":0.0}]}

SXElectricalInspection/Assets/StreamingAssets/build_info.txt

@@ -1 +1 @@
-Build from ADAM at 2024/7/26 11:11:23
+Build from ADAM at 2024/7/30 17:34:00

SXElectricalInspection/Assets/StreamingAssets/info.ini

@@ -1 +1 @@
-2024-06-13 09:04:45#'sxfz://;swxggdj,0,41,1,username,token,90,1,622,http://12e3580.r27.cpolar.top;/'|
+2024-06-13 09:04:45#'sxfz://;swxggdj,0,41,1,username,token,90,1,622,http://5ac8d9f1.r27.cpolar.top;/'|