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

client_Zxw

2018-08-16 51f01783944196016de311a77f0ab53b9a5bb588

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

 Core/GameEngine/Model/Config/StoreConfig.cs

@@ -1,14 +1,14 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, July 31, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Wednesday, August 15, 2018

//--------------------------------------------------------



using UnityEngine;

using System;



namespace TableConfig {



    
    public partial class StoreConfig : ConfigBase {



        public int ID { get ; private set ; }

@@ -31,13 +31,14 @@
        public string SalesStatus { get ; private set; } 

        public int TheOnlyShop { get ; private set ; }

        public int RemindSuccess { get ; private set ; }


        public int IsHideSellOut { get ; private set ; }



        public override string getKey()

        {

            return ID.ToString();

        }

        public override void Parse() {
        }



        public override void Parse() {

            try

            {

                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 

@@ -60,20 +61,20 @@
            

                RefreshType=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 

            

                string[] VIPLVStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                VIPLV = new int[VIPLVStringArray.Length];
                for (int i=0;i<VIPLVStringArray.Length;i++)
                {
                     int.TryParse(VIPLVStringArray[i],out VIPLV[i]);
                string[] VIPLVStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);

                VIPLV = new int[VIPLVStringArray.Length];

                for (int i=0;i<VIPLVStringArray.Length;i++)

                {

                     int.TryParse(VIPLVStringArray[i],out VIPLV[i]);

                }

            

                LV=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 

            

                string[] PurchaseNumberStringArray = rawContents[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
                PurchaseNumber = new int[PurchaseNumberStringArray.Length];
                for (int i=0;i<PurchaseNumberStringArray.Length;i++)
                {
                     int.TryParse(PurchaseNumberStringArray[i],out PurchaseNumber[i]);
                string[] PurchaseNumberStringArray = rawContents[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);

                PurchaseNumber = new int[PurchaseNumberStringArray.Length];

                for (int i=0;i<PurchaseNumberStringArray.Length;i++)

                {

                     int.TryParse(PurchaseNumberStringArray[i],out PurchaseNumber[i]);

                }

            

                MoneyType=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 

@@ -89,17 +90,19 @@
                TheOnlyShop=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 

            

                RemindSuccess=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 

			
                IsHideSellOut=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0; 
            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }
        }
	
    }

}




            }

        }

	
    }



}










 Core/GameEngine/Model/Config/StoreConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 3fdc5e5a65b5ccf40be49e3c5b54064c
timeCreated: 1533042599
timeCreated: 1534322693
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/tagStoreConfig.cs

