Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/GeneralConfig/GeneralConfig.cs

@@ -186,7 +186,7 @@
                }

                else

                {

                    DesignDebug.LogError("EquipArea : 装备位置重复");

                    DebugEx.LogError("EquipArea : 装备位置重复");

                }

            }

            var _trailBossJson = LitJson.JsonMapper.ToObject(GetInputString("MuneKadoTrialBossHead", 1));