zhangjx

07d901d442 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/03.Models.meta # 35kVPSADS_Platform/Assets/Art.meta # 35kVPSADS_Platform/Assets/Phase I Resources/XunShiFramework/UIFramework/Scripts/UI/ExamResultFrom.cs # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV变压器搭接面发热处理.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1032.meta
0fe78bf9f8 (+)修改日常巡视练考逻辑
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

e0d0eae928 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Art.meta # 35kVPSADS_Platform/Assets/GameAssets/工作原理Model/50A直流电阻测试仪_tex.meta # 35kVPSADS_Platform/Assets/GameAssets/工作原理Model/50A直流电阻测试仪_tex/50A直流电阻测试仪_tex.meta # 35kVPSADS_Platform/Assets/GameAssets/工作原理Model/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/35kV变压器搭接面发热处理.unity.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Json 1.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1030/支撑底架.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1032.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1032/出线柜.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1032/变压器.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta
8f9cd70450 （+）添加巡视工具选择提示及成绩录入，红外线冷气检测，添加漏气气体波动效果
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

c50b3a8d42 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Phase I Resources/Scripts/Scripts/UI.meta # 35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UIPrefab.meta # 35kVPSADS_Platform/Assets/Scenes/巡视/配电Main/LightingData.asset # 35kVPSADS_Platform/Assets/Scenes/巡视/配电Main/Lightmap-0_comp_dir.png # 35kVPSADS_Platform/Assets/Scenes/巡视/配电Main/Lightmap-0_comp_light.exr # 35kVPSADS_Platform/Assets/Scenes/巡视/配电Main/Lightmap-1_comp_dir.png # 35kVPSADS_Platform/Assets/Scenes/巡视/配电Main/Lightmap-1_comp_light.exr
02d754573e （+）添加钳式电流表工具使用功能
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

1910844f4e (+)修改巡视工具间确定刷新问题

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

b88dcd5004 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置/GongJu/GongJu_C_Tex.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置/GongJu/Materials.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置/Materials.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置/密封胶桶/Tex.meta
3db21898db (+)修改场景跳转页面展示问题
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

7cb49a025a Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/03.Models/220kV主变检修.meta # 35kVPSADS_Platform/Assets/03.Models/220kV变压器.meta # 35kVPSADS_Platform/Assets/03.Models/35kV_主变压器.fbm.meta # 35kVPSADS_Platform/Assets/Phase I Resources/Scripts/EquipmentPaneGameLaunch.cs # 35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/ModelChoicePlane.cs # 35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/PhaseIIModelChoicePlane.cs # 35kVPSADS_Platform/ProjectSettings/EditorBuildSettings.asset
aa6bf5b885 (+)修改UI切换逻辑
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