@@ -72,6 +72,7 @@
                    if (PlayerDatas.Instance.baseData.LV >= s_storeModelDict[type][i].LV)

                    {

                        StoreConfig storeConfig = s_storeModelDict[type][i];

                        //等于1隐藏

                        if (storeConfig.TheOnlyShop == 1)

                        {

                            bool isSellOut = false;

@@ -80,8 +81,8 @@
                                List<StoreConfig> storelist = s_TheOnlyShopDict[storeConfig.ItemID];

                                for (int j = 0; j < storelist.Count; j++)

                                {

                                    BuyShopItemLimit shopItemLimit = ModelCenter.Instance.GetModel<StoreModel>().GetBuyShopLimit((uint)storelist[j].ID);

                                    if (shopItemLimit != null && shopItemLimit.BuyCnt >= storelist[j].PurchaseNumber[0])

                                    int remainCnt = 0;

                                    if (CheckShopIsSellOut(storelist[j], out remainCnt))

                                    {

                                        isSellOut = true;

                                        break;

@@ -95,32 +96,39 @@
                        }

                        else

                        {

                            if (storeConfig.RefreshType != 0)

                            if (storeConfig.IsHideSellOut != 1)

                            {

                                modellist.Add(storeConfig);

                                switch (storeConfig.ShopType)

                                {

                                    case 12:

                                        if (CheckRuneStoreIsCanBuy(storeConfig))

                                        {

                                            modellist.Add(storeConfig);

                                        }

                                        break;

                                    default:

                                        modellist.Add(storeConfig);

                                        break;

                                }



                            }

                            else

                            {

                                int canBuyCnt = 0;

                                int addBuyCnt = 0;

                                bool isLimitBuy = BuyItemPopModel.Instance.CheckIsLimitBuyCnt(storeConfig, out canBuyCnt, out addBuyCnt);

                                BuyShopItemLimit shopItemLimit = ModelCenter.Instance.GetModel<StoreModel>().GetBuyShopLimit((uint)storeConfig.ID);

                                if (isLimitBuy && !_keepOld)

                                int remainCnt = 0;

                                switch (storeConfig.ShopType)

                                {

                                    int remainNum = canBuyCnt;

                                    if (shopItemLimit != null)

                                    {

                                        remainNum = canBuyCnt - shopItemLimit.BuyCnt;

                                    }



                                    if (remainNum > 0)

                                    {

                                        modellist.Add(storeConfig);

                                    }

                                }

                                else

                                {

                                    modellist.Add(storeConfig);

                                    case 12:

                                        if (CheckRuneStoreIsCanBuy(storeConfig) && !CheckShopIsSellOut(storeConfig, out remainCnt))

                                        {

                                            modellist.Add(storeConfig);

                                        }

                                        break;

                                    default:

                                        if (!CheckShopIsSellOut(storeConfig, out remainCnt))

                                        {

                                            modellist.Add(storeConfig);

                                        }

                                        break;

                                }

                            }

                        }

@@ -135,6 +143,42 @@
            return sortlist;

        }



        public static bool CheckShopIsSellOut(StoreConfig storeConfig,out int remainCnt)

        {

            int canBuyCnt = 0;

            int addBuyCnt = 0;

            remainCnt = 0;

            bool isLimitBuy = BuyItemPopModel.Instance.CheckIsLimitBuyCnt(storeConfig, out canBuyCnt, out addBuyCnt);

            BuyShopItemLimit shopItemLimit = ModelCenter.Instance.GetModel<StoreModel>().GetBuyShopLimit((uint)storeConfig.ID);

            if (!isLimitBuy) return false;



            if(shopItemLimit != null)

            {

                remainCnt = canBuyCnt - shopItemLimit.BuyCnt;

                if (canBuyCnt <= shopItemLimit.BuyCnt)

                {

                    return true;

                }

            }

            return false;

        }



        public static bool CheckRuneStoreIsCanBuy(StoreConfig storeConfig)

        {

            Dictionary<int, List<int>> unlockRunelist = ModelCenter.Instance.GetModel<RuneModel>().GetAllUnlockRuneIdlist();

            if(unlockRunelist != null)

            {

                foreach (var tower in unlockRunelist.Keys)

                {

                    if(unlockRunelist[tower].Contains(storeConfig.ItemID))

                    {

                        return true;

                    }

                }

            }

            return false;

        }

       
        public static int CompareByShopSort(StoreConfig start, StoreConfig end)

        {

            int sort1 = start.ShopSort;


 System/Dungeon/TrialDungeonModel.cs

@@ -26,6 +26,15 @@
            ParseConfig();

            packModel.RefreshItemCountAct += RefreshItemCountAct;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            dungeonModel.dungeonRecordChangeEvent += DungeonRecordChangeEvent;

        }



        private void DungeonRecordChangeEvent(int _dungeonId)

        {

            if (_dungeonId == 60010)

            {

                UpdateRedpoint();

            }

        }



        public void OnBeforePlayerDataInitialize()

@@ -282,6 +291,10 @@


        public bool SatisfyExchangeBetter(int _id)

        {

            if (!CompleteTrialFloor(0))

            {

                return false;

            }

            var config = ConfigManager.Instance.GetTemplate<TrialExchangeConfig>(_id);

            if (config == null)

            {

@@ -323,10 +336,25 @@
            return false;

        }



        public bool IsAnySatisfyExchangeBetter()

        public bool IsAnySatisfyExchangeBetter(int _itemId)

        {

            int _class = 0;

            return TryGetSatisfyExchange(out _class);

            if (!trialTokens.Contains(_itemId))

            {

                return false;

            }

            var config = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);

            List<TrialExchangeConfig> list;

            if (TryGetTrialExchanges(config.LV, out list))

            {

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

                {

                    if (SatisfyExchangeBetter(list[i].id))

                    {

                        return true;

                    }

                }

            }

            return false;

        }

        #endregion

    }


 System/HappyXB/HappyXBModel.cs

@@ -74,12 +74,13 @@
        {

            HAPPYXBITEMKEY = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "HappyXBItemTime");

            XBWarehouseRedPoint();

            XBStoreRedPoint();

            m_storeModel.RefreshTCBPlayerDataEvent -= RefreshStoreScore;

            m_storeModel.RefreshTCBPlayerDataEvent += RefreshStoreScore;

        }



        public override void UnInit()

        {

 
           
        }



        /// <summary>

