From fc53398aaa240c8a5c649668de2eb476f1684af0 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 06 九月 2018 15:51:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Strengthening/WingsRedDot.cs | 25 +++++++++++++++----------
System/DailyQuest/ResourcesBackModel.cs | 2 +-
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/System/DailyQuest/ResourcesBackModel.cs b/System/DailyQuest/ResourcesBackModel.cs
index 51a0353..ce8b349 100644
--- a/System/DailyQuest/ResourcesBackModel.cs
+++ b/System/DailyQuest/ResourcesBackModel.cs
@@ -99,7 +99,7 @@
public void OnBeforePlayerDataInitialize()
{
- IsPointStre = true;
+ // IsPointStre = true;
IsMainGo = false;
ResourcesBackDic.Clear();
}
diff --git a/System/Strengthening/WingsRedDot.cs b/System/Strengthening/WingsRedDot.cs
index 24713d7..edec637 100644
--- a/System/Strengthening/WingsRedDot.cs
+++ b/System/Strengthening/WingsRedDot.cs
@@ -19,7 +19,6 @@
public Redpoint redPointStre = new Redpoint(MainRedDot.RedPoint_key1, Redpoint_key);
private int WingNumber = 0;//缈呰唨鏁伴噺鏍囪
private int Marking = 0;
- private bool IsOk = false;
private bool IsOnePutOn = true;
public bool IsBoolOpenWingeWin = false;
PlayerPackModel _playerPack;
@@ -30,26 +29,34 @@
public override void Init()
{
- playerPack.ItemCntAddAct += ItemCntAddAct;
- playerPack.RefreshItemCountAct += OnItemRefreshEvent;
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
+
}
public void OnPlayerLoginOk()
{
- IsOk = true;
+
+ playerPack.ItemCntAddAct += ItemCntAddAct;
+ playerPack.RefreshItemCountAct += OnItemRefreshEvent;
+ FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing);
+ if (IsOnePutOn)
+ {
+ WingsDot();
+ }
if (itemModel != null)
{
IsOnePutOn = false;
}
+
}
public void OnBeforePlayerDataInitialize()
{
- IsOk = false;
+ playerPack.ItemCntAddAct -= ItemCntAddAct;//鐗╁搧鏁伴噺鍒锋柊
+ playerPack.RefreshItemCountAct -= OnItemRefreshEvent;//鑳屽寘鍒锋柊
+ FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
}
private void OnItemRefreshEvent(PackType type, int index, int id)
{
- if (type == PackType.rptItem && ItemConfig.tag_Wings.ContainsKey(id) && IsOk && IsOnePutOn)
+ if (type == PackType.rptItem && ItemConfig.tag_Wings.ContainsKey(id)&& IsOnePutOn)
{
WingsDot();
IsOnePutOn = false;
@@ -58,9 +65,7 @@
public override void UnInit()
{
- playerPack.ItemCntAddAct -= ItemCntAddAct;//鐗╁搧鏁伴噺鍒锋柊
- playerPack.RefreshItemCountAct -= OnItemRefreshEvent;//鑳屽寘鍒锋柊
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
+
}
--
Gitblit v1.8.0