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

client_linchunjie

2018-10-26 214a3a64697f23dd3fbbe5d3180223ee3a2f301e

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -409,6 +409,8 @@
            EditorGUILayout.Space();

            GUILayout.BeginHorizontal();



            ClientPackage.obfuscatorEnabled = EditorGUILayout.Toggle("obfuscator enable ", ClientPackage.obfuscatorEnabled);



#if UNITY_ANDROID

            if (GUILayout.Button("APK"))

            {


 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -42,6 +42,53 @@
        assetBundle = null;

    }



    public void ReInitBuiltInAsset()

    {

        var path = AssetVersionUtility.GetBuiltInAssetFilePath("builtin_assetbundle");

        var assetBundle = AssetBundle.LoadFromFile(path);

        if (assetBundle == null)

        {

            DebugEx.LogError("AssetBundleManifest的包文件为空或者加载出错.");

        }



        var manifest = assetBundle.LoadAsset<AssetBundleManifest>(ResourcesPath.AssetDependentFileAssetName);

        if (manifest == null)

        {

            DebugEx.LogError("AssetBundleManifest文件为空或者加载出错.");

        }



        for (int i = m_AssetBundleInfoList.Count - 1; i >= 0; i--)

        {

            var item = m_AssetBundleInfoList[i];

            if (item.name.Contains("builtin"))

            {

                m_AssetBundleInfoList.Remove(item);

            }

        }



        var keys = new List<string>(m_AssetBundleDict.Keys);

        for (int i = keys.Count - 1; i >= 0; i--)

        {

            var item = keys[i];

            if (item.Contains("builtin"))

            {

                m_AssetBundleDict.Remove(item);

            }

        }



        var bundles = manifest.GetAllAssetBundles();

        foreach (var bundle in bundles)

        {

            var dependenices = manifest.GetAllDependencies(bundle);

            var hash = manifest.GetAssetBundleHash(bundle);

            var assetBundleInfo = new AssetBundleInfo(bundle, hash, dependenices);

            m_AssetBundleInfoList.Add(assetBundleInfo);

        }



        assetBundle.Unload(true);

        assetBundle = null;

    }



    public IEnumerator Initialize()

    {

        yield return StartCoroutine(Co_LoadMainfestFile("audio"));

@@ -143,7 +190,7 @@
        }



        var isBuiltin = assetBundleName.Contains("builtin");

        var filePath = isBuiltin?AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);

        var filePath = isBuiltin ? AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);



        DebugEx.LogFormat("Co_LoadAssetBundle(): 将要加载的assetBundle包路径 => {0}", filePath);

        var assetBundle = AssetBundle.LoadFromFile(filePath);


 Fight/Actor/TestPlayerController.cs

@@ -52,7 +52,7 @@
            if (m_StartedRotateCamera)

            {

                CameraController.Instance.Distance = 11;

                CameraController.Instance.rotationX = -11;

                CameraController.Instance.rotationX = -110;

                CameraController.Instance.rotationY = 50;

            }

            else


 System/AssetVersion/DownLoadAndDiscompressTask.cs