@@ -688,6 +689,13 @@
            }

        }





        private void RefreshStoreScore(PlayerDataRefresh type)

        {

            if (type != PlayerDataRefresh.CDBPlayerRefresh_TreasureScore) return;

            XBStoreRedPoint();

        }



        private List<StoreConfig> storelist = null;

        public void XBStoreRedPoint()

        {


 System/KnapSack/Logic/PackModelInterface.cs

@@ -39,6 +39,7 @@
        PlayerPetDatas petDatas { get { return ModelCenter.Instance.GetModel<PlayerPetDatas>(); } }

        PlayerStrengthengDatas strengthDatas { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }

        MagicianModel magicianModel { get { return ModelCenter.Instance.GetModel<MagicianModel>(); } }

        TrialDungeonModel trialModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }



        private int[] pushItemIds;

        public int[] pushBuffTypeIds;

@@ -468,6 +469,15 @@
                }

            }



            if(trialModel.trialTokens.Contains(itemModel.itemId))

            {

                if(!trialModel.IsAnySatisfyExchangeBetter(itemModel.itemId))

                {

                    isReach = false;

                    return isReach;

                }

            }



            switch (itemModel.chinItemModel.Type)

            {

                case 8:

@@ -561,6 +571,7 @@
                        return isReach;

                    }

                    break;



            }



            return isReach;


 System/MainInterfacePanel/HighSettingTip.cs

@@ -322,7 +322,8 @@
        void OnClickmAllThePeopleBtn()//全民冲榜

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<OpenServerActivityWin>(false,0);

            OpenServerActivityCenter.Instance.selectFuncOrder = (int)OpenServerActivityCenter.OSActivityType.ImpactRank;

            WindowCenter.Instance.Open<OpenServerActivityWin>();

        }

        public void ShowButton()//向上

        {


 System/OpenServerActivity/FlashSaleCoolDown.cs

New file
@@ -0,0 +1,25 @@
using System;

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;



namespace Snxxz.UI

{

    public class FlashSaleCoolDown : MonoBehaviour

    {

        [SerializeField] TimerBehaviour m_Time;



        private void OnEnable()

        {

            DisplayTime();

        }



        void DisplayTime()

        {

            var seconds = OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.FlashSale);

            m_Time.Begin(DateTime.Now.AddTicks(seconds * TimeSpan.TicksPerSecond));

        }

    }

}


 System/OpenServerActivity/FlashSaleCoolDown.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 993e089198a490c489753521954b6672
timeCreated: 1534321918
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/OpenServerActivity/ImpactRankModel.cs

@@ -676,6 +676,8 @@


        Dictionary<int, IOpenServerActivity> openServerActivitys = new Dictionary<int, IOpenServerActivity>();



        public int selectFuncOrder = -1;



        public OpenServerActivityCenter()

        {

            TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;

@@ -742,6 +744,19 @@
        {

            SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

        }



        public enum OSActivityType

        {

            ImpactRank,

            ConsumeRebate,

            OSRedpack,

            OSSale,

            FlashSale,

            MultipleExp,

            OSGift,

            MultipleRealmPoint,

            BossReborn

        }

    }



    public interface IOpenServerActivity


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -64,12 +64,19 @@


        protected override void OnActived()

        {

            bool force = false;

            if (OpenServerActivityCenter.Instance.selectFuncOrder != -1 && !WindowJumpMgr.Instance.IsJumpState)

            {

                functionOrder = OpenServerActivityCenter.Instance.selectFuncOrder;

                force = true;

            }

            OpenServerActivityCenter.Instance.selectFuncOrder = -1;

            if (alreadyOpenActivitys.Count == 0)

            {

                CloseImmediately();

                return;

            }

            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)

            if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState && !force)

            {

                functionOrder = GetDefaultSelect();

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


 System/Realm/RealmUpWin.cs

@@ -51,8 +51,6 @@


        [SerializeField] Button m_RealmPreview;



        [SerializeField] Button m_GetRealmPoint;



        [SerializeField, Header("Boss初始朝向")] Vector3 direction = Vector3.zero;

        [SerializeField, Header("模型位置")] Vector3[] m_ModelPositions;

        [SerializeField, Header("当前境界位置")] Vector3[] m_RealmNowPositions;

@@ -61,7 +59,6 @@
        int cacheRealmPoint = 0;



        RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



        protected override void BindController()

        {

@@ -71,14 +68,12 @@
        {

            m_FuncButton.onClick.AddListener(OnFunctionClick);

            m_RealmPreview.onClick.AddListener(OnRealmPreview);

            m_GetRealmPoint.onClick.AddListener(GetRealmPoint);

        }



        protected override void OnPreOpen()

        {

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

            dailyQuestModel.realmPointUpdateEvent += RealmPointUpdateEvent;

            cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint;

            Display();

        }

@@ -104,7 +99,6 @@
        {

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

            dailyQuestModel.realmPointUpdateEvent -= RealmPointUpdateEvent;

            UI3DModelExhibition.Instance.StopShowNPC();

            UI3DModelExhibition.Instance.StopShowPlayer();

            realmModel.realmDungeonState = false;

@@ -133,7 +127,6 @@
                DisplayButton();

                DisplayProgress();

                DisplayContainer();

                DisplayGetRealmPoint();

            }

            else if (refreshType == PlayerDataRefresh.RealmPoint)

            {

@@ -158,7 +151,6 @@
            DisplayProgress();

            DisplayButton();

            DisplayContainer();

            DisplayGetRealmPoint();

        }



        private void DisplayRealmNow()

@@ -282,11 +274,6 @@
            }

        }



        void DisplayGetRealmPoint()

        {

            m_GetRealmPoint.gameObject.SetActive(!realmModel.IsRealmHighest && dailyQuestModel.gotableRealmPoint > 0);

        }



        void DisplayGetRealmPointSfx()

        {

            if (m_GetRealmPointSfx != null)

@@ -326,26 +313,9 @@
            }

        }



        private void RealmPointUpdateEvent()

        {

            DisplayGetRealmPoint();

        }



        private void OnRealmPreview()

        {

            WindowCenter.Instance.Open<RealmPreviewWin>();

        }



        private void GetRealmPoint()

        {

            if (dailyQuestModel.gotableRealmPoint > 0)

            {

                dailyQuestModel.RequestGetRealmPoint();

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("DailyquestNothingToGet");

            }

        }



        void HandleAchievement()


 System/WindowJump/WindowJumpMgr.cs

