Browse Source

Merge branch 'feature/jinxin' into develop

# Conflicts:
#	ModeDisplay/Assets/GameAssets/15.LineRenderer/Small.mat
zhangjx 9 months ago
parent
commit
67d122a2d3

File diff suppressed because it is too large
+ 171 - 633
ModeDisplay/Assets/GameAssets/04.TimeLines/110kV断路器二次回路原理.playable


BIN
ModeDisplay/Assets/GameAssets/09.Audios/110kV断路器配音/二次回路原理/110kV断路器二次回路原理.mp3


File diff suppressed because it is too large
+ 687 - 131
ModeDisplay/Assets/Scenes/运行原理/二次回路原理/110kV断路器-二次回路原理.unity


Some files were not shown because too many files changed in this diff