@@ -18,17 +18,16 @@
    public int totalCount { get; private set; }

    public int okCount { get; private set; }

    public bool restartApp { get; private set; }

    public bool reinitedBuiltInAsset { get; private set; }



    public event Action<Step> downLoadStepChangeEvent;



    Action downLoadOkCallBack;



    Step m_Step = Step.None;

    public Step step

    {

    public Step step {

        get { return m_Step; }

        set

        {

        set {

            if (m_Step != value)

            {

                m_Step = value;

@@ -50,6 +49,7 @@
        okCount = 0;

        step = Step.DownLoadPrepared;

        restartApp = false;

        reinitedBuiltInAsset = false;

        totalSize = 0;



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

@@ -62,6 +62,11 @@
                restartApp = true;

            }

#endif



            if (!reinitedBuiltInAsset && task.relativePath.Contains("builtin"))

            {

                reinitedBuiltInAsset = true;

            }

        }



        if (totalSize > BYTE_PER_MILLIONBYTE)

@@ -121,6 +126,11 @@
        {

            SDKUtility.Instance.RestartApp();

        }



        if (reinitedBuiltInAsset)

        {

            AssetBundleUtility.Instance.ReInitBuiltInAsset();

        }

    }



    private void OnFileDownLoadCompleted(bool _ok, AssetVersion _assetVersion)


 System/BlastFurnace/PrayforDrugWin.cs

@@ -76,14 +76,16 @@
            {

                vipLimitText.SetActive(false);

                vipPray.SetActive(false);

                unVipPray.SetActive(true);           
                unVipPray.SetActive(true);       
                if (PrayModel.alreadyPrayNum >= PrayModel.everyDayNum)

                {

                    prayBtnImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                    alreadyPrayObj.SetActive(true);

                    prayMoneyGo.SetActive(false);

                }

                else

                {

                    prayMoneyGo.SetActive(true);

                    prayBtn.AddListener(ClickPrayBtn);

                    prayBtnImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                }

@@ -94,6 +96,7 @@
                vipPray.SetActive(true);

                unVipPray.SetActive(false);

                vipLimitText.SetActive(true);

                prayMoneyGo.SetActive(false);

                prayVipLimit.text = StringUtility.Contact("V",PrayModel.minVipLvLimit);

                prayBtn.AddListener(()=>

                {


 System/Dogz/DogzModel.cs

@@ -19,6 +19,8 @@


        public void OnBeforePlayerDataInitialize()

        {

            playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;

            FuncOpen.Instance.OnFuncStateChangeEvent -= UpdateDogzState;

            curSumAssistNum = DogzAssistDefaultCnt;

            addAssistCnt = 0;

            SelectDogzItemQuality = 0;

@@ -37,9 +39,9 @@


        public void OnPlayerLoginOk()

        {

            SetDogzEquipInfo();

            playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;

            SetDogzEquipInfo();       
            playerPack.RefreshItemCountAct += RefreshDogzEquipInfo;

            FuncOpen.Instance.OnFuncStateChangeEvent += UpdateDogzState;

            UpdateDogzAssistRed();

            UpdateDogzEquipPlaceRed();

            UpdateAssistNumRed();

@@ -301,6 +303,17 @@
            SysNotifyMgr.Instance.ShowTip("DogzQualityAsk", GetDogzPartNameByIndex(index), GetItemColorName(color));

            return false;

        }





        private void UpdateDogzState(int funcId)

        {

            if (funcId != (int)FuncOpenEnum.Dogz) return;



            UpdateDogzAssistRed();

            UpdateDogzEquipPlaceRed();

            UpdateAssistNumRed();

        }





        #region 协议



@@ -866,10 +879,13 @@


        public void UpdateDogzAssistRed()

        {

            foreach(var value in dogzAssistRedDict.Values)

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;



            foreach (var value in dogzAssistRedDict.Values)

            {

                value.state = RedPointState.None;

            }

         
            bool isMaxAssistNum = GetAssistDogzCount() >= curSumAssistNum ? true : false;

            int minAlreadyAssistId = 0;

            foreach (var dogzId in m_DogzEquipLimit.Keys)

@@ -926,7 +942,9 @@


        public void UpdateDogzEquipPlaceRed()

        {

            foreach(var value in dogzEquipPlaceRedDict.Values)

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;



            foreach (var value in dogzEquipPlaceRedDict.Values)

            {

                foreach(var value2 in value.Values)

                {

@@ -934,7 +952,7 @@
                }

            }



            foreach(var value in dogzAssistRedDict.Values)

            foreach (var value in dogzAssistRedDict.Values)

            {

                if(value.state == RedPointState.Simple)

                {

@@ -1056,7 +1074,9 @@


        public void UpdateAssistNumRed()

        {

          if(CheckIsAddAssistNum() && !IsAddMaxAssist())

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;



            if (CheckIsAddAssistNum() && !IsAddMaxAssist())

           {

                if(addAssistDogzRedpoint.state == RedPointState.None)

                {


 System/HappyXB/BestXBWin.cs

@@ -391,8 +391,6 @@
                {

                    XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));

                }

                XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));

                
            }

        }



@@ -518,12 +516,14 @@
          

            if(isEndXB)

            {

                if(targetIndexs.Count > 1)

                if (targetIndexs.Count > 1)

                {

                    ShowXBResultCtrl(targetIndexs.Count - 1);

                }

                else

                {

                    XBGetItem xbItem = targetIndexs[targetIndexs.Count - 1];

                    XBModel.GetNotifyResult(xbItem.itemId, xbItem.count);

                    ResetXBItemState();

                    WindowCenter.Instance.Open<HappyXBGetItemWin>();

                }


 System/HappyXB/RuneXBWin.cs

@@ -531,6 +531,8 @@
                }

                else

                {

                    XBGetItem xbItem = targetIndexs[targetIndexs.Count - 1];

                    XBModel.GetNotifyResult(xbItem.itemId, xbItem.count);

                    ResetXBItemState();

                    WindowCenter.Instance.Open<HappyXBGetItemWin>();

                }


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -93,6 +93,7 @@
            get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); }

        }



        RolePointModel rolePointModel { get { return ModelCenter.Instance.GetModel<RolePointModel>(); } }

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }





@@ -328,7 +329,7 @@
                                foreach (var key in sumOffsetlist.Keys)

                                {

                                    PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshFreePoint;

                                    //rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);

                                    rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);

                                }

                            }

                            else


 System/KnapSack/Logic/WashAttrPointWin.cs

@@ -2,6 +2,7 @@
using UnityEngine.UI;

using TableConfig;

using System;

using System.Collections.Generic;



namespace Snxxz.UI

{

@@ -109,22 +110,29 @@


        private void RefreshWashAttrDes()

        {

            //float initPoint = rolePointModel.GetPointCreate(PlayerDatas.Instance.baseData.Job)[(int)selectAttr];

            //switch (selectAttr)

            //{

            //    case AttrEnum.POWER:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;

            //        break;

            //    case AttrEnum.AGILITY:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;

            //        break;

            //    case AttrEnum.PHYSIQUE:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;

            //        break;

            //    case AttrEnum.MENTALITY:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;

            //        break;

            //}

            var model = ModelCenter.Instance.GetModel<RolePointModel>();

            Dictionary<int, int> dict = null;

            bool isContain = model.TryGetPointInit(PlayerDatas.Instance.baseData.Job,out dict);

            float initPoint = 0;

            if(isContain && dict.ContainsKey((int)selectAttr))

            {

                initPoint = dict[(int)selectAttr];

            }

            switch (selectAttr)

            {

                case AttrEnum.POWER:

                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;

                    break;

                case AttrEnum.AGILITY:

                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;

                    break;

                case AttrEnum.PHYSIQUE:

                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;

                    break;

                case AttrEnum.MENTALITY:

                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;

                    break;

            }



            PlayerPropertyConfig propertyConfig = Config.Instance.Get<PlayerPropertyConfig>((int)selectAttr);

            washAttrDesText.text = Language.Get("BagWin_Washpoint2", propertyConfig.Name, UIHelper.GetPropertyMapPlayerData(selectAttr), washPoint);


 System/SystemSetting/SettingMgr.cs

@@ -35,7 +35,7 @@
            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.coins, true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.other, true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoDrop, true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoHangUp,false);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoHangUp,true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoBuyDrug, true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoSell, true);

            HangUpSetModel.Instance.SetBoolSetStr(HangUpAutoBoolType.isAutoDevour, true);


 Utility/EnumHelper.cs

@@ -881,6 +881,7 @@
    OpenServerRedEnvelope = 122,//开服红包

    EquipDecompose = 123, //装备分解

    TreasureFindHost = 124, //法宝认主

    Dogz = 138, //神兽

    AddPoint = 145,//加点

}

//属性类型