2 Angajamente 0b6646586d ... 407d3ff48d

Autor SHA1 Permisiunea de a trimite mesaje. Dacă este dezactivată, utilizatorul nu va putea trimite nici un fel de mesaj Data
  2809621200 407d3ff48d Merge branch 'feature/JNHJ' into develop 1 săptămână în urmă
  2809621200 9ddd0dea18 [+]设备认知文本修改 1 săptămână în urmă
24 a modificat fișierele cu 3 adăugiri și 147 ștergeri
  1. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/台布围栏.meta
  2. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/SuoJinLuoMu.meta
  3. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/万用表.meta
  4. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/安全带.meta
  5. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/工具/GongJu.meta
  6. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/工具/密封胶桶.meta
  7. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/常熟升压站.meta
  8. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/抹布.meta
  9. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/捆线.meta
  10. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/架子.meta
  11. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/气体回收装置.meta
  12. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/清洁工具.meta
  13. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/游标卡尺/模型.meta
  14. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/电源+油桶.meta
  15. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/电笔-烧杯-清洁巾.meta
  16. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/电缆接头制作工具包/模型.meta
  17. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/电阻测量仪/GW4_126_GLKG_Tex.meta
  18. 0 8
      35kVPSADS_Platform/Assets/03.Models/工器具/工具/直阻测试仪.meta
  19. 1 1
      35kVPSADS_Platform/Assets/GameAssets/06.UIPrefabs/TitlePanel.prefab
  20. BIN
      35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx
  21. 1 1
      35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx.meta
  22. BIN
      35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition.xlsx
  23. BIN
      35kVPSADS_Platform/Assets/StreamingAssets/Config/场景数据 1.xlsx
  24. 1 1
      35kVPSADS_Platform/Assets/StreamingAssets/Config/场景数据 1.xlsx.meta

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/台布围栏.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 852b067110c848546b22cb19385ce485
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/SuoJinLuoMu.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 722df3dd61062614789d6032b87402f3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/万用表.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bf148301c21fe9f45924be004fdccedc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/安全带.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2214a430785cd9c41b9557bc34e0696d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/工具/GongJu.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 450b3b0d5df98204c94c35247f3ebc69
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/工具/密封胶桶.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 373593b22f6d601428a1606cbcbdd363
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/常熟升压站.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d31aff6b239ff74bb9ffb3e026d8d98
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/抹布.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3cc84dd70b6ba684d826d9afce31006a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/捆线.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bcfa6c1b8b994b843814517f031804b5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/架子.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fccb75ccb7b0c734ea3f4b589ab01975
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/气体回收装置.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ec28e214ef203e0489549a1c21998580
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/清洁工具.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a8401902d3329754ab85fc8ac2cbc732
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/游标卡尺/模型.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: aa9869da3b9fe2449b3e70efe8108563
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/电源+油桶.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c11bfeeaaff12e84196ab1a4f89d0c19
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/电笔-烧杯-清洁巾.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 67198ec063da9d94cb402b84afabdb10
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/电缆接头制作工具包/模型.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6c326af40112b754ebad5af6fb368ec1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/电阻测量仪/GW4_126_GLKG_Tex.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4688df3f0c0154e4fadc36f585aef0a2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
35kVPSADS_Platform/Assets/03.Models/工器具/工具/直阻测试仪.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4067d49af87e3554191a1ab738f6c22d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
35kVPSADS_Platform/Assets/GameAssets/06.UIPrefabs/TitlePanel.prefab

@@ -1379,7 +1379,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 19, y: 18}
+  m_SizeDelta: {x: 20, y: 21}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4519904890775047505
 CanvasRenderer:

BIN
35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx


+ 1 - 1
35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4a167a00c37ee5242b35fad0a086e70c
+guid: 91c633ccd73df4b4c9c1a1ae256e1093
 DefaultImporter:
   externalObjects: {}
   userData: 

BIN
35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition.xlsx


BIN
35kVPSADS_Platform/Assets/StreamingAssets/Config/场景数据 1.xlsx


+ 1 - 1
35kVPSADS_Platform/Assets/StreamingAssets/Config/场景数据 1.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7bea5cdeaa3f94d4aaaab2a513041b3b
+guid: c7b1e71c5f82de447802724d3f152448
 DefaultImporter:
   externalObjects: {}
   userData: