Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-21 cb21874c84b59d9ccbcc38c70f350126827ca54b

 UI/Common/FuncOpen.cs

@@ -77,8 +77,14 @@
            for (int i = 0; i < vNetData.FuncCount; i++)

            {

                var funcState = vNetData.FuncStateList[i];

                bool opned = funcOpenState[funcState.FuncID];

                if (!funcOpenState.ContainsKey(funcState.FuncID))

                {

                    funcOpenState.Add(funcState.FuncID, funcState.State == 1);

                }

                else

                {

                funcOpenState[funcState.FuncID] = funcState.State == 1;

                }

                if (OnFuncStateChangeEvent != null)

                {

                    OnFuncStateChangeEvent(funcState.FuncID);