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

client_Hale

2019-04-29 36b5c8347842e5eb5efeb5b151eebd00ccb2a48d

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

 Lua/Gen/LimitedTimePackageItemClassModelWrap.cs

@@ -295,7 +295,7 @@
                
                {
                    
                        bool gen_ret = gen_to_be_invoked.IsExpired(  );
                        bool gen_ret = !gen_to_be_invoked.IsExpired(  );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    
                    

 System/Activity/ActivityNotifyBehaviour.cs

@@ -155,6 +155,9 @@
                    case DailyQuestType.HazyRegion:

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

                        break;

                    case DailyQuestType.RidingPetActivity:

                        WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);

                        break;

                }

            }

            else


 System/EquipStar/EquipStarModel.cs

@@ -527,8 +527,8 @@
            if (upgradable)
            {
                var currentStarLevel = GetEquipStarLevel(equipPosition);
                var config = EquipStarConfig.Get(equipPosition.x, equipPosition.y, currentStarLevel);
                if (config.CostEquipCnt == 0)
                var config = EquipStarConfig.Get(equipPosition.x, equipPosition.y, currentStarLevel + 1);
                if (config != null && config.CostEquipCnt == 0)
                {
                    if (config.CostItemDict.x > 0)
                    {

 System/HazyRegion/HazyRegionModel.cs

@@ -43,7 +43,7 @@
        {

            get

            {

                return hazyRegionOpenTimes <= fakeOpenTimes

                return hazyRegionOpenTimes < fakeOpenTimes

                  || !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HazyRegion);

            }

        }


 System/RidingPet/ContainerRidingPet.cs

@@ -21,7 +21,7 @@
        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        

        RidingPetBossModel ridingPetMdoel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } }

        public int RawImagetestBossID = 50103006;

        //public int RawImagetestBossID = 50103006;

        public RewardPositionType rewardPositonType;

        [SerializeField] ItemCell[] m_RewardArray;




 System/Vip/LimitedTimePackageModel.cs

@@ -27,7 +27,7 @@
    {

        get

        {

            return IsExpired();

            return !IsExpired();

        }

    }



@@ -108,8 +108,8 @@
        }

        int GetDayOfYear = DateTime.Now.DayOfYear;

        int day = LocalSave.GetInt("IsOpenLimitedTime");

        bool Isbool = IsExpired();

        if (day != GetDayOfYear && IsExpired())

        bool Isbool = !IsExpired();

        if (day != GetDayOfYear && !IsExpired())

        {

         //   LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);

            redPointStre1.state = RedPointState.Simple;


 System/YinJi.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: d0b00b50908bef240aab8e11fa0119e0
folderAsset: yes
timeCreated: 1556421759
licenseType: Pro
DefaultImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: