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

Client_PangDeRong

2018-08-22 d410f8d1baf1992db72db1f7d293b214443c76ff

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

 Core/GameEngine/Login/Launch.cs

@@ -113,7 +113,7 @@
                    while (!SDKUtility.Instance.AssetCopyFinished)

                    {

                        timer += Time.deltaTime;

                        progress = Mathf.Clamp(progressBuf + timer / duration * 0.5f, progressBuf, progressBuf + 0.5f);

                        progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);

                        yield return null;

                    }

                }

@@ -168,7 +168,7 @@
                        }

                        finally

                        {

                            progress = Mathf.Clamp(progressBuf + ((float)index / count) * 0.5f, progressBuf, progressBuf + 0.5f);

                            progress = Mathf.Clamp(progressBuf + ((float)index / count) * 0.3f, progressBuf, progressBuf + 0.3f);

                        }



                        yield return null;

@@ -220,7 +220,7 @@
                while (!AssetVersionUtility.checkAssetCompleted)

                {

                    timer += Time.deltaTime;

                    progress = Mathf.Clamp(progressBuf + timer / duration * 0.4f, progressBuf, progressBuf + 0.4f);

                    progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);

                    yield return null;

                }



@@ -252,9 +252,9 @@


        progressBuf = progress;

        while (!LaunchPostProcess.Instance.completed

            && LaunchPostProcess.Instance.progress < (Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.6f))

            && LaunchPostProcess.Instance.progress < (Application.platform == RuntimePlatform.WindowsEditor ? 1f : 0.8f))

        {

            progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * 1.67f, progressBuf, 1f);

            progress = Mathf.Clamp(progressBuf + LaunchPostProcess.Instance.progress * 1.25f, progressBuf, 1f);

            yield return null;

        }




 System/AssetVersion/RemoteFile.cs

@@ -696,6 +696,11 @@

    void ReadDataCallback(IAsyncResult ar)

    {
        if (stop)

        {

            return;

        }

        try

        {
            if (inStream != null)

@@ -712,12 +717,24 @@
                }

                else

                {

                    fs.Close();

                    fs = null;

                    inStream.Close();

                    inStream = null;

                    fileResponse.Close();

                    fileResponse = null;

                    if (fs != null)

                    {

                        fs.Close();

                        fs = null;

                    }



                    if (inStream != null)

                    {

                        inStream.Close();

                        inStream = null;

                    }



                    if (fileResponse != null)

                    {

                        fileResponse.Close();

                        fileResponse = null;

                    }



                    fileWriteState = FileWriteState.Completed;

                }

            }


 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -132,7 +132,10 @@
                else

                {

                    StateDetermination();

                    ContentText.ExcuteHref();

                    var mapModel = ModelCenter.Instance.GetModel<MapModel>();

                    var point = mapModel.GetRecommendHangPoint();

                    var config = Config.Instance.Get<MapEventPointConfig>(point);

                    MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                }

                return;

            }

@@ -203,6 +206,8 @@
            }

        }



        


        private void StateDetermination()//状态判定

        {

            DropItemManager.StopMissionPickup = true;//主动停止拾取物品


 System/MainInterfacePanel/LowSettingTip.cs

@@ -88,6 +88,8 @@
        }

        private void GodBeastBtn()

        {

            SysNotifyMgr.Instance.ShowTip("FuncNextVersion");//信息提示

            return;

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DogzWin>();

        }


 System/Strengthening/GodBeastSlidingList.cs

@@ -251,7 +251,7 @@
                }

                else

                {

                    if (Quality < 10 && GodBeastBagList[i].IsEquipment != 1 && GodBeastBagList[i].Color > Quality)//过滤掉只剩所选品质装备

                    if (Quality < 10 && (GodBeastBagList[i].IsEquipment != 1 || GodBeastBagList[i].Color > Quality))//过滤掉只剩所选品质装备

                    {

                        int type = i;

                        DeleteIndexList.Add(type);


 System/Treasure/TreasureModel.cs

@@ -1194,10 +1194,10 @@
                        treasureAchievementDict.Add(config.ID, config.Achievements[i]);

                        break;

                    }

                    else if (config.Category == (int)TreasureCategory.Fairy && config.ID == 301)

                    {

                        eightFurnacesAchievements.Add(config.Achievements[i]);

                    }

                    //else if (config.Category == (int)TreasureCategory.Fairy && config.ID == 301)

                    //{

                    //    eightFurnacesAchievements.Add(config.Achievements[i]);

                    //}

                }



                if (treasure.state == TreasureState.Locked && config.PreTreasure == 0)

@@ -1218,6 +1218,16 @@
                {

                    treasureMapDict.Add(config.ID, config.MapId);

                }



                if (config.ID == 301)

                {

                    List<int> list = null;

                    SuccessConfig.TryGetTreasureExpAchievements(config.ID, out list);

                    if (list != null)

                    {

                        eightFurnacesAchievements.AddRange(list);

                    }

                }

            }



            var treasureUpConfigs = Config.Instance.GetAllValues<TreasureUpConfig>();