Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

16 小时以前 725b7b2374f43582a2d78b2cae3f8303359651b8

 Main/System/Achievement/AchievementManager.cs.meta

copy from Main/Component/UI/Core/OutlineColor.cs.meta
copy to Main/System/Achievement/AchievementManager.cs.meta
File was copied from Main/Component/UI/Core/OutlineColor.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 73475911b65888b44a39a57cca0bcac3
guid: cf5275bc4183a394c83cbfa9707c3f13
MonoImporter:
  externalObjects: {}
  serializedVersion: 2