From 97b3bb6df1751cd366d7caa3664d3f244a7243ac Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 26 三月 2019 13:53:13 +0800
Subject: [PATCH] 3335 删除无用代码
---
/dev/null | 12 ----
System/Treasure/TreasureAchievement.cs | 8 --
System/Treasure/FairyTreasureCollectPanelPattern5.cs | 9 ---
Lua/Gen/SnxxzUITreasureModelWrap.cs | 63 ---------------------
System/Treasure/TreasureModel.cs | 31 ----------
5 files changed, 2 insertions(+), 121 deletions(-)
diff --git a/Lua/Gen/SnxxzUITreasureModelWrap.cs b/Lua/Gen/SnxxzUITreasureModelWrap.cs
index 113c3ff..f4fc4ec 100644
--- a/Lua/Gen/SnxxzUITreasureModelWrap.cs
+++ b/Lua/Gen/SnxxzUITreasureModelWrap.cs
@@ -62,9 +62,7 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "demonTreasureDungeonUpdate", _e_demonTreasureDungeonUpdate);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "demonDungeonChallengeNext", _e_demonDungeonChallengeNext);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "stoveRedpoint", _g_get_stoveRedpoint);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "selectedTreasure", _g_get_selectedTreasure);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureStepUpShow", _g_get_treasureStepUpShow);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureStageUpShow", _g_get_treasureStageUpShow);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentCategory", _g_get_currentCategory);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "collectingHuman", _g_get_collectingHuman);
@@ -80,11 +78,9 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "treasureBackLvLimit", _g_get_treasureBackLvLimit);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "exitRecord", _g_get_exitRecord);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "entranceOpenCondition", _g_get_entranceOpenCondition);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "cacheGotAchievements", _g_get_cacheGotAchievements);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "vipKillNPCTreasure", _g_get_vipKillNPCTreasure);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "selectedTreasure", _s_set_selectedTreasure);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "treasureStepUpShow", _s_set_treasureStepUpShow);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "treasureStageUpShow", _s_set_treasureStageUpShow);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "currentCategory", _s_set_currentCategory);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "collectingHuman", _s_set_collectingHuman);
@@ -984,22 +980,6 @@
}
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_stoveRedpoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.stoveRedpoint);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_selectedTreasure(RealStatePtr L)
{
@@ -1008,20 +988,6 @@
Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.selectedTreasure);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_treasureStepUpShow(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.treasureStepUpShow);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
@@ -1239,20 +1205,6 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_cacheGotAchievements(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.cacheGotAchievements);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_vipKillNPCTreasure(RealStatePtr L)
{
try {
@@ -1288,21 +1240,6 @@
Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
gen_to_be_invoked.selectedTreasure = LuaAPI.xlua_tointeger(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_treasureStepUpShow(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.TreasureModel gen_to_be_invoked = (Snxxz.UI.TreasureModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.treasureStepUpShow = LuaAPI.lua_toboolean(L, 2);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern5.cs b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
index fb36cfb..82b50b6 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern5.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -198,10 +198,6 @@
if (_effect != null)
{
var _index = i;
- if (_index == m_FurnacesIcons.Length - 1)
- {
- model.treasureStepUpShow = true;
- }
_effect.OnComplete = () =>
{
_effect.OnComplete = null;
@@ -238,16 +234,11 @@
StartCoroutine(Co_Fly());
};
}
- else
- {
- model.treasureStepUpShow = false;
- }
}
IEnumerator Co_Fly()
{
yield return WaitingForSecondConst.WaitMS300;
- model.treasureStepUpShow = false;
BeginFly();
}
diff --git a/System/Treasure/TreasureAchievement.cs b/System/Treasure/TreasureAchievement.cs
index eb0b569..f6f4e65 100644
--- a/System/Treasure/TreasureAchievement.cs
+++ b/System/Treasure/TreasureAchievement.cs
@@ -126,7 +126,7 @@
private void GotoComplete()
{
- if (m_TreasureCyclicScroll.showing || treasureModel.treasureStepUpShow)
+ if (m_TreasureCyclicScroll.showing)
{
return;
}
@@ -150,15 +150,11 @@
private void GetAward()
{
- if (m_TreasureCyclicScroll.showing || treasureModel.treasureStepUpShow)
+ if (m_TreasureCyclicScroll.showing)
{
return;
}
model.GetAchievementReward(achievement.id);
- if (!treasureModel.cacheGotAchievements.Contains(achievement.id))
- {
- treasureModel.cacheGotAchievements.Add(achievement.id);
- }
}
private void OnAchievementProgressUpdate(int _achievementId)
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index bbc1cb4..4517434 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -32,8 +32,6 @@
Redpoint elderGodRedpoint = new Redpoint(TREASURE_REDPOINTID, CATEGORY_REDPOINTIDS[(int)TreasureCategory.King - 1]);
Redpoint zergRedpoint = new Redpoint(TREASURE_REDPOINTID, CATEGORY_REDPOINTIDS[(int)TreasureCategory.Zerg - 1]);
- public Redpoint stoveRedpoint { get; private set; }
-
public event Action<int> treasureCollectProgressUpdateEvent;
public event Action<int> treasureSelectedEvent;
public event Action<TreasureCategory> collectingTreasureChangeEvent;
@@ -58,8 +56,6 @@
}
}
}
-
- public bool treasureStepUpShow { get; set; }
public bool treasureStageUpShow { get; set; }
@@ -135,8 +131,6 @@
public int exitRecord { get; set; }
public int entranceOpenCondition { get; private set; }
- public List<int> cacheGotAchievements { get { return m_CacheGotAchievements; } }
-
AchievementModel achievementModel { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } }
VIPKillNPCTreasure m_VIPKillNPCTreasure;
@@ -204,7 +198,6 @@
playerLevelRefresh = false;
needDisplayReguluLevelUp = false;
treasureUnlockShowDict.Clear();
- cacheGotAchievements.Clear();
foreach (var treasure in treasures.Values)
{
treasure.state = TreasureState.Locked;
@@ -474,8 +467,6 @@
}
}
}
-
- UpdateStoveRedpoint();
}
private void OnAchievementProgressUpdate(int _achievement)
@@ -493,11 +484,6 @@
{
UpdateTreasureCollectProgress(treasure);
}
- }
-
- if (eightFurnacesAchievements.Contains(_achievement))
- {
- UpdateStoveRedpoint();
}
}
@@ -573,16 +559,6 @@
treasureDungeon.challengeRedpoint.state = RedPointState.Simple;
}
}
- }
- }
-
- private void UpdateStoveRedpoint()
- {
- Treasure treasure;
- if (TryGetTreasure(301, out treasure))
- {
- stoveRedpoint.state = RedPointState.None;
- return;
}
}
@@ -709,11 +685,6 @@
}
}
}
- }
-
- if (eightFurnacesAchievements.Contains(_achievementId))
- {
- UpdateStoveRedpoint();
}
}
@@ -859,8 +830,6 @@
funcConfig = FuncConfigConfig.Get("OpenFabao");
entranceOpenCondition = int.Parse(funcConfig.Numerical1);
-
- stoveRedpoint = new Redpoint(CATEGORY_REDPOINTIDS[(int)TreasureCategory.Fairy - 1], TREASURE_REDPOINTBASE + redpointIndex++);
var treasureDungeonConfigs = TreasureDungeonConfig.GetValues();
foreach (var config in treasureDungeonConfigs)
diff --git a/System/Treasure/TreasureUnlockCell.cs b/System/Treasure/TreasureUnlockCell.cs
deleted file mode 100644
index a63257c..0000000
--- a/System/Treasure/TreasureUnlockCell.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class TreasureUnlockCell : CellView
- {
- [SerializeField] Image m_Icon;
- [SerializeField] Text m_Func;
- [SerializeField] Image m_Cutline;
- [SerializeField] Button m_Button;
-
- TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
-
- public void Display(int id, int stage)
- {
- m_Button.RemoveAllListeners();
- Treasure treasure;
- if (model.TryGetTreasure(id, out treasure))
- {
- var treasureStage = treasure.treasureStages.Find((x) =>
- {
- return x.stage == stage;
- });
- bool last = true;
- for (int i = 0; i < treasure.treasureStages.Count; i++)
- {
- var _stage = treasure.treasureStages[i];
- if (stage < _stage.stage &&
- (_stage.unlockType == TreasureStageUnlock.Func || _stage.unlockType == TreasureStageUnlock.Skill
- || _stage.unlockType == TreasureStageUnlock.Treasure || _stage.unlockType == TreasureStageUnlock.TreasureSoul))
- {
- last = false;
- break;
- }
- }
- m_Cutline.gameObject.SetActive(!last);
- if (treasureStage != null)
- {
- switch (treasureStage.unlockType)
- {
- case TreasureStageUnlock.Skill:
- var skillConfig = SkillConfig.Get(treasureStage.GetSkill(PlayerDatas.Instance.baseData.Job));
- if (skillConfig != null)
- {
- m_Icon.SetSprite(skillConfig.IconName);
- m_Func.text = Language.Get("TreasureUnlockNewSkill");
- }
- break;
- case TreasureStageUnlock.Func:
- var funcConfig = FuncOpenLVConfig.Get(treasureStage.func);
- if (funcConfig != null)
- {
- m_Icon.SetSprite(funcConfig.Icon);
- m_Func.text = Language.Get("TreasureUnlockNewFunc");
- }
- break;
- case TreasureStageUnlock.Treasure:
- var treasureConfig = TreasureConfig.Get(treasureStage.treasure);
- if (treasureConfig != null)
- {
- m_Icon.SetSprite(treasureConfig.Icon);
- m_Func.text = Language.Get("TreasureUnlockNewTreasure");
- }
- break;
- case TreasureStageUnlock.TreasureSoul:
- var treasureSoulConfig = TreasurePrivilegeConfig.Get(treasureStage.treasureSoul);
- if (treasureSoulConfig != null)
- {
- m_Icon.SetSprite(treasureSoulConfig.Icon);
- m_Func.text = Language.Get("TreasureUnlockNewTreasureSoul");
- }
- break;
- }
- m_Button.AddListener(() =>
- {
- if (model.treasureStepUpShow)
- {
- return;
- }
- TreasureStageTipWin.selectStage = treasureStage.stage;
- if (!WindowCenter.Instance.IsOpen<TreasureStageTipWin>())
- {
- TreasureStageTipWin.SetTargetPosition(m_Button.transform as RectTransform);
- WindowCenter.Instance.Open<TreasureStageTipWin>();
- }
- });
- }
- }
- }
- }
-}
-
diff --git a/System/Treasure/TreasureUnlockCell.cs.meta b/System/Treasure/TreasureUnlockCell.cs.meta
deleted file mode 100644
index ddead50..0000000
--- a/System/Treasure/TreasureUnlockCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 77f99fdc05a9d774ab1f11302d406df8
-timeCreated: 1534492640
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0