Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/Treasure/TreasureNewGotWin.cs

@@ -362,15 +362,16 @@
                            m_Story.text = string.Format(config.Verse[0], killNpcConfig.MaxAtk);

                        }

                        break;

                    //case 304://签到相关配置移到功能配置表

                    //    var _specialData = treasure.specialData;

                    //    if (_specialData != null)

                    //    {

                    //        var _keyValue = _specialData.propertyDict.First();

                    //        var _propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_keyValue.Key);

                    //        m_Story.text = string.Format(config.Verse[0], _keyValue.Value, _propertyConfig.Name);

                    //    }

                    //    break;

                    case 304://签到相关配置移到功能配置表

                        var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>();

                        var _propertyDict = soulModel.signAddProperty;

                        if (_propertyDict != null)

                        {

                            var _keyValue = _propertyDict.First();

                            var _propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_keyValue.Key);

                            m_Story.text = string.Format(config.Verse[0], _keyValue.Value, _propertyConfig.Name);

                        }

                        break;

                }

                flyObject = unlockFlyObject1;

            }