Merge branch 'master' into 2287上古战场

client_linchunjie

2018-10-17 0ace3251a30c208a2c11bd3ca6c141c28d0e71a2

Merge branch 'master' into 2287上古战场

 UI/HUD/HeadUpName.cs

@@ -156,7 +156,6 @@
            if (isAncientKing)

            {

                m_AncientKing.SetSprite("IntegralKing");

                m_AncientKing.SetNativeSize();

            }

        }



@@ -170,7 +169,6 @@
            if (isAncientEnemy)

            {

                m_AncientEnemy.SetSprite("Enemy");

                m_AncientEnemy.SetNativeSize();

            }

        }