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

client_Hale

2019-04-17 38dbbe3f7cb862fdf46ba053994bc2419c730ce1

 Core/GameEngine/Model/TelPartialConfig/PartialHorseConfig.cs.meta

File was renamed from System/KnapSack/Logic/PetMatInfoWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1ecb0731383014d44863af268e0d376c
timeCreated: 1525846932
guid: 4daa64ed63cb868418aef659f368c280
timeCreated: 1555404468
licenseType: Pro
MonoImporter:
  serializedVersion: 2