Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/HeavenBattle/HeavenBattleModel.cs

@@ -300,6 +300,7 @@


    private void SetBatterInfoList(HA003_tagUniversalGameRecInfo info)

    {

        GameRecInfoDict.Clear();

        if (!GameRecInfoDict.ContainsKey(info.Type))

        {

            List<GameRecInfo> list = new List<GameRecInfo>();