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

ZXW

2018-08-09 d869b87566c4c7b41b2c4513be0ca95c5505de28

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

 Core/GameEngine/Model/ConfigManager.cs

@@ -403,11 +403,7 @@
                {

                    if (_task.assetPath == AssetPath.ResourceOut)

                    {

                        var fileInfo = new FileInfo(_task.filePath);

                        var fs = fileInfo.OpenRead();

                        sr = new StreamReader(fs, Encoding.UTF8);

                        var content = sr.ReadToEnd();

                        lines = content.Split(lineStep, StringSplitOptions.None);

                        lines = File.ReadAllLines(_task.filePath,Encoding.UTF8);

                    }

                    else if (_task.assetPath == AssetPath.External)

                    {


 Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta

@@ -1,8 +1,10 @@
fileFormatVersion: 2
guid: 3c817ad288f3e2a4e92d436c3d75938e
guid: a53e1a4c69fcb264eac797b394e065da
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Fight/GameActor/GAStaticDefine.cs

@@ -361,7 +361,7 @@
                else if (target is GA_NpcFightNorm)

                {

                    _casterRealm = PlayerDatas.Instance.baseData.realmLevel;

                    _targetRealm = (int)target.ActorInfo.realm;

                    _targetRealm = (int)target.ActorInfo.realm == 0 ? 99999999 : (int)target.ActorInfo.realm;

                }

            }

            else if (target is GA_Hero)


 System/WindowJump/WindowJumpMgr.cs

@@ -657,7 +657,7 @@
                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TrialDungeonSelect:

                GotoTrialDungeon((int)DailyQuestType.HeavenBattle);

                GotoTrialDungeon((int)DailyQuestType.Trial);

                break;



            case JumpUIType.FaBaoSoul_BenYuan: