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

QD-PangDeRong

2018-08-09 1b2a902d635669056b793b654eaaf80e16d6373f

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -521,7 +521,8 @@
                }

            }



            AssetBundleBuildExtersion.Build(m_UserData.m_OutputPath, _category, opt, (BuildTarget)m_UserData.m_BuildTarget);

            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            AssetBundleBuildExtersion.Build(outputPath, _category, opt, (BuildTarget)m_UserData.m_BuildTarget);

        }



        private void ExcuteBuildAudio()


 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/Dungeon/TrialDungeonModel.cs

@@ -17,6 +17,8 @@
        public event Action SelectEquipClassEvent;



        bool serverInited = false;



        public const int TRIALEXCHANGE_GUIDE = 91;

        public override void Init()

        {

            ParseConfig();


 System/Dungeon/TrialExchangeWin.cs

@@ -89,6 +89,11 @@
        {

            model.SelectEquipClassEvent -= SelectEquipClassEvent;

            packModel.RefreshItemCountAct -= RefreshItemCountAct;



            if (!NewBieCenter.Instance.completeGuidesBuf.Contains(TrialDungeonModel.TRIALEXCHANGE_GUIDE))

            {

                NewBieCenter.Instance.RemoveNewBieGuide(TrialDungeonModel.TRIALEXCHANGE_GUIDE);

            }

        }



        protected override void OnAfterClose()


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -384,7 +384,9 @@


        private void GuideBeginEvent()

        {

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 89)

            if (NewBieCenter.Instance.inGuiding

                && (NewBieCenter.Instance.currentGuide == 89

                || NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE))

            {

                UnFlodFunctionArea(true, 0);

            }


 System/MainInterfacePanel/TopRightTip.cs

@@ -47,6 +47,10 @@
            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;

            }

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE)

            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DailyQuestWin>();

        }


 System/NewBieGuidance/NewBieCenter.cs

@@ -205,6 +205,19 @@
            }

        }



        public void RemoveNewBieGuide(int _id)

        {

            if (!completeGuidesBuf.Contains(_id))

            {

                completeGuidesBuf.Add(_id);

            }



            var send = new CA222_tagCMSetGuideOK();

            send.GuideIndex = (byte)_id;

            send.IsOK = 1;

            GameNetSystem.Instance.SendInfo(send);

        }



        public void FinishCurrentGuideWithoutCloseWin()

        {

            var guideRecord = currentGuide;

@@ -339,6 +352,9 @@
                    return state == DailyQuestModel.DailyQuestState.CanBuyTimes;

                case GuideTriggerType.TeamAutoAccept:

                    return !teamModel.myTeam.inTeam;

                case GuideTriggerType.TrialExchange:

                    var trialDailyState = dailyModel.GetQuestState((int)DailyQuestType.Trial);

                    return trialDailyState == DailyQuestModel.DailyQuestState.Completed;

                default:

                    return false;

            }


 System/Treasure/TreasureCollectBriefInfoBehaviour.cs

@@ -106,7 +106,7 @@
            model.humanTreasureStateChangeEvent -= OnHumanTreasureStateChange;

            model.potentialLevelChangeEvent -= OnPotentialLevelChange;



            RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointUpdate;

            RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointUpdate;

        }



        private void OnHumanTreasureStateChange(int _treasureId)


 System/Treasure/TreasureModel.cs

@@ -869,19 +869,17 @@
                {

                    return;

                }

                treasure.skillLevelUpRedpoint.state = RedPointState.None;

                if (treasure.state != TreasureState.Collected || !treasure.IsMaxStage())

                {

                    return;

                }

                var anyPointialLevelupAble = false;

                for (int i = 0; i < treasure.potentials.Count; i++)

                if (treasure.state == TreasureState.Collected && treasure.IsMaxStage())

                {

                    var potential = treasure.potentials[i];

                    if (SatisyPotentialLevelUp(treasure.id, potential.id))

                    for (int i = 0; i < treasure.potentials.Count; i++)

                    {

                        anyPointialLevelupAble = true;

                        break;

                        var potential = treasure.potentials[i];

                        if (SatisyPotentialLevelUp(treasure.id, potential.id))

                        {

                            anyPointialLevelupAble = true;

                            break;

                        }

                    }

                }

                treasure.skillLevelUpRedpoint.state = anyPointialLevelupAble ? RedPointState.Simple : RedPointState.None;


 Utility/EnumHelper.cs

@@ -1176,7 +1176,8 @@
    Pray = 18,//祈愿

    VIPExperience = 19,//vip体验

    FairyLandBuyTimes = 20,//仙界秘境购买次数

    TeamAutoAccept=21,//自动接受组队邀请

    TeamAutoAccept = 21,//自动接受组队邀请

    TrialExchange = 22,//宗门试炼兑换材料



    QuestCanAccept = 100,//任务可接

    QuestCanDo = 101,//任务可进行