Merge branch 'feature/BASE' into develop · d7c6fad21b - Gogs

Parcourir la source

Merge branch 'feature/BASE' into develop

# Conflicts:
#	ChivaTechFramework/Assets/GameAssets/01.Models/04.220kV断路器-LW25型.meta
#	ChivaTechFramework/Assets/GameAssets/01.Models/04.220kV断路器-LW25型/Materials.meta
#	ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型解体大修.unity.meta

1905626492 il y a 6 mois

Parent

e9e080881f 295d6018b6

commit

d7c6fad21b

1 fichiers modifiés avec 1 ajouts et 1 suppressions

Vue séparée Afficher les stats Diff

						
							+ 1
							
							- 1
						
ChivaTechFramework/Assets/ChivaFramework
							 
								Voir le fichier
							
				@@ -1 +1 @@
			
				-Subproject commit fd4fdc416d9003fe089993af8758dc54f314c60a
			
				+Subproject commit 1b5ad06550e05a5db351e952e9ab682301e2100f