@@ -446,7 +446,6 @@
                break;

            case JumpUIType.VipRechargeFunc1:

            case JumpUIType.VipRechargeFunc2:

            case JumpUIType.VipRechargeFunc3:

            case JumpUIType.VipRechargeFunc4:

            case JumpUIType.VipRechargeFunc5:

                if (VersionConfig.Get().isBanShu)

@@ -486,6 +485,8 @@
            case JumpUIType.FindPreciousFrameFunc3:

            case JumpUIType.FindPreciousFrameFunc4:

            case JumpUIType.FindPreciousFrameFunc5:

            case JumpUIType.FindPreciousFrameFunc2Type2:

            case JumpUIType.FindPreciousFrameFunc4Type2:

                SetJumpLogic<FindPreciousFrameWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LootPreciousFrameFunc1:

@@ -517,6 +518,7 @@
            case JumpUIType.WelfareFunc2:

            case JumpUIType.WelfareFunc3:

            case JumpUIType.WelfareFunc2Type2:

            case JumpUIType.VipRechargeFunc3:

                SetJumpLogic<WelfareWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.SystemSettingFunc1:

@@ -610,9 +612,6 @@
            case JumpUIType.TreasureFindHostFunc3Type2:

                SetJumpLogic<TreasureFindHostWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.OpenServerGift:

                SetJumpLogic<OpenServerGiftWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.Alchemyrescripte104:

            case JumpUIType.Alchemyrescripte105:

                ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe =int.Parse(_tagWinSearchModel.SelectActive);

@@ -633,13 +632,12 @@
            case JumpUIType.TreasureSoul:

                SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.LimitedTimePackage:

                SetJumpLogic<LimitedTimePackageWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.OSTimeLimitGift:

            case JumpUIType.FlashSale:

            case JumpUIType.ConsumreRebate:

            case JumpUIType.BossReborn:

            case JumpUIType.OpenServerGift:

            case JumpUIType.LimitedTimePackage:

                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.BestXB:

@@ -1027,7 +1025,7 @@
    StoreFunc5 = 76,

    VipRechargeFunc1 = 77,

    VipRechargeFunc2 = 78,

    VipRechargeFunc3 = 79,

    VipRechargeFunc3 = 79,//仙玉投资

    VipRechargeFunc4 = 80,

    VipRechargeFunc5 = 81,

    FindPreciousFrameFunc1 = 82,

@@ -1154,6 +1152,9 @@
    TrialDungeonSelect1 = 217, //宗门试练一层

    TrialDungeonSelect2 = 218, //宗门试练二层

    TrialDungeonSelect3 = 219, //宗门试练三层

    FindPreciousFrameFunc4Type2 = 220, //古神禁地界面 返回主界面

    FindPreciousFrameFunc2Type2 = 221, //BOSS之家 返回主界面



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面