Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-26 dbceb10cd120b2121cb93b63d50d804bc6f02f16

 System/Treasure/FunctionUnlockFlyObject.cs

@@ -54,7 +54,7 @@
                case FunctionUnlockType.TreasureSkill:

                    Treasure _treaure;

                    ModelCenter.Instance.GetModel<TreasureModel>().TryGetTreasure(m_Id, out _treaure);

                    var _skillCfg = SkillConfig.Get(_treaure.unlockSkill);

                    var _skillCfg = SkillConfig.Get(_treaure.skillId);

                    m_FunctionIcon.SetSprite(_skillCfg.IconName);

                    m_FunctionIcon.SetNativeSize();

                    originalScale = 1f;