Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-05 84198eaf5a3fa897f645110fa148a489d76ca2ff

 System/Team/TeamAssistTipWin.cs.meta

File was renamed from System/Hero/Equipment.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f88ee90289d2a9441b1729c63f6ad209
timeCreated: 1502241484
guid: b0bc4e032dad22e4fbb0e9d769334b56
timeCreated: 1541151094
licenseType: Pro
MonoImporter:
  serializedVersion: 2