From cebc13fbd99d8b3fa67d6b6a1e95b537f42eec0a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 十月 2018 14:09:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/DogzDungeon/DogzDungeonWin.cs | 1
System/KnapSack/Logic/ItemTipsModel.cs | 8 ++
System/SystemSetting/SystemSetting.cs | 4
System/Vip/VipInvest/RotatePointer.cs | 2
System/FakeDungeon/FakeDemonJarDungeonStage.cs | 2
System/Strengthening/WashMasterActiveWin.cs | 2
System/Treasure/TreasurePotentialPanel.cs | 4 +
System/Vip/VipInvest/WheelOfFortuneWin.cs | 113 ++++++++++++++++++++++++++++---------
8 files changed, 101 insertions(+), 35 deletions(-)
diff --git a/System/DogzDungeon/DogzDungeonWin.cs b/System/DogzDungeon/DogzDungeonWin.cs
index f9ab928..9d34be0 100644
--- a/System/DogzDungeon/DogzDungeonWin.cs
+++ b/System/DogzDungeon/DogzDungeonWin.cs
@@ -109,6 +109,7 @@
{
if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID)
{
+ WindowJumpMgr.Instance.ClearJumpData();
WindowCenter.Instance.Close<LootPreciousFrameWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
}
diff --git a/System/FakeDungeon/FakeDemonJarDungeonStage.cs b/System/FakeDungeon/FakeDemonJarDungeonStage.cs
index a5acbc2..8b644da 100644
--- a/System/FakeDungeon/FakeDemonJarDungeonStage.cs
+++ b/System/FakeDungeon/FakeDemonJarDungeonStage.cs
@@ -109,7 +109,7 @@
{
if (isReconnected)
{
- if (surplusTime < 0f)
+ if (surplusTime <= 0f)
{
if (fighting)
{
diff --git a/System/KnapSack/Logic/ItemTipsModel.cs b/System/KnapSack/Logic/ItemTipsModel.cs
index ad44350..fcf71dc 100644
--- a/System/KnapSack/Logic/ItemTipsModel.cs
+++ b/System/KnapSack/Logic/ItemTipsModel.cs
@@ -1092,7 +1092,6 @@
}
return s;
}
-
#endregion
#region 璁剧疆浼犲灞炴��
@@ -2023,11 +2022,16 @@
if(type == PackType.rptDogzEquip || type == PackType.rptDogzItem)
{
+ strengthDataDict = new Dictionary<int, int>();
if (GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
{
StrengthLV = GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];
}
- strengthDataDict = beastModel.SiteEnhancementAttribute(type,index);
+ Dictionary<int,int> getStregthDict = beastModel.SiteEnhancementAttribute(type,index);
+ foreach(var key in getStregthDict.Keys)
+ {
+ strengthDataDict.Add(key,getStregthDict[key]);
+ }
}
SetWinType();
diff --git a/System/Strengthening/WashMasterActiveWin.cs b/System/Strengthening/WashMasterActiveWin.cs
index c03fc92..493283e 100644
--- a/System/Strengthening/WashMasterActiveWin.cs
+++ b/System/Strengthening/WashMasterActiveWin.cs
@@ -216,7 +216,7 @@
int[] curAttrValues = ConfigParse.GetMultipleStr<int>(curSpecConfig.attByLevelValue);
raiseAttrCell.SetActive(false);
- tempCelllist.Add(GetRaiseGo(Language.Get("MainInterfacePanel_HeadPortraitTip_ZL"),preFightNum.ToString(),(curFightNum-preFightNum).ToString()));
+ tempCelllist.Add(GetRaiseGo(Language.Get("L1056"),preFightNum.ToString(),(curFightNum-preFightNum).ToString()));
for (int i = 0; i < preAttrIds.Length; i++)
{
diff --git a/System/SystemSetting/SystemSetting.cs b/System/SystemSetting/SystemSetting.cs
index 866daa4..d93b252 100644
--- a/System/SystemSetting/SystemSetting.cs
+++ b/System/SystemSetting/SystemSetting.cs
@@ -40,7 +40,7 @@
public float GetSoundVolume()
{
- return LocalSave.GetFloat(SOUND_VOLUME_KEY, 1);
+ return LocalSave.GetFloat(SOUND_VOLUME_KEY, .55f);
}
public void SetSoundEffect(float value)
@@ -50,7 +50,7 @@
public float GetSoundEffect()
{
- return LocalSave.GetFloat(SOUND_EFFECT_KEY, 1);
+ return LocalSave.GetFloat(SOUND_EFFECT_KEY, .55f);
}
public void SetGameFps(GameFps _frame)
diff --git a/System/Treasure/TreasurePotentialPanel.cs b/System/Treasure/TreasurePotentialPanel.cs
index 25fd539..2b40d71 100644
--- a/System/Treasure/TreasurePotentialPanel.cs
+++ b/System/Treasure/TreasurePotentialPanel.cs
@@ -951,7 +951,9 @@
{
DisplayPotentialBook(model.selectedPotentialBook);
var levelUpConfig = GetPotentialLevelUpConfig();
- m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);
+ bool satisfy = levelUpConfig.own >= levelUpConfig.need;
+ m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?
+ TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);
}
}
diff --git a/System/Vip/VipInvest/RotatePointer.cs b/System/Vip/VipInvest/RotatePointer.cs
index b57738c..0dca41e 100644
--- a/System/Vip/VipInvest/RotatePointer.cs
+++ b/System/Vip/VipInvest/RotatePointer.cs
@@ -48,7 +48,7 @@
if (!_isRotate)
{
- if (Math.Abs((360 - Angle) - transform.eulerAngles.z) > 2)
+ if (Math.Abs((360 - Angle) - transform.eulerAngles.z) > 2 && Angle- transform.eulerAngles.z!=0)
{
transform.localRotation = Quaternion.Euler(0, 0, -Angle);
m_CheckDisplay.ShowSelected(wheelOfFortuneModel.Lattice);
diff --git a/System/Vip/VipInvest/WheelOfFortuneWin.cs b/System/Vip/VipInvest/WheelOfFortuneWin.cs
index f05d9fc..3ae1d5c 100644
--- a/System/Vip/VipInvest/WheelOfFortuneWin.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneWin.cs
@@ -23,8 +23,9 @@
[SerializeField] Text Money2_Text;
[SerializeField] Text m_Text_remainingTimes;
[SerializeField] Button m_PromotionBtn;
+ [SerializeField] RotationTween m_RotationTween;
[Header("婊氬姩鏃堕棿")]
- public float RollingTime = 1f;
+ public float RollingTime = 1f;
VipModel m_Vipmodel;
VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }
WheelOfFortuneModel wheelOfFortuneModel { get { return ModelCenter.Instance.GetModel<WheelOfFortuneModel>(); } }
@@ -43,19 +44,25 @@
}
protected override void OnPreOpen()
- {
+ {
FairyJade = (int)UIHelper.GetMoneyCnt(2);
Money1_Text.text = FairyJade.ToString();
Money2_Text.text = UIHelper.GetMoneyCnt(1).ToString();
m_RotatePointer.Init();
- IsLottery();//鍒ゆ柇鏄惁鎷ユ湁娆℃暟
- }
-
+ m_LotteryBtn.interactable = true;
+ RemainingTimes();//鍓╀綑娆℃暟
+ }
+ protected override void OnActived()
+ {
+ Money1_Text.transform.localRotation = Quaternion.Euler(0, 0, 0);
+ m_RotationTween.enabled = false;
+ }
protected override void OnAfterOpen()
{
wheelOfFortuneModel.WheelOfFortuneUpdate += WheelOfFortuneUpdate;
RotatePointer.IsButtonShow += IsButtonShow;
- CheckDisplay.EndOfFlashing += EndOfFlashing;
+ CheckDisplay.EndOfFlashing += EndOfFlashing;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
if (wheelOfFortuneModel.redPointStre1.state == RedPointState.Simple)
{
int GetDayOfYear = DateTime.Now.DayOfYear;
@@ -70,6 +77,15 @@
wheelOfFortuneModel.WheelOfFortuneUpdate -= WheelOfFortuneUpdate;
RotatePointer.IsButtonShow -= IsButtonShow;
CheckDisplay.EndOfFlashing -= EndOfFlashing;
+ PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
+ }
+
+ private void Updatefighting(PlayerDataRefresh obj)
+ {
+ if (obj == PlayerDataRefresh.VIPLv)
+ {
+ RemainingTimes();//鍓╀綑娆℃暟
+ }
}
private void EndOfFlashing()
@@ -81,7 +97,7 @@
{
m_LotteryBtn.interactable = false;
m_RotatePointer.SetTime(m_Toggle.isOn);
- IsLottery();
+ RemainingTimes();//鍓╀綑娆℃暟
}
protected override void OnAfterClose()
@@ -90,8 +106,22 @@
private void OnClickButton()
{
- m_CheckDisplay.CloseAll();
- wheelOfFortuneModel.StartTheDraw();//寮�濮嬫娊濂�
+ int LotteryNumber = vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.BindJadeWheel);
+ if (LotteryNumber <= wheelOfFortuneModel.Number)
+ {
+ LackOfVIP(); //VIP 涓嶈冻
+ return;
+ }
+ else if (LotteryNumber > wheelOfFortuneModel.Number && (int)UIHelper.GetMoneyCnt(1) < wheelOfFortuneModel.NeedJade)
+ {
+ LackFairyJade();//浠欑帀涓嶈冻
+ return;
+ }
+ else if (LotteryNumber > wheelOfFortuneModel.Number && (int)UIHelper.GetMoneyCnt(1) >= wheelOfFortuneModel.NeedJade)
+ {
+ m_CheckDisplay.CloseAll();
+ wheelOfFortuneModel.StartTheDraw();//寮�濮嬫娊濂�
+ }
}
private void OnClickToggle(bool _bool)
{
@@ -105,38 +135,67 @@
}
}
private void OnClickPromotionBtn()
- {
+ {
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.VipRechargeFunc4);
}
private void IsButtonShow(bool _bool)//鏄惁鍙偣鍑绘棆杞�
{
m_LotteryBtn.interactable = _bool;
}
-
- private void IsLottery()
+ private Sequence mScoreSequence;
+ private void TiedJadeChange()//缁戠帀鍙樺寲
+ {
+ m_RotationTween.enabled = true;
+ mScoreSequence = DOTween.Sequence();
+ mScoreSequence.SetAutoKill(false);
+ mScoreSequence.Append(DOTween.To(delegate (float value)
+ {
+ var temp = Math.Floor(value);
+ Money1_Text.text = temp + "";
+ }, FairyJade, (int)UIHelper.GetMoneyCnt(2), RollingTime));
+ mScoreSequence.AppendCallback(() =>
+ {
+ Money1_Text.transform.localRotation = Quaternion.Euler(0, 0, 0);
+ m_RotationTween.enabled = false;
+
+ });
+ FairyJade = (int)UIHelper.GetMoneyCnt(2);
+ }
+
+ private void LackOfVIP()//VIP 涓嶈冻
+ {
+ string str = "娆℃暟涓嶈冻锛岃鎻愬崌VIP";
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), str, (bool isOk) =>
+ {
+ if (isOk)
+ {
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.VipRechargeFunc4);
+ }
+ });
+
+ }
+ private void LackFairyJade()//浠欑帀涓嶈冻
+ {
+ if (VersionConfig.Get().isBanShu)
+ {
+ SysNotifyMgr.Instance.ShowTip("GoldErr");
+ return;
+ }
+ WindowCenter.Instance.Open<RechargeTipWin>();
+ }
+
+ private void RemainingTimes()//鍓╀綑娆℃暟
{
int LotteryNumber = vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.BindJadeWheel);
if (LotteryNumber > wheelOfFortuneModel.Number)
{
- remainingTimes = LotteryNumber - wheelOfFortuneModel.Number;
- m_LotteryBtn.interactable = true;
+ m_Text_remainingTimes.text = "浠婃棩鍙浆鍔ㄦ鏁帮細" + (LotteryNumber - wheelOfFortuneModel.Number);
}
else
{
- m_LotteryBtn.interactable = false;
+ m_Text_remainingTimes.text = "浠婃棩鍙浆鍔ㄦ鏁帮細0";
}
- }
- private Sequence mScoreSequence;
- private void TiedJadeChange()//缁戠帀鍙樺寲
- {
- mScoreSequence = DOTween.Sequence();
- mScoreSequence.SetAutoKill(false);
- mScoreSequence.Append(DOTween.To(delegate(float value)
- {
- var temp = Math.Floor(value);
- Money1_Text.text = temp + "";
- }, FairyJade,(int)UIHelper.GetMoneyCnt(2), RollingTime));
- FairyJade = (int)UIHelper.GetMoneyCnt(2);
+
}
#endregion
--
Gitblit v1.8.0