Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/DogzDungeon/DogzBoxBehaviour.cs

@@ -5,6 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using TableConfig;

namespace Snxxz.UI
{
@@ -20,7 +21,8 @@
        public void Display()
        {
            timer = 0f;
            UI3DModelExhibition.Instance.ShowNPC(model.bigBoxNpcId, Vector3.zero, m_RawImage);
            var config = Config.Instance.Get<NPCConfig>(model.bigBoxNpcId);
            UI3DModelExhibition.Instance.ShowNPC(model.bigBoxNpcId, config.UIModeLOffset, config.UIModelRotation, m_RawImage);
            DisplayBoxSurplusInfo();
            model.boxSurplusChangeEvent += OnBoxInfoUpdate;
        }