1c0cf9a1c9 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/03.Models/220kV主变检修.meta # 35kVPSADS_Platform/Assets/03.Models/220kV变压器.meta # 35kVPSADS_Platform/Assets/03.Models/35kV_主变压器.fbm.meta # 35kVPSADS_Platform/Assets/03.Models/35kV主变压器_油枕白.fbm.meta # 35kVPSADS_Platform/Assets/Scenes/GongJu_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/SuoJinLuoMu.meta # 35kVPSADS_Platform/Assets/Scenes/SuoJinLuoMu/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/SuoJinLuoMu/SuoJinLuoMu_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/万用表.meta # 35kVPSADS_Platform/Assets/Scenes/万用表/XinZeng_Material.meta # 35kVPSADS_Platform/Assets/Scenes/万用表/XinZeng_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/万用表/表盘贴图.meta # 35kVPSADS_Platform/Assets/Scenes/台布围栏.meta # 35kVPSADS_Platform/Assets/Scenes/台布围栏/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/台布围栏/Textures.meta # 35kVPSADS_Platform/Assets/Scenes/台布围栏/安全措施.meta # 35kVPSADS_Platform/Assets/Scenes/安全带.meta # 35kVPSADS_Platform/Assets/Scenes/安全带/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/安全带/Textures.meta # 35kVPSADS_Platform/Assets/Scenes/工具/GongJu.meta # 35kVPSADS_Platform/Assets/Scenes/工具/GongJu/GongJu_C_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/工具/GongJu/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/工具/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/工具/密封胶桶.meta # 35kVPSADS_Platform/Assets/Scenes/工具/密封胶桶/Tex.meta # 35kVPSADS_Platform/Assets/Scenes/常熟升压站.meta # 35kVPSADS_Platform/Assets/Scenes/常熟升压站/工具_Material.meta # 35kVPSADS_Platform/Assets/Scenes/常熟升压站/工具_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/抹布.meta # 35kVPSADS_Platform/Assets/Scenes/抹布/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/抹布/Tex.meta # 35kVPSADS_Platform/Assets/Scenes/捆线.meta # 35kVPSADS_Platform/Assets/Scenes/捆线/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/架子.meta # 35kVPSADS_Platform/Assets/Scenes/架子/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/气体回收装置.meta # 35kVPSADS_Platform/Assets/Scenes/气体回收装置/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/气体回收装置/Textures.meta # 35kVPSADS_Platform/Assets/Scenes/清洁工具.meta # 35kVPSADS_Platform/Assets/Scenes/清洁工具/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/清洁工具/Tex.meta # 35kVPSADS_Platform/Assets/Scenes/温度计.meta # 35kVPSADS_Platform/Assets/Scenes/游标卡尺/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/游标卡尺/Tex.meta # 35kVPSADS_Platform/Assets/Scenes/游标卡尺/模型.meta # 35kVPSADS_Platform/Assets/Scenes/游标卡尺/模型/游标卡尺.meta # 35kVPSADS_Platform/Assets/Scenes/电源+油桶.meta # 35kVPSADS_Platform/Assets/Scenes/电源+油桶/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/电源+油桶/Textures.meta # 35kVPSADS_Platform/Assets/Scenes/电源+油桶/电源盘.meta # 35kVPSADS_Platform/Assets/Scenes/电笔-烧杯-清洁巾.meta # 35kVPSADS_Platform/Assets/Scenes/电笔-烧杯-清洁巾/Matreials.meta # 35kVPSADS_Platform/Assets/Scenes/电笔-烧杯-清洁巾/Tool_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/电缆接头制作工具包/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/电缆接头制作工具包/Tex.meta # 35kVPSADS_Platform/Assets/Scenes/电缆接头制作工具包/模型.meta # 35kVPSADS_Platform/Assets/Scenes/电缆接头制作工具包/模型/一字改锥.meta # 35kVPSADS_Platform/Assets/Scenes/电阻测量仪/GW4_126_GLKG_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/电阻测量仪/GW4_126_GLKG_Tex/Tool_Tex.meta # 35kVPSADS_Platform/Assets/Scenes/电阻测量仪/Materials.meta # 35kVPSADS_Platform/Assets/Scenes/直阻测试仪.meta # 35kVPSADS_Platform/Assets/Scenes/直阻测试仪/GongJuJian_Material.meta # 35kVPSADS_Platform/Assets/Scenes/直阻测试仪/GongJuJian_Model.meta # 35kVPSADS_Platform/Assets/Scenes/直阻测试仪/GongQiJu_Material.meta # 35kVPSADS_Platform/Assets/Scenes/直阻测试仪/GongQiJu_Tex.meta
43e71fbf25 (+)暂存
2870213001 （+）修改地下电缆场景中存在的问题
Поређење ових 3 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

4012404c89 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Scripts/UI.meta # 35kVPSADS_Platform/Assets/UIPrefab.meta
de9b9ae97b (+)修改场景跳转
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

64007f6660 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Art.meta # 35kVPSADS_Platform/Assets/Art/UIPrefab.meta # 35kVPSADS_Platform/Assets/Detailed_Pyro_FX.meta # 35kVPSADS_Platform/Assets/GameAssets/工作原理Model/09.10kV开关柜-KYN28型.meta # 35kVPSADS_Platform/Assets/GameAssets/工作原理Model/09.10kV开关柜-KYN28型/Materials.meta # 35kVPSADS_Platform/Assets/JMO Assets.meta # 35kVPSADS_Platform/Assets/MagicEffectsLightningVol01.meta # 35kVPSADS_Platform/Assets/Scenes/35kV变压器套管渗漏油检查处理.meta # 35kVPSADS_Platform/Assets/Scenes/TestUIPanels.meta # 35kVPSADS_Platform/Assets/Scenes/工作原理/10kV电缆分接箱工作原理.unity.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Audio/EquipmentCognition/1048.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1030/支撑底架.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041.meta
872f915791 (+)新增缺陷添加
Поређење ових 2 комита »

пре 2 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

b94293f4df Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/GameAssets/03.Models/10kV柱上开关（展示类型2）.meta
4c2cf75f7f (+)架空线路日常巡视和柱上开关类型2工作原理
Поређење ових 2 комита »

пре 3 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

c067f58fe8 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/StreamingAssets/AssetBundles.meta
4469542e38 （+）地下电缆日常巡视模块添加
Поређење ових 2 комита »

пре 3 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

3917f35408 Merge branch 'feature/jinxin' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Distribution inspection.meta
7bde53a0b5 （+）暂存
582d6763bb (+)断路器工作原理完善
Поређење ових 3 комита »

пре 3 месеци

zhangjx извршује push на develop у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

f05493fe17 Merge branch 'feature/develop_本地' into develop # Conflicts: # 35kVPSADS_Platform/Assets/Distribution inspection.meta # 35kVPSADS_Platform/Assets/GameAssets.meta # 35kVPSADS_Platform/Assets/GameAssets/Scripts/ResetCenterPoint.cs # 35kVPSADS_Platform/Assets/GameAssets/Scripts/ResetCenterPoint.cs.meta # 35kVPSADS_Platform/Assets/Scripts/ResetCenterPoint.cs.meta # 35kVPSADS_Platform/Assets/Scripts/UI.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/1.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/10.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/11.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/12.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/12_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/13.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/13_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/14.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/15.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/16.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/16_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/17.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/18.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/19.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/1_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/2.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/20.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/21.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/22.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/23.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/24.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/25.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/26.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/27.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/28.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/29.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/3.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/30.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/31.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/32.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/33.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/34.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/35.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/36.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/37.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/38.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/39.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/4.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/40.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/41.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/42.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/43.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/44.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/45.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/46.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/46_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/47.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/48.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/49.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/49_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/5.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/50.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/50_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/51.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/51_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/52.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/52_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/53.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/53_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/54.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/54_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/55.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/55_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/56.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/56_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/57.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/58.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/58_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/59.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/59_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/5_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/6.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/60.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/60_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/61.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/61_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/62.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/62_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/63.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/6_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/7.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/7_note.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/8.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修/9.mp3.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置/35kV断路器操动机构解体检修_题库.xlsx.meta
38eded063b (+)新加架空线路缺陷
650da60d75 Merge remote-tracking branch 'origin/develop' into feature/巡视UI搭建 # Conflicts: # 35kVPSADS_Platform/Assets/Scripts/UI.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/架空线路缺陷.meta # 35kVPSADS_Platform/Assets/UIPrefab.meta
0af703ede4 （+）修改暂存
01dbaadb5a Merge branch 'feature/巡视UI搭建_检出' into feature/巡视UI搭建
Поређење ових 6 комита »

пре 3 месеци

zhangjx извршује push на feature/巡视UI搭建 у ChivaTech/Project_35kVPSADS_Platform_NeiMen...

650da60d75 Merge remote-tracking branch 'origin/develop' into feature/巡视UI搭建 # Conflicts: # 35kVPSADS_Platform/Assets/Scripts/UI.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/架空线路缺陷.meta # 35kVPSADS_Platform/Assets/UIPrefab.meta
cc4e68381b Merge remote-tracking branch 'origin/develop' into develop
de3c723f93 Merge branch 'feature/cjy' into develop # Conflicts: # 35kVPSADS_Platform/Assets/GameAssets/03.Models/班前会/Materials.meta # 35kVPSADS_Platform/Assets/GameAssets/配电相关工具/工具/Materials.meta # 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV断路器操动机构解体检修.meta
4a56bd8bcf [+]场景漫游及设备认知添加
61e4ea2137 [+]35kV断路器三个检修完成
Поређење ових 47 комита »

пре 3 месеци