From 36b5c8347842e5eb5efeb5b151eebd00ccb2a48d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 29 四月 2019 19:37:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HazyRegion/HazyRegionModel.cs | 2 +-
System/YinJi.meta | 9 +++++++++
System/EquipStar/EquipStarModel.cs | 4 ++--
Lua/Gen/LimitedTimePackageItemClassModelWrap.cs | 2 +-
System/RidingPet/ContainerRidingPet.cs | 2 +-
System/Activity/ActivityNotifyBehaviour.cs | 3 +++
System/Vip/LimitedTimePackageModel.cs | 6 +++---
7 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/Lua/Gen/LimitedTimePackageItemClassModelWrap.cs b/Lua/Gen/LimitedTimePackageItemClassModelWrap.cs
index 590cfc6..4b44d0d 100644
--- a/Lua/Gen/LimitedTimePackageItemClassModelWrap.cs
+++ b/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);
diff --git a/System/Activity/ActivityNotifyBehaviour.cs b/System/Activity/ActivityNotifyBehaviour.cs
index a55fdf9..0d74fe5 100644
--- a/System/Activity/ActivityNotifyBehaviour.cs
+++ b/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
diff --git a/System/EquipStar/EquipStarModel.cs b/System/EquipStar/EquipStarModel.cs
index 610fca3..69f9caf 100644
--- a/System/EquipStar/EquipStarModel.cs
+++ b/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)
{
diff --git a/System/HazyRegion/HazyRegionModel.cs b/System/HazyRegion/HazyRegionModel.cs
index eb480fe..39bf2e2 100644
--- a/System/HazyRegion/HazyRegionModel.cs
+++ b/System/HazyRegion/HazyRegionModel.cs
@@ -43,7 +43,7 @@
{
get
{
- return hazyRegionOpenTimes <= fakeOpenTimes
+ return hazyRegionOpenTimes < fakeOpenTimes
|| !FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HazyRegion);
}
}
diff --git a/System/RidingPet/ContainerRidingPet.cs b/System/RidingPet/ContainerRidingPet.cs
index 9e3b2eb..2bae492 100644
--- a/System/RidingPet/ContainerRidingPet.cs
+++ b/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;
diff --git a/System/Vip/LimitedTimePackageModel.cs b/System/Vip/LimitedTimePackageModel.cs
index 00ac92a..3ba655f 100644
--- a/System/Vip/LimitedTimePackageModel.cs
+++ b/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;
diff --git a/System/YinJi.meta b/System/YinJi.meta
new file mode 100644
index 0000000..7541dee
--- /dev/null
+++ b/System/YinJi.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d0b00b50908bef240aab8e11fa0119e0
+folderAsset: yes
+timeCreated: 1556421759
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.8.0