From 402c044e56eacd0f977f3a65b48409cd5d0fa3b8 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 14 三月 2019 17:28:46 +0800
Subject: [PATCH] 3335 删除仙盟仓库相关
---
/dev/null | 12 ------------
Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs | 11 ++---------
System/WindowJump/WindowJumpMgr.cs | 2 +-
Core/GameEngine/Model/Player/PlayerDatas.cs | 1 -
Core/GameEngine/DataToCtl/PackageRegedit.cs | 2 --
Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs | 18 ++----------------
System/FairyAu/BasicFunction.cs | 7 -------
System/BlastFurnace/GetItemPathModel.cs | 3 ---
System/WindowBase/ModelCenter.cs | 1 -
9 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/Core/GameEngine/DataToCtl/PackageRegedit.cs b/Core/GameEngine/DataToCtl/PackageRegedit.cs
index 95ec56d..d694fdb 100644
--- a/Core/GameEngine/DataToCtl/PackageRegedit.cs
+++ b/Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -179,7 +179,6 @@
Register(typeof(HA004_tagServerDateTime), typeof(DTCA004_tagServerDateTime));
Register(typeof(HA402_tagGCFamilyBossFBInfo), typeof(DTCA402_tagGCFamilyBossFBInfo));
Register(typeof(HA405_tagGCFamilyRedPacketGrabInfo), typeof(DTCA405_tagGCFamilyRedPacketGrabInfo));
- Register(typeof(HA406_tagGCFamilyStoreItemInfo), typeof(DTCA406_tagGCFamilyStoreItemInfo));
Register(typeof(HA403_tagGCFamilyActionInfo), typeof(DTCA403_tagGCFamilyActionInfo));
Register(typeof(H0431_tagTimeTick), typeof(DTC0431_tagTimeTick));
Register(typeof(H0320_tagFBEnd), typeof(DTC0320_tagFBEnd));
@@ -188,7 +187,6 @@
Register(typeof(H0826_tagClearMissionDict), typeof(DTC0826_tagClearMissionDict));
Register(typeof(H0801_tagEventTalk), typeof(DTC0801_tagEventTalk));
Register(typeof(H0703_tagRolePickupItem), typeof(DTC0703_tagRolePickupItem));
- Register(typeof(HA407_tagGCFamilyStoreItemClear), typeof(DTCA407_tagGCFamilyStoreItemClear));
Register(typeof(HA320_tagMCPlayerFBInfoData), typeof(DTCA320_tagMCPlayerFBInfoData));
Register(typeof(HA708_tagMCRunTaskAwardInfo), typeof(DTCA708_tagMCRunTaskAwardInfo));
diff --git a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
index a863b93..8fff9be 100644
--- a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
+++ b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -22,8 +22,6 @@
{
get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }
}
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
public FairyData fairy = null;
public FairyMember mine = null;
public event Action OnRefreshFairyInfo;
@@ -136,17 +134,7 @@
member = null;
}
- fairyBossModel.UpdateRedPoint();
- //Z-xw鍐�
- if (!playerFairyAuTreasureData._DicfamilyStoreItem.ContainsKey(0))
- {
- FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
- _FamilyStoreItemP.Index = 0;
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
- playerFairyAuTreasureData._DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
- }
-
+ fairyBossModel.UpdateRedPoint();
if (OnRefreshFairyInfo != null) OnRefreshFairyInfo();
}
@@ -280,9 +268,7 @@
else
{
ClearFairyData();
- LocalChatHistory.Clear(ChatInfoType.Fairy);
- //Z-xw鍐�
- playerFairyAuTreasureData._DicfamilyStoreItem.Clear();
+ LocalChatHistory.Clear(ChatInfoType.Fairy);
}
if (OnRefreshFairyMine != null)
{
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index cba7960..478a251 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -708,7 +708,6 @@
method.CepaContribution((int)value);
break;
case PlayerDataType.FamilyStoreScore:
- ModelCenter.Instance.GetModel<FairyAuTreasureModel>().FairyAuIntegral((int)value);
break;
case PlayerDataType.SuperHitReduce:
extersion.SuperHitReduce = (int)value;
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs
deleted file mode 100644
index b15f0af..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-//04 16 骠车出现#tagTruckAppearView
-
-public class DTC0416_tagTruckAppearView : DtcBasic {
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- H0416_tagTruckAppearView vNetData = vNetPack as H0416_tagTruckAppearView;
- }
-}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs.meta b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs.meta
deleted file mode 100644
index 35af8c9..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6cbaf5d8772fc444b987b5aee22c51a6
-timeCreated: 1502519190
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs
index 02ea477..52f9c69 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs
@@ -8,15 +8,8 @@
public class DTCA403_tagGCFamilyActionInfo : DtcBasic {
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA403_tagGCFamilyActionInfo vNetData = vNetPack as HA403_tagGCFamilyActionInfo;
if (vNetData != null)
- {
-
- playerFairyAuTreasureData.FamilyActionInfo(vNetData);
-
- }
+ base.Done(vNetPack);
+ HA403_tagGCFamilyActionInfo vNetData = vNetPack as HA403_tagGCFamilyActionInfo;
}
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs
deleted file mode 100644
index e45fd71..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using Snxxz.UI;
-
-// A4 06 家族仓库物品信息 #tagGCFamilyStoreItemInfo
-
-
-
-public class DTCA406_tagGCFamilyStoreItemInfo : DtcBasic {
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA406_tagGCFamilyStoreItemInfo vNetData = vNetPack as HA406_tagGCFamilyStoreItemInfo;
if (vNetData != null)
- {
-
- playerFairyAuTreasureData.FamilyStoreItemInfo(vNetData);
-
- }
- }
-}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs.meta b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs.meta
deleted file mode 100644
index 3317607..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: b2de4795a881ad9448d8c047f44cbda5
-timeCreated: 1505227309
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs
deleted file mode 100644
index c63342c..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using Snxxz.UI;
-
-// A4 07 家族仓库物品清除 #tagGCFamilyStoreItemClear
-
-public class DTCA407_tagGCFamilyStoreItemClear : DtcBasic {
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
-
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA407_tagGCFamilyStoreItemClear vNetData = vNetPack as HA407_tagGCFamilyStoreItemClear;
- if (vNetData != null)
- {
- for (int i = 0; i < vNetData.IndexCount; i++)
- {
- playerFairyAuTreasureData.FamilyStoreDel(vNetData.IndexList[i], vNetData.ClearType);
- }
- playerFairyAuTreasureData.WarehouseToRefresh(vNetData.IndexList);
- }
- }
-}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs.meta b/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs.meta
deleted file mode 100644
index a8105ca..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: dd1bfc1cd2d60a944af79c58ca261a97
-timeCreated: 1508837222
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
deleted file mode 100644
index 56e5988..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 3e05761d690b75440a6be79207d0fb01
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
deleted file mode 100644
index 1044caa..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 1d70ccd06161e0443b7a802ad94292f8
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
deleted file mode 100644
index 314efd1..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 71e878ac60c49ad4f964dd2dbc725739
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta b/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
deleted file mode 100644
index 6ed37c0..0000000
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: eed34091b0568664b9fb42f0634496c1
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs b/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs
deleted file mode 100644
index 0bed846..0000000
--- a/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-//04 16 骠车出现#tagTruckAppearView
-
-public class H0416_tagTruckAppearView : GameNetPackBasic {
- public uint ObjID;
- public uint NPCID;
- public ushort NPCFaceDir; //NPC的面向
- public uint NPCHP;
- public ushort NPCEventType; //0 攻击 1 事件
- public byte IsActive; //这个NPC是否活着
- public ushort PosX;
- public ushort PosY;
- public byte Country; //国籍
- public ushort NameLen;
- public string Name; //size = NameLen
- public ushort Speed;
- public uint PlayerID; //拥有者ID
-
- public H0416_tagTruckAppearView () {
- _cmd = (ushort)0x0416;
- }
-
- public override void ReadFromBytes (byte[] vBytes) {
- TransBytes (out ObjID, vBytes, NetDataType.DWORD);
- TransBytes (out NPCID, vBytes, NetDataType.DWORD);
- TransBytes (out NPCFaceDir, vBytes, NetDataType.WORD);
- TransBytes (out NPCHP, vBytes, NetDataType.DWORD);
- TransBytes (out NPCEventType, vBytes, NetDataType.WORD);
- TransBytes (out IsActive, vBytes, NetDataType.BYTE);
- TransBytes (out PosX, vBytes, NetDataType.WORD);
- TransBytes (out PosY, vBytes, NetDataType.WORD);
- TransBytes (out Country, vBytes, NetDataType.BYTE);
- TransBytes (out NameLen, vBytes, NetDataType.WORD);
- TransBytes (out Name, vBytes, NetDataType.Chars, NameLen);
- TransBytes (out Speed, vBytes, NetDataType.WORD);
- TransBytes (out PlayerID, vBytes, NetDataType.DWORD);
- }
-
-}
diff --git a/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs.meta b/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs.meta
deleted file mode 100644
index 0b566c2..0000000
--- a/Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6cdfe72d222ae994f8d7b374beaa361d
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
diff --git a/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs b/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs
deleted file mode 100644
index e3a9128..0000000
--- a/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-// A4 06 家族仓库物品信息 #tagGCFamilyStoreItemInfo
-
-public class HA406_tagGCFamilyStoreItemInfo : GameNetPackBasic {
- public byte Count; //数量
- public tagGCFamilyStoreItem[] StoreItemList = null; //size = Count
-
- public HA406_tagGCFamilyStoreItemInfo () {
- _cmd = (ushort)0xA406;
- }
-
- public override void ReadFromBytes (byte[] vBytes) {
- TransBytes (out Count, vBytes, NetDataType.BYTE);
- StoreItemList = new tagGCFamilyStoreItem[Count];
- for (int i = 0; i < Count; i ++) {
- StoreItemList[i] = new tagGCFamilyStoreItem();
- TransBytes (out StoreItemList[i].Index, vBytes, NetDataType.BYTE);
- TransBytes (out StoreItemList[i].ItemID, vBytes, NetDataType.DWORD);
- TransBytes (out StoreItemList[i].ItemDataLen, vBytes, NetDataType.WORD);
- TransBytes (out StoreItemList[i].ItemData, vBytes, NetDataType.Chars, StoreItemList[i].ItemDataLen);
- }
- }
-
- public class tagGCFamilyStoreItem {
- public byte Index; // 仓库格子索引，从0开始代表第一格
- public uint ItemID; // 物品ID
- public ushort ItemDataLen;
- public string ItemData; //size = ItemDataLen
- }
-
-}
diff --git a/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs.meta b/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs.meta
deleted file mode 100644
index 2244f9b..0000000
--- a/Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: cc83fed152f670643b0d210d4327b13d
-timeCreated: 1505227309
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs b/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs
deleted file mode 100644
index 918c80c..0000000
--- a/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-// A4 07 家族仓库物品清除 #tagGCFamilyStoreItemClear
-
-public class HA407_tagGCFamilyStoreItemClear : GameNetPackBasic {
- public byte ClearType; //0-指定格子清除; 1-所有物品清除
- public byte IndexCount;
- public byte[] IndexList; //清除的格子索引, 仅指定格子清除时有效,从0开始代表第一格
-
- public HA407_tagGCFamilyStoreItemClear () {
- _cmd = (ushort)0xA407;
- }
-
- public override void ReadFromBytes (byte[] vBytes) {
- TransBytes (out ClearType, vBytes, NetDataType.BYTE);
- TransBytes (out IndexCount, vBytes, NetDataType.BYTE);
- TransBytes (out IndexList, vBytes, NetDataType.BYTE, IndexCount);
- }
-
-}
diff --git a/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs.meta b/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs.meta
deleted file mode 100644
index d8d6351..0000000
--- a/Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 2efcb47a030ad9243a2fc587621a620f
-timeCreated: 1508837222
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta b/Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
deleted file mode 100644
index 418ee88..0000000
--- a/Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 32ceb8b7faf99f84a8b73ce53c5e3e4d
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HAE_Truck.meta b/Core/NetworkPackage/ServerPack/HAE_Truck.meta
deleted file mode 100644
index ea614a3..0000000
--- a/Core/NetworkPackage/ServerPack/HAE_Truck.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 77f69c2b862d1704299a32d0d8eeb71e
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HAF_Merge.meta b/Core/NetworkPackage/ServerPack/HAF_Merge.meta
deleted file mode 100644
index 86e4eea..0000000
--- a/Core/NetworkPackage/ServerPack/HAF_Merge.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: fa14960fa44b0d1439bab471a764e34f
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/ServerPack/HB0_Event.meta b/Core/NetworkPackage/ServerPack/HB0_Event.meta
deleted file mode 100644
index 95487fc..0000000
--- a/Core/NetworkPackage/ServerPack/HB0_Event.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d914565b65f8e8145988734c4d915834
-folderAsset: yes
-timeCreated: 1547643019
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/BlastFurnace/GetItemPathModel.cs b/System/BlastFurnace/GetItemPathModel.cs
index 623dcce..f890275 100644
--- a/System/BlastFurnace/GetItemPathModel.cs
+++ b/System/BlastFurnace/GetItemPathModel.cs
@@ -217,9 +217,6 @@
public void SetUnionWarehouseGetWay()
{
- var model1 = ModelCenter.Instance.GetModel<FairyAuTreasureModel>();
- var model2 = ModelCenter.Instance.GetModel<TreasureFindHostModel>();
- model1.JumpItemID = model2.adviceIdlist;
}
#region 璁剧疆寮规浣嶇疆
diff --git a/System/FairyAu/BasicFunction.cs b/System/FairyAu/BasicFunction.cs
index 3a28b57..1e84efc 100644
--- a/System/FairyAu/BasicFunction.cs
+++ b/System/FairyAu/BasicFunction.cs
@@ -11,7 +11,6 @@
[SerializeField] Button SkillBtn;
[SerializeField] Button HallBtn;
[SerializeField] Button bossBtn;
- [SerializeField] Button TreasuryBtn;
[SerializeField] Button FairyAuBtn;
[SerializeField] Button LivenBtn;
[SerializeField] Button _fairyStoreBtn;
@@ -44,7 +43,6 @@
m_SalaryGetBtn.onClick.AddListener(OnSalaryGet);
SkillBtn.onClick.AddListener(SkillBtna);
HallBtn.onClick.AddListener(HallButton);
- TreasuryBtn.onClick.AddListener(TreasuryButton);
FairyAuBtn.AddListener(FairyAuButton);
}
@@ -98,11 +96,6 @@
private void OnBossBtn()
{
WindowCenter.Instance.Open<FairyBoss>();
- }
-
- void TreasuryButton()
- {
- WindowCenter.Instance.Open<WarehouseTipsWin>();
}
void FairyAuButton()
diff --git a/System/FairyAu/ConvertItemTipsWin.cs b/System/FairyAu/ConvertItemTipsWin.cs
deleted file mode 100644
index eba2c5b..0000000
--- a/System/FairyAu/ConvertItemTipsWin.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, September 15, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-//鍙ｇ伯鍏戞崲
-namespace Snxxz.UI
-{
-
- public class ConvertItemTipsWin : Window
- {
- public Image _EquipBG;//鑳屾櫙鍥�
- public Image _ItemIcon;//鍥炬爣
- public Text _TitleText;//鐗╁搧鍚嶇О
- public Text _TextContent;//鍙彁鍗囩殑鏁板��
- public Text _TheIntegral;//鎵�闇�鐨勫厬鎹㈢Н鍒�
- public Text _DotText1;//鍏戞崲鏁伴噺
- public Button _AddsButton1;//澧炲姞鎸夐挳
- public Button _MinusButton1;//鍑忓皯鎸夐挳
- public Button _ConvertBtn;//鍏戞崲鎸夐挳
- public Button _CloseBtn;//鍏抽棴鎸夐挳
- public Button _DotText1Btn;//璁＄畻鍣ㄦ寜閽�
- public Button _NumKeyBoardBGM;//璁＄畻鏈洪潰鏉挎寜閽�
- public NumKeyBoard _NumKeyBoard;//璁＄畻鏈�
- private int _TreasureIntegral = 0;//鐢ㄤ簬鑾峰彇瀹濆簱绉垎
- private int _CurrentNumber = 1;//鑾峰彇褰撳墠鏁伴噺
-
- private int _NumberID = 0, _Number = 0, _Integral = 0, _BiggestLimit = 0, _ExperienceAdd = 0;//鑾峰彇鐗╁搧ID,鏁伴噺,鎵�闇�绉垎,鍋氬ぇ涓婇檺,缁忛獙鐨勫鍔�
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
-
- #region Built-in
- protected override void BindController()
- {
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _NumberID = int.Parse(_PetFoodExchange.Numerical1);
- _TitleText.text = ItemConfig.Get(_PetFoodExchange.Numerical1).ItemName;
- _ExperienceAdd = ItemConfig.Get(_PetFoodExchange.Numerical1).EffectValueA1;
- _Number = int.Parse(_PetFoodExchange.Numerical2);
- _Integral = int.Parse(_PetFoodExchange.Numerical3);
- _BiggestLimit = ItemConfig.Get(_PetFoodExchange.Numerical1).PackCount;
- _EquipBG.SetItemBackGround(ItemConfig.Get(_PetFoodExchange.Numerical1).ItemColor);
- _TextContent.text = ItemConfig.Get(_NumberID).Description;
- _ItemIcon.SetSprite(ItemConfig.Get(_NumberID).IconKey);
- }
-
- protected override void AddListeners()
- {
-
- _AddsButton1.onClick.AddListener(AddsButton);
- _MinusButton1.onClick.AddListener(MinusButton);
-
- _ConvertBtn.onClick.AddListener(ConvertButton);
- _CloseBtn.onClick.AddListener(CloseButton);
- _DotText1Btn.AddListener(DotText1Button);
- _NumKeyBoardBGM.AddListener(NumKeyBoardBGMButton);
- _NumKeyBoard.onValueChange.AddListener(NumKeyBoardValueChange);
- _NumKeyBoard.onConfirm.AddListener(onConfirm);
-
- }
-
- protected override void OnPreOpen()
- {
- _NumKeyBoardBGM.gameObject.SetActive(false);
- _TreasureIntegral = playerFairyAuTreasureData._FairyAuIntegral;
- _DotText1.text = "1";
- _CurrentNumber = 1;
- _TheIntegral.text = (_CurrentNumber * _Integral).ToString();
- if (_TreasureIntegral >= _CurrentNumber * _Integral)
- {
- _TheIntegral.color = new Color(255,239,71);
- }
- else
- {
- _TheIntegral.color = UIHelper.GetUIColor(5, false);
- }
- _DotText1.text = _CurrentNumber.ToString();
-
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- }
-
- protected override void OnAfterClose()
- {
- }
-
-
-
- void AddsButton()//澧炲姞鎸夐挳
- {
- if (_CurrentNumber >= _BiggestLimit)
- return;
- _CurrentNumber += 1 * _Number;
- if (_TreasureIntegral >= _CurrentNumber * _Integral)
- {
- _TheIntegral.color = new Color(255, 239, 71);
- }
- else
- {
- _TheIntegral.color = UIHelper.GetUIColor(5, false);
- }
- _DotText1.text = _CurrentNumber.ToString();
- _TheIntegral.text = (_CurrentNumber * _Integral).ToString();
- }
-
- void MinusButton()//鍑忓皯鎸夐挳
- {
- if (_CurrentNumber <= 1)
- return;
- _CurrentNumber -= 1 * _Number;
- if (_TreasureIntegral >= _CurrentNumber * _Integral)
- {
- _TheIntegral.color = new Color(255, 239, 71);
- }
- else
- {
- _TheIntegral.color = UIHelper.GetUIColor(5, false);
- }
- _DotText1.text = _CurrentNumber.ToString();
- _TheIntegral.text = (_CurrentNumber * _Integral).ToString();
- }
-
- void ConvertButton()//鍏戞崲鎸夐挳
- {
- var playerPackModel = ModelCenter.Instance.GetModel<PackModel>();
- if (playerPackModel.GetEmptyGridCount(PackType.Item) < 1)
- {
- SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_998371");
- Close();
- return;
- }
-
- if (_TreasureIntegral >= _CurrentNumber * _Integral)
- {
- CA610_tagCMFamilyStoreExchange _CA610 = new CA610_tagCMFamilyStoreExchange();
- _CA610.StoreItemIndex = 0;
- _CA610.ItemID = (uint)_NumberID;
- _CA610.ExcangeCount = (ushort)_CurrentNumber;
- GameNetSystem.Instance.SendInfo(_CA610);
- DebugEx.Log("鍏戞崲鎴愬姛");
- Close();
- }
- else
- {
- ScrollTip.ShowTip(Language.Get("Z1058"));
- Close();
- }
- }
-
- void DotText1Button()//灏辩畻鍣ㄦ寜閽脊鍑烘寜閽�
- {
- _NumKeyBoardBGM.gameObject.SetActive(true);
-
- }
-
- void CloseButton()//鍏抽棴鎸夐挳
- {
- Close();
- }
-
- void NumKeyBoardValueChange()
- {
- _CurrentNumber = int.Parse(_NumKeyBoard.Value);
- if (_TreasureIntegral >= _CurrentNumber * _Integral)
- {
- _TheIntegral.color = new Color(255, 239, 71);
- }
- else
- {
- _TheIntegral.color = UIHelper.GetUIColor(5, false);
- }
- _DotText1.text = _CurrentNumber.ToString();
- _TheIntegral.text = (_CurrentNumber * _Integral).ToString();
- }
- void NumKeyBoardBGMButton()
- {
- _NumKeyBoardBGM.gameObject.SetActive(false);
-
- }
-
- void onConfirm(bool _bool)
- {
- if (_bool)
- _NumKeyBoardBGM.gameObject.SetActive(false);
- }
-
- #endregion
-
- }
-
-}
-
-
-
-
diff --git a/System/FairyAu/ConvertItemTipsWin.cs.meta b/System/FairyAu/ConvertItemTipsWin.cs.meta
deleted file mode 100644
index 53f7b1c..0000000
--- a/System/FairyAu/ConvertItemTipsWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0480034a819c1b543a872431f3e9960f
-timeCreated: 1505442033
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/FairyAu/DonateEquipTipsWin.cs b/System/FairyAu/DonateEquipTipsWin.cs
deleted file mode 100644
index 1ce3643..0000000
--- a/System/FairyAu/DonateEquipTipsWin.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, September 13, 2017
-//--------------------------------------------------------
-
-using Snxxz.UI;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-//瑁呭鎹愮尞闈㈡澘
-namespace Snxxz.UI
-{
-
- public class DonateEquipTipsWin : Window
- {
- [SerializeField] ScrollerController _GridlineCtrl;
- [SerializeField] Button _CloseBtn;
-
- ItemTipsModel _itemTipsModel;
- ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
-
- PackModel _playerPack;
- PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
- private int _BagIndex = 0;//鏍囪鑳屽寘鐗╁搧涓嬫爣
-
- private int MaxDonationAmount = 0;//鏈�澶ф崘鐚暟閲�
- List<string> phagocytosisID = new List<string>();//瀛樺偍鍙互鎹愮尞鐨勭墿鍝�
-
- #region Built-in
- protected override void BindController()
- {
- MaxDonationAmount = int.Parse(FuncConfigConfig.Get("FamilyStoreSpace").Numerical1)+1;
- }
-
- protected override void AddListeners()
- {
- _CloseBtn.onClick.AddListener(CloseButton);
- }
-
- protected override void OnPreOpen()
- {
- playerPack.refreshItemCountEvent += BackpackRefresh;//鑳屽寘鐗╁搧娓呯悊
- _GridlineCtrl.OnRefreshCell += OnRefreshGridCell;
- Backpacking();//鑳屽寘鐗╁搧璇诲彇鍜屽垱寤�
-
- OnCreateGridLineCell(_GridlineCtrl);
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
-
- }
-
- protected override void OnAfterClose()
- {
- playerPack.refreshItemCountEvent -= BackpackRefresh;//鑳屽寘鐗╁搧娓呯悊
- _GridlineCtrl.OnRefreshCell -= OnRefreshGridCell;
-
- }
- #endregion
-
-
- void CloseButton()//鍏抽棴鎸夐挳
- {
- Close();
-
- }
-
- void Backpacking()//鐗╁搧璇诲彇
- {
- Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePack(PackType.Item).GetAllItems();
- Dictionary<int, ProductOrderJudgment> _ProductOrderJudgment = new Dictionary<int, ProductOrderJudgment>();
- phagocytosisID.Clear();
- _ProductOrderJudgment = AttributeJudgment();///灞炴�у垽鏂�
- if (backpack_dic.Count == 0)//寰楀埌鑳屽寘鐨勬墍鏈夌墿鍝�
- return;
-
-
- foreach (int item_id in backpack_dic.Keys)
- {
-
- ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);
- foreach (int key in _ProductOrderJudgment.Keys)
- {
- if (_ChinItem.EquipPlace == key && _ChinItem.LV >= _ProductOrderJudgment[key].Class && _ChinItem.StarLevel >= _ProductOrderJudgment[key].TheStar && _ChinItem.ItemColor >= _ProductOrderJudgment[key].Color)
- {
-
- string IDnumber = backpack_dic[item_id].itemId.ToString() + "|" + item_id.ToString();//娣诲姞ID鍜屼綅缃储寮�
-
- phagocytosisID.Add(IDnumber);
-
- }
- }
- }
- }
-
- class ProductOrderJudgment
- {
- public int Class;//闃剁骇
- public int TheStar;//鏄熺骇
- public int Color;//棰滆壊
-
-
- }
-
- Dictionary<int, ProductOrderJudgment> AttributeJudgment()//灞炴�у垽鏂�
- {
- Dictionary<int, ProductOrderJudgment> _DicConditions = new Dictionary<int, ProductOrderJudgment>();//鏉′欢瀛楀吀
- FuncConfigConfig Number1 = FuncConfigConfig.Get("FamilyStoreItemRule1");
- FuncConfigConfig Number2 = FuncConfigConfig.Get("FamilyStoreItemRule2");
- string[] strA = Number1.Numerical1.Split('|');
- string[] strA1 = Number1.Numerical2.Split('|');
- for (int i = 0; i < strA.Length; i++)
- {
- if (!_DicConditions.ContainsKey(int.Parse(strA[i])))
- {
- ProductOrderJudgment _ProductOrder = new ProductOrderJudgment();
- _ProductOrder.Class = int.Parse(strA1[0]);
- _ProductOrder.TheStar = int.Parse(strA1[1]);
- _ProductOrder.Color = int.Parse(strA1[2]);
- _DicConditions.Add(int.Parse(strA[i]), _ProductOrder);
- }
- }
-
- string[] strB = Number2.Numerical1.Split('|');
- string[] strB1 = Number2.Numerical2.Split('|');
- for (int j = 0; j < strB.Length; j++)
- {
- if (!_DicConditions.ContainsKey(int.Parse(strB[j])))
- {
- ProductOrderJudgment _ProductOrder = new ProductOrderJudgment();
- _ProductOrder.Class = int.Parse(strB1[0]);
- _ProductOrder.TheStar = int.Parse(strB1[1]);
- _ProductOrder.Color = int.Parse(strB1[2]);
- _DicConditions.Add(int.Parse(strB[j]), _ProductOrder);
- }
-
- }
- return _DicConditions;
- }
-
-
- void OnCreateGridLineCell(ScrollerController gridCtrl)//棰勫埗浣撳垱寤�
- {
- gridCtrl.Refresh();
- int Index = Mathf.CeilToInt((float)phagocytosisID.Count / 5);
- for (int i = 0; i < Index; i++)
- {
- gridCtrl.AddCell(ScrollerDataType.Header, i);
- }
-
- gridCtrl.Restart();
- }
-
- void OnRefreshGridCell(ScrollerDataType type, CellView cell)
- {
- int line = cell.index;
- for (int i = 0; i < 5; i++)
- {
-
- int index = line * 5 + i;
- GameObject obj = cell.transform.GetChild(i).gameObject;
- ItemCell _itemCell = obj.transform.Find("ItemCell").GetComponent<ItemCell>();
- Button _ItemBtn = _itemCell.GetComponent<Button>();
- if (index < phagocytosisID.Count)
- {
- obj.SetActive(true);
-
- string[] _ParseStr = phagocytosisID[index].Split('|');
- int _ItemID = int.Parse(_ParseStr[0]);
- int _index = int.Parse(_ParseStr[1]);
- ItemConfig Item = ItemConfig.Get(_ItemID);
- PetEatEquipConfig tagPet = PetEatEquipConfig.GetEquipColorAndEquipClass(Item.ItemColor, Item.LV);//瑁呭绉垎鍏戞崲琛�
-
- ItemModel model = playerPack.GetItemByIndex(PackType.Item, _index);
- if (model != null)
- {
- _itemCell.Init(model,true);
- _ItemBtn.RemoveAllListeners();
- _ItemBtn.AddListener(() =>
- {
- _BagIndex = _index;
- itemTipsModel.SetItemTipsModel(PackType.Item, model.guid, false, true, ItemTipChildType.UnionWarehouseDonation);
- itemTipsModel.curAttrData.SetTipsFuncBtn(ItemOperateType.donate, Donation);
- itemTipsModel.ShowUICtrl();
- });
- }
- }
- else
- {
- obj.SetActive(false);
- }
- }
-
- }
-
-
- void Donation(ItemOperateType type, string s)//鎹愮尞
- {
- switch (type)
- {
- case ItemOperateType.donate:
- ////鍍忔湇鍔＄鎹愮尞鍙戝寘
- if (playerFairyAuTreasureData._DicfamilyStoreItem.Count >= MaxDonationAmount)
- {
- ScrollTip.ShowTip(Language.Get("Z1802"));
- return;
- }
- CA609_tagCMFamilyStoreDonate _tagCA609 = new CA609_tagCMFamilyStoreDonate();
- _tagCA609.ItemIndex = (byte)_BagIndex;
- GameNetSystem.Instance.SendInfo(_tagCA609);
- KnapSackEventMgr.Instance.HideItemPopWin();
- break;
- }
- }
-
-
-
- void BackpackRefresh(PackType type, int itemPlace, int id)//鑳屽寘鐗╁搧娓呯悊
- {
-
- Backpacking();//鑳屽寘鐗╁搧璇诲彇鍜屽垱寤�
- OnCreateGridLineCell(_GridlineCtrl);
- }
- }
-}
-
-
-
-
diff --git a/System/FairyAu/DonateEquipTipsWin.cs.meta b/System/FairyAu/DonateEquipTipsWin.cs.meta
deleted file mode 100644
index b574d9a..0000000
--- a/System/FairyAu/DonateEquipTipsWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: af08a871c5bae9446b3db3cc733f696a
-timeCreated: 1505291796
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/FairyAu/FairyAuTreasureModel.cs b/System/FairyAu/FairyAuTreasureModel.cs
deleted file mode 100644
index dc609b7..0000000
--- a/System/FairyAu/FairyAuTreasureModel.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-using System;
-using Snxxz.UI;
-//浠欑洘瀹濆簱
-public class FamilyStoreItem//瀹舵棌浠撳簱鐗╁搧淇℃伅
-{
- public int Index;//浠撳簱鏍煎瓙绱㈠紩
- public int ItemID;//鐗╁搧ID
- public ItemJsonData ItemData;
- public Dictionary<int, List<int>> _UserData;
- [Serializable]
- public class ItemJsonData
- {
- public string UserData;
- public int IsSuit;
- public int EquipGS;
- }
-}
-
-public class FamilyActionInfoClass//鎺ユ敹瀹舵棌琛屼负淇℃伅
-{
- public int FamilyID;//瀹舵棌ID
- public int ActionType;//绫诲瀷
- public int Time;//鏃堕棿
- public string Name;//鐜╁鍚�
- public int OperationType;//鎿嶄綔绫诲瀷1-鎹愮尞锛�2-鍏戞崲锛�3-閿�姣�
- public int PlayerID;//鎿嶄綔鐨勭帺瀹禝D;
- public int ItemID;//鐗╁搧ID
- public ItemJsonData ItemData;
- public Dictionary<int, List<int>> _UserData;
- [Serializable]
- public class ItemJsonData
- {
- public int ItemID;
- public string UserData;
- public int IsSuit;
- public int EquipGS;
- }
-
-}
-
-
-public class FairyAuTreasureModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
-{
-
- public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//瀹舵棌浠撳簱鐗╁搧淇℃伅
-
- public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>();
- public delegate void OnFairyAuIntegral();
- public static event OnFairyAuIntegral Event_FairyAuIntegral;//鐢ㄤ簬浠欑洘绉垎鐨勫埛鏂�
- public delegate void OnFamilyActionInfo();
- public static event OnFamilyActionInfo Event_FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
- public delegate void OnFamilyStoreItemInfo();
- public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//浠撳簱淇℃伅鐨勫埛鏂�
- public static event Action<List<int>> Del_FamilyStoreItemInfo;//浠撳簱淇℃伅鐗╁搧鐨勫垹闄�
- PackModel _playerPack;
- PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
- public int _FairyAuIntegral = 0;//鑾峰彇浠欑洘绉垎
-
- public List<int> JumpItemID = new List<int>();//浠庤烦杞埌浠欑洘浠撳簱闇�瑕侀�変腑楂樹寒
- List<int> EquipmentList = new List<int>();//鍏充簬瑁呭浣嶇疆
- public bool IsShowPoint = false;//鏄惁鏄剧ず绾㈢偣
- private const int Redpoint_key1 = 1070103;
- public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//浠欑洘浠撳簱绾㈢偣
-
- public override void Init()
- {
- var funConfig = FuncConfigConfig.Get("StrengthenDisplay");
- int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1);
- EquipmentList.Clear();
- for (int i = 0; i < List.Length; i++)
- {
- EquipmentList.Add(List[i]);
- }
- }
-
- public override void UnInit()
- {
-
- }
-
- public void OnBeforePlayerDataInitialize()
- {
- _DicfamilyStoreItem.Clear();
- _FairyAuIntegral = 0;
- }
- public void OnPlayerLoginOk()
- {
- PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
- PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting;
- WarehouseTipsWin.RedPointUpdate -= RedPointUpdate;
- WarehouseTipsWin.RedPointUpdate += RedPointUpdate;
- }
-
-
-
- public void FairyAuIntegral(int value)//鑾峰彇浠欑洘绉垎
- {
- _FairyAuIntegral = value;
- if (Event_FairyAuIntegral != null)
- Event_FairyAuIntegral();
- }
-
- public void FamilyStoreItemInfo(HA406_tagGCFamilyStoreItemInfo info)//瀹舵棌浠撳簱淇℃伅
- {
- if (!_DicfamilyStoreItem.ContainsKey(0))
- {
- FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
- _FamilyStoreItemP.Index = 0;
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
- _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
- }
-
- for (int i = 0; i < info.Count; i++)
- {
- if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1))
- continue;
- FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem();
- _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData);
- _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1;
- _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID;
- _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData);
- _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem);
- }
-
- if (Event_FamilyStoreItemInfo != null)
- {
- Event_FamilyStoreItemInfo();
- }
- IsShowRedPoint();
- }
- List<int> List = new List<int>();
- public void WarehouseToRefresh(byte[] _list)//浠撳簱鍒锋柊
- {
- List.Clear();
- for (int i = 0; i < _list.Length; i++)
- {
- List.Add(_list[i] + 1);
- }
- if (Del_FamilyStoreItemInfo != null)
- {
- Del_FamilyStoreItemInfo(List);
- }
- IsShowRedPoint();
-
-
- }
- public void FamilyStoreDel(int _index, int ClearType)//瀹舵棌浠撳簱鐗╁搧鍒犻櫎(娓呴櫎鐨勬牸瀛愮储寮�, 浠呭崟鏍煎瓙娓呴櫎鏃舵湁鏁�,浠�0寮�濮嬩唬琛ㄧ涓�鏍�,0-鍗曟牸瀛愭竻闄�; 1-鎵�鏈夌墿鍝佹竻闄�)
- {
- if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0)
- {
- _DicfamilyStoreItem.Remove(_index + 1);
- }
- if (ClearType == 1)
- {
- _DicfamilyStoreItem.Clear();
- if (!_DicfamilyStoreItem.ContainsKey(0))
- {
- FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
- _FamilyStoreItemP.Index = 0;
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
- _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
- }
- }
- }
-
- public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//鎺ユ敹瀹舵棌琛屼负淇℃伅
- {
- _InformationList.Clear();
- for (int i = 0; i < info.Count; i++)
- {
- FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass();
- _FamilyActionInfoClass.FamilyID = (int)info.FamilyID;
- _FamilyActionInfoClass.ActionType = (int)info.ActionType;
- _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time;
- _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name;
- _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1;
- _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2;
- _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3;
- _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData);
- _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData);
- _InformationList.Add(_FamilyActionInfoClass);
-
- }
- if (Event_FamilyActionInfo != null)
- Event_FamilyActionInfo();//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
-
- }
-
- private bool IsEquipmentComparison()
- {
- bool IsBool = false;
- SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip);
- for (int i = 0; i < EquipmentList.Count; i++)
- {
- ItemModel ItemModel = singlePack.GetItemByIndex(i);
- int Type = i;
- if (ItemModel != null)
- {
- foreach (var key in _DicfamilyStoreItem.Keys)
- {
- if (key == 0)
- {
- continue;
- }
- int ItemId = _DicfamilyStoreItem[key].ItemID;
- var itemConfig = ItemConfig.Get(ItemId);
- int RealmLevel = PlayerDatas.Instance.baseData.realmLevel;
- int equipScore = ItemLogicUtility.Instance.GetEquipScore(PackType.Equip, ItemId, _DicfamilyStoreItem[key]._UserData);
- if (ItemModel.config.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit && equipScore >= ItemModel.equipScore)
- {
- IsBool = true;
- }
- }
- }
- else
- {
- foreach (var key in _DicfamilyStoreItem.Keys)
- {
- if (key == 0)
- {
- continue;
- }
- int ItemId = _DicfamilyStoreItem[key].ItemID;
- var itemConfig = ItemConfig.Get(ItemId);
- int RealmLevel = PlayerDatas.Instance.baseData.realmLevel;
- if (itemConfig.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit)
- {
- IsBool = true;
- }
- }
- }
- }
- return IsBool;
- }
- private void IsShowRedPoint()
- {
- int GetDayOfYear = DateTime.Now.DayOfYear;
- string strKey= "Treasure"+ PlayerDatas.Instance.baseData.PlayerID;
- int day = LocalSave.GetInt(strKey);
- if (day != GetDayOfYear && IsEquipmentComparison())
- {
- LocalSave.SetInt(strKey, GetDayOfYear);
- IsShowPoint = true;
- }
- if (IsShowPoint)
- {
- redPointStre1.state = RedPointState.Simple;
- }
- else
- {
- redPointStre1.state = RedPointState.None;
- }
-
- }
- private void Updatefighting(PlayerDataType obj)//鍒锋柊澧冪晫
- {
- if (obj == PlayerDataType.RealmLevel)
- {
- IsShowRedPoint();
- }
- }
- private void RedPointUpdate()
- {
- IsShowRedPoint();
- }
-}
diff --git a/System/FairyAu/FairyAuTreasureModel.cs.meta b/System/FairyAu/FairyAuTreasureModel.cs.meta
deleted file mode 100644
index 0971147..0000000
--- a/System/FairyAu/FairyAuTreasureModel.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: b14143fd1e0cc564fbfb6a874f99da42
-timeCreated: 1505206928
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/FairyAu/TreasureTheLog.cs b/System/FairyAu/TreasureTheLog.cs
deleted file mode 100644
index 22a609c..0000000
--- a/System/FairyAu/TreasureTheLog.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, September 14, 2017
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using System.Text;
-using System.Collections.Generic;
-//瀹濆簱鏃ュ織
-namespace Snxxz.UI
-{
-
- public class TreasureTheLog : MonoBehaviour
- {
- public ScrollerController _ScrollerController;//鐢ㄦ潵鎺у埗婊戝姩鏉′綅缃�
- public Transform _Content;//d鍔ㄦ�佸垱寤虹殑鑺傜偣
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
-
- public void Init()
- {
- _ScrollerController.OnRefreshCell += OnRefreshGridCell;
- FairyAuTreasureModel.Event_FamilyActionInfo += FamilyActionInf;//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
- OnCreateGridLineCell(_ScrollerController);
-
- }
- public void UnInit()
- {
- _ScrollerController.OnRefreshCell -= OnRefreshGridCell;
- FairyAuTreasureModel.Event_FamilyActionInfo -= FamilyActionInf;//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
- }
-
- void OnCreateGridLineCell(ScrollerController _ScrollerController)//棰勫埗浣撳垱寤�
- {
- _ScrollerController.Refresh();
- for (int i = 0; i < playerFairyAuTreasureData._InformationList.Count; i++)
- {
- _ScrollerController.AddCell(ScrollerDataType.Header, i);
- }
- _ScrollerController.Restart();
- _ScrollerController.JumpIndex(_ScrollerController.GetNumberOfCells(_ScrollerController.m_Scorller) - 1);
- }
-
-
-
- void OnRefreshGridCell(ScrollerDataType type, CellView cell)//灞炴�ц祴鍊�
-
- {
- int _Index = cell.index;
- Text _logText = cell.transform.Find("LogText").GetComponent<RichText>();
- _logText.text = TypeReturns(_Index);
- }
- private static StringBuilder _textBuilder = new StringBuilder();
- string TypeReturns(int _index)
- {
- ItemConfig ItemModel = ItemConfig.Get(playerFairyAuTreasureData._InformationList[_index].ItemID);
- string _Content = null;
- _textBuilder.Length = 0;
- foreach (int key in playerFairyAuTreasureData._InformationList[_index]._UserData.Keys)
- {
- List<int> intarray = playerFairyAuTreasureData._InformationList[_index]._UserData[key];
- var _array = intarray.ToArray();
- _textBuilder.Append(StringUtility.Contact("'", key, "':", _array != null ? LitJson.JsonMapper.ToJson(_array) :
- LitJson.JsonMapper.ToJson(new int[0])));
- _textBuilder.Append(",");
- }
-
- switch (playerFairyAuTreasureData._InformationList[_index].OperationType)
- {
- case 1:
- _Content = TimeUtility.GetTime((uint)playerFairyAuTreasureData._InformationList[_index].Time).ToString("MM-dd HH:mm") + " " + "<color=#109d06>" + UIHelper.ServerStringTrim(playerFairyAuTreasureData._InformationList[_index].Name) + "</color>" + "鎹愮尞浜� " +
- string.Format("<a><Word info=item id={0}/>|showitem={0} userdata={1}</a>", playerFairyAuTreasureData._InformationList[_index].ItemID,
- _textBuilder);
- return _Content;
- case 2:
- _Content = TimeUtility.GetTime((uint)playerFairyAuTreasureData._InformationList[_index].Time).ToString("MM-dd HH:mm") + " " + "<color=#109d06>" + UIHelper.ServerStringTrim(playerFairyAuTreasureData._InformationList[_index].Name) + "</color>" + "鍏戞崲浜� " +
- string.Format("<a><Word info=item id={0}/>|showitem={0} userdata={1}</a>", playerFairyAuTreasureData._InformationList[_index].ItemID,
- _textBuilder);
- return _Content;
- case 3:
- _Content = TimeUtility.GetTime((uint)playerFairyAuTreasureData._InformationList[_index].Time).ToString("MM-dd HH:mm") + " " + "<color=#109d06>" + UIHelper.ServerStringTrim(playerFairyAuTreasureData._InformationList[_index].Name) + "</color>" + "閿�姣佷簡 " +
- string.Format("<a><Word info=item id={0}/>|showitem={0} userdata={1}</a>", playerFairyAuTreasureData._InformationList[_index].ItemID,
- _textBuilder);
- return _Content;
- default:
- return null;
- }
- }
-
- void FamilyActionInf()//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
- {
- OnCreateGridLineCell(_ScrollerController);
- }
- }
-
-}
-
-
-
diff --git a/System/FairyAu/TreasureTheLog.cs.meta b/System/FairyAu/TreasureTheLog.cs.meta
deleted file mode 100644
index 11ccbfc..0000000
--- a/System/FairyAu/TreasureTheLog.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: bdb2cde87c878574f9ec1794589e3d50
-timeCreated: 1505398597
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/FairyAu/WarehouseTipsWin.cs b/System/FairyAu/WarehouseTipsWin.cs
deleted file mode 100644
index c1b4a54..0000000
--- a/System/FairyAu/WarehouseTipsWin.cs
+++ /dev/null
@@ -1,1230 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, September 12, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-using UnityEngine.UI;
-using Snxxz.UI;
-
-
-//浠欑洘瀹濆簱
-namespace Snxxz.UI
-{
-
- public class WarehouseTipsWin : TempKnapSackBasic
- {
- [SerializeField]
- TreasureTheLog w_TreasureTheLog;//瀹濆簱鏃ュ織
-
- PackModel _playerPack;
- PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
- ItemTipsModel _itemTipsModel;
- ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
- FairyAuTreasureModel m_PlayerFairyAuTreasureData;
- FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } }
-
- #region 灞炴��
- [SerializeField] ScrollerController _GridlineCtrl;
- [SerializeField] Button _CloseBtn;//鍏抽棴鎸夐挳
- [SerializeField] Button _DonateBtn;//瑁呭鎹愮尞鎸夐挳
- [SerializeField] Button _CleanBtn;//鎵归噺娓呯悊鎸夐挳
- [SerializeField] Button _ExitBtn;//閫�鍑虹鐞嗘寜閽�
- [SerializeField] Button _DeleteBtn;//閿�姣佽澶囨寜閽�
-
- [SerializeField] GameObject ScrollViewFirst;//閫夋嫨闈㈡澘1
- [SerializeField] GameObject ScrollViewSecond;//閫夋嫨闈㈡澘2
- [SerializeField] GameObject ScrollViewThree;//閫夋嫨闈㈡澘3
-
- [SerializeField] Button _Arrow1;//鎸夐挳1
- [SerializeField] Button _Arrow2;//鎸夐挳2
- [SerializeField] Button _Arrow3;//鎸夐挳3
-
- [SerializeField] Text Label_A;//鏂囨湰1
- [SerializeField] Text Label_B;//鏂囨湰2
- [SerializeField] Text Label_C;//鏂囨湰3
-
- [SerializeField] Transform _ContentTwo;//閫夋嫨闈㈡澘2鐨勭埗鑺傜偣
- [SerializeField] Transform _ContentOne;//閫夋嫨闈㈡澘1鐨勭埗鑺傜偣
- [SerializeField] Transform _ContentThree;//閫夋嫨闈㈡澘3鐨勭埗鑺傜偣
-
- [SerializeField] Toggle _ToggleRed;//绾㈣壊
- [SerializeField] Toggle _Toggleorange;//姗欒壊
- [SerializeField] Toggle _Togglepurple;//绱壊瑁呭
- [SerializeField] Toggle _ToggleeMpty;//娓呯┖閫夋嫨
-
- [SerializeField] Toggle _ToggleEmpty;//娓呯┖閫夋嫨
- [SerializeField] Toggle _ToggleAny;//浠绘剰闃舵暟
- [SerializeField] Toggle _Togle_1;//涓�闃�
- [SerializeField] Toggle _Togle_2;//浜岄樁
- [SerializeField] Toggle _Togle_3;//涓夐樁
- [SerializeField] Toggle _Togle_4;//鍥涢樁
- [SerializeField] Toggle _Togle_5;//浜旈樁
- [SerializeField] Toggle _Togle_6;//鍏樁
- [SerializeField] Toggle _Togle_7;//涓冮樁
- [SerializeField] Toggle _Togle_8;//鍏樁
- [SerializeField] Toggle _Togle_9;//涔濋樁
- [SerializeField] Toggle _Togle_10;//鍗侀樁
- [SerializeField] Toggle _Togle_11;//鍗佷竴闃�
- [SerializeField] Toggle _Togle_12;//鍗佷簩闃�
- [SerializeField] Toggle _Togle_13;//鍗佷笁闃�
- [SerializeField] Toggle _Togle_14;//鍗佸洓闃�
- [SerializeField] Toggle _Togle_15;//鍗佷簲闃�
-
- [SerializeField] Toggle _ToggleStar1;//涓�鏄�
- [SerializeField] Toggle _ToggleStar2;//浜屾槦
- [SerializeField] Toggle _ToggleStarMp;//娓呯┖閫夋嫨
-
- [SerializeField] Text _CountText;//鑾峰彇褰撳墠鐨勭Н鍒嗗��
- [SerializeField] GameObject _Dropdown3;//鏄熺骇
- [SerializeField] GameObject _Dropdown2;//闃舵暟鐣岄潰
- [SerializeField] GameObject _Dropdown;//瑁呭棰滆壊
- [SerializeField] GameObject _WarehouseCountBG;//浠撳簱绉垎闈㈡澘
- [SerializeField] int _FamilyPosition = 0;//瀹舵棌鑱屼綅
-
- [SerializeField] Button m_BtnAdd;//鑾峰彇閫斿緞鎸夐挳
- private AchievementGuideEffect AchievementGuideEffect1;
- int Item_lv = 0;//鏍囪鐗╁搧闃舵暟
- int Item_Color = 0;//鏍囪鐗╁搧棰滆壊
- int Item_Star = 0;//鏍囪鏄熺骇
- private Dictionary<int, bool> _EquipmentArray = new Dictionary<int, bool>();//鐢ㄦ潵瀛樺偍闇�瑕侀攢姣佺殑瑁呭涓嬫爣
- private Dictionary<int, int> DicHighlight = new Dictionary<int, int>();//闇�瑕侀珮浜殑鐗╁搧
- int _indexList = 0;//鏍囪闇�瑕佸厬鎹㈢殑鏁扮粍涓嬫爣
- int _WPID = 0;//鐢ㄦ潵鏍囪闇�瑕佸厬鎹㈢殑鐗╁搧ID
- private int SpiritPetDan = 0;
- public static event Action RedPointUpdate;
- GetItemPathModel _GetItemPath;
- GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }
- #endregion
-
-
-
- private bool _bool = false;
- #region Built-in
- protected override void BindController()
- {
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- SpiritPetDan = int.Parse(_PetFoodExchange.Numerical1);
- }
-
- protected override void AddListeners()
- {
- AddListen();
- m_BtnAdd.AddListener(() =>
- {
- GetItemPath.SetChinItemModel(2150);
- });
- }
-
- protected override void OnPreOpen()
- {
- _listArray.Clear();
- foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- _listArray.Add(key);
- }
- _FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV;
- FairyAuTreasureModel.Event_FairyAuIntegral += FairyAuIntegral;//浠欑洘绉垎鍒锋柊
- FairyAuTreasureModel.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//浠撳簱淇℃伅鍒锋柊
- FairyAuTreasureModel.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//浠撳簱鐗╁搧鍒犻櫎
- FairyAuTreasureModel.Event_FamilyActionInfo += FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鍒锋柊
- _GridlineCtrl.OnRefreshCell += OnRefreshGridCell;
- _bool = false;
- w_TreasureTheLog.Init();
- QueryFamilyAction();//瀹舵棌琛屼负淇℃伅鏌ヨ
- _Dropdown.SetActive(false);
- _Dropdown2.SetActive(false);
- _Dropdown3.SetActive(false);
- _ExitBtn.gameObject.SetActive(false);
- _DeleteBtn.gameObject.SetActive(false);
- _DonateBtn.gameObject.SetActive(true);
- _CleanBtn.gameObject.SetActive(true);
- _WarehouseCountBG.SetActive(true);
- _CountText.text = playerFairyAuTreasureData._FairyAuIntegral.ToString();
- SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
- base.OnCreateGridLineCell(_GridlineCtrl);
-
- }
-
- protected override void OnAfterOpen()
- {
- if (RedPointUpdate != null && playerFairyAuTreasureData.IsShowPoint)
- {
- playerFairyAuTreasureData.IsShowPoint = false;
- RedPointUpdate();
- }
- _GridlineCtrl.mScrollRect.verticalNormalizedPosition = 1;
- HandleAchievement();
- }
-
- protected override void OnPreClose()
- {
- if (playerFairyAuTreasureData.JumpItemID != null && playerFairyAuTreasureData.JumpItemID.Count > 0)
- {
- playerFairyAuTreasureData.JumpItemID.Clear();
- }
- }
-
- protected override void OnAfterClose()
- {
- w_TreasureTheLog.UnInit();
- FairyAuTreasureModel.Event_FairyAuIntegral -= FairyAuIntegral;//浠欑洘绉垎鍒锋柊
- FairyAuTreasureModel.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//浠撳簱淇℃伅鍒锋柊
- FairyAuTreasureModel.Event_FamilyActionInfo -= FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鍒锋柊
- FairyAuTreasureModel.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//浠撳簱鐗╁搧鍒犻櫎
- _GridlineCtrl.OnRefreshCell -= OnRefreshGridCell;
- }
-
- List<int> _listArray = new List<int>();
-
- public void OnRefreshGridCell(ScrollerDataType type, CellView cell)
- {
-
- int gridlineIndex = cell.index;
- int childCode = 0;
-
- for (childCode = 0; childCode < cell.transform.childCount; childCode++)
- {
- WarehouseGrid warehouseGrid = cell.transform.GetChild(childCode).GetComponent<WarehouseGrid>();
- int cellCount = (cell.transform.childCount) * gridlineIndex + (childCode + 1);
- warehouseGrid.ItemCell.gameObject.SetActive(false);
- warehouseGrid.Uieffect.gameObject.SetActive(false);
- if (cellCount - 1 < playerFairyAuTreasureData._DicfamilyStoreItem.Count)
- {
- warehouseGrid.ItemCell.gameObject.SetActive(true);
- int _IndexKey = _listArray[cellCount - 1];
- FamilyStoreItem itemModel = playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey];
- if (DicHighlight.ContainsKey(_IndexKey))//闇�瑕侀�変腑鐨勭壒鏁�
- {
- warehouseGrid.Uieffect.gameObject.SetActive(true);
- warehouseGrid.Uieffect.Play();
- }
- ItemCellModel cellModel = new ItemCellModel(itemModel.ItemID, false, 0, "", PackType.Deleted, true, itemModel._UserData);
- warehouseGrid.ItemCell.Init(cellModel);
- if (AchievementGoto.achievementType == AchievementGoto.SpiritPetDan)//鍏戞崲鐏靛疇涓癸紙221锛�
- {
- if (AchievementGuideEffect1 != null)
- {
- AchievementGuideEffectPool.Recycle(AchievementGuideEffect1);
- }
- if (SpiritPetDan == itemModel.ItemID)
- {
- AchievementGuideEffect1 = AchievementGuideEffectPool.Require(2);
- if (AchievementGuideEffect1.effect != null)
- {
- AchievementGuideEffect1.effect.ResetOrder(3100);
- }
- AchievementGuideEffect1.transform.SetParentEx(warehouseGrid.ItemCell.transform, Vector3.zero, Vector3.zero, Vector3.one);
- }
- }
-
- LightUpJudgment(warehouseGrid.Lllume, _bool, playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey].Index);
- warehouseGrid.ItemCell.cellBtn.RemoveAllListeners();
- warehouseGrid.ItemCell.cellBtn.AddListener(() =>
- {
- TypeJudgment(warehouseGrid.Lllume, _bool, (int)itemModel.ItemID, playerFairyAuTreasureData._DicfamilyStoreItem[_IndexKey].Index);
- });
- }
- else
- {
- warehouseGrid.Lllume.SetActive(false);
- }
- }
- }
-
-
- void TypeJudgment(GameObject _obj, bool _bol, int Item_ID, int _Index)//绫诲瀷鍒ゆ柇
- {
- if (_bol)
- {
- if (_Index == 0)
- return;
- if (_obj.activeSelf)
- {
- _obj.SetActive(false);
- _EquipmentArray.Remove(_Index);
- }
- else
- {
- _obj.SetActive(true);
- _EquipmentArray.Add(_Index, true);
- }
- }
- else
- {
- if (_Index == 0 && Item_ID == 1130)
- {
- WindowCenter.Instance.Open<ConvertItemTipsWin>();
- }
- else
- {
- _indexList = _Index;
- _WPID = playerFairyAuTreasureData._DicfamilyStoreItem[_Index].ItemID;
- ItemConfig Item = ItemConfig.Get(playerFairyAuTreasureData._DicfamilyStoreItem[_Index].ItemID);
- PetEatEquipConfig tagPet = PetEatEquipConfig.GetEquipColorAndEquipClass(Item.ItemColor, Item.LV);//瑁呭绉垎鍏戞崲琛�
- ntegralGain = tagPet.integrate;
- ItemAttrData attrData = new ItemAttrData(playerFairyAuTreasureData._DicfamilyStoreItem[_Index].ItemID, false, 1, -1, true, PackType.Deleted
- , "", playerFairyAuTreasureData._DicfamilyStoreItem[_Index]._UserData, ItemTipChildType.UnionWarehouseExchange);
- attrData.SetTipsFuncBtn(ItemOperateType.exchange, Exchange);
- itemTipsModel.SetItemTipsModel(attrData);
- }
- }
- }
-
- int ntegralGain = 0;//瑁呭绉垎鑾峰彇
- void Exchange(ItemOperateType type, string s)
- {
- SinglePack singlePack = playerPack.GetSinglePack(PackType.Item);
- if (singlePack == null) return;
-
- if (singlePack.GetEmptyGridCount() < 1)
- {
- ScrollTip.ShowTip(Language.Get("Z1803"));
- return;
- }
- if (playerFairyAuTreasureData._FairyAuIntegral >= ntegralGain)
- {
- CA610_tagCMFamilyStoreExchange _CA610 = new CA610_tagCMFamilyStoreExchange();
- _CA610.StoreItemIndex = (byte)(_indexList);
- _CA610.ItemID = (uint)_WPID;
- _CA610.ExcangeCount = 1;
- ClearItemID(_indexList);
- GameNetSystem.Instance.SendInfo(_CA610);
- KnapSackEventMgr.Instance.HideItemPopWin();
- }
- else
- {
- ScrollTip.ShowTip(Language.Get("Z1804"));
-
- }
- }
-
- void LightUpJudgment(GameObject _obj, bool _bol, int _index)//鐐逛寒鍒ゆ柇
- {
- if (_bol)
- {
- if (_EquipmentArray.ContainsKey(_index))
- {
- _obj.SetActive(true);
- }
- else
- {
- _obj.SetActive(false);
- }
- }
- else
- {
- _obj.SetActive(false);
- }
- }
-
- void AddListen()//鎸夐挳浜嬩欢鐩戝惉娣诲姞
- {
- _CloseBtn.onClick.AddListener(CloseButton);
- _DonateBtn.onClick.AddListener(DonateButton);
- _CleanBtn.onClick.AddListener(CleanButton);
- _ExitBtn.onClick.AddListener(ExitButton);
- _DeleteBtn.onClick.AddListener(DeleteButton);
- _Arrow1.onClick.AddListener(Arrow1);
- _Arrow2.onClick.AddListener(Arrow2);
- _Arrow3.AddListener(Arrow3);
-
- _ToggleRed.onValueChanged.AddListener(delegate (bool _bool) { ToggleRed(_bool); });
- _Toggleorange.onValueChanged.AddListener(delegate (bool _bool) { Toggleorange(_bool); });
- _Togglepurple.onValueChanged.AddListener(delegate (bool _bool) { Togglepurple(_bool); });
- _ToggleeMpty.onValueChanged.AddListener(delegate (bool _bool) { ToggleeMpty(_bool); });
-
-
- _ToggleEmpty.onValueChanged.AddListener(delegate (bool _bool) { ToggleEmpty(_bool); });
- _ToggleAny.onValueChanged.AddListener(delegate (bool _bool) { ToggleAny(_bool); });
- _Togle_1.onValueChanged.AddListener(delegate (bool _bool) { Togle_1(_bool); });
- _Togle_2.onValueChanged.AddListener(delegate (bool _bool) { Togle_2(_bool); });
- _Togle_3.onValueChanged.AddListener(delegate (bool _bool) { Togle_3(_bool); });
- _Togle_4.onValueChanged.AddListener(delegate (bool _bool) { Togle_4(_bool); });
- _Togle_5.onValueChanged.AddListener(delegate (bool _bool) { Togle_5(_bool); });
- _Togle_6.onValueChanged.AddListener(delegate (bool _bool) { Togle_6(_bool); });
- _Togle_7.onValueChanged.AddListener(delegate (bool _bool) { Togle_7(_bool); });
- _Togle_8.onValueChanged.AddListener(delegate (bool _bool) { Togle_8(_bool); });
- _Togle_9.onValueChanged.AddListener(delegate (bool _bool) { Togle_9(_bool); });
- _Togle_10.onValueChanged.AddListener(delegate (bool _bool) { Togle_10(_bool); });
- _Togle_11.onValueChanged.AddListener(delegate (bool _bool) { Togle_11(_bool); });
- _Togle_12.onValueChanged.AddListener(delegate (bool _bool) { Togle_12(_bool); });
- _Togle_13.onValueChanged.AddListener(delegate (bool _bool) { Togle_13(_bool); });
- _Togle_14.onValueChanged.AddListener(delegate (bool _bool) { Togle_14(_bool); });
- _Togle_15.onValueChanged.AddListener(delegate (bool _bool) { Togle_15(_bool); });
- _ToggleStar1.onValueChanged.AddListener(delegate (bool _bool) { Toggle_Star1(_bool); });
- _ToggleStar2.onValueChanged.AddListener(delegate (bool _bool) { Toggle_Star2(_bool); });
- _ToggleStarMp.onValueChanged.AddListener(delegate (bool _bool) { Toggle_StarMP(_bool); });
- }
-
- void CloseButton()//鍏抽棴鎸夐挳
- {
- Close();
- }
-
- void DonateButton()//瑁呭鎹愮尞鎸夐挳
- {
- if (IsDonateEquipment())
- {
- WindowCenter.Instance.Open<DonateEquipTipsWin>();
- }
- else
- {
- ScrollTip.ShowTip(Language.Get("NoDonationEquipment_Z"));
- }
-
- }
- #endregion
-
- void FairyAuIntegral()//浠欑洘绉垎鍒锋柊
- {
- _CountText.text = playerFairyAuTreasureData._FairyAuIntegral.ToString();
- }
-
- void CleanButton()//鎵归噺娓呯悊鎸夐挳
- {
- if (PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanClearTreasury))
- {
- ScrollViewFirst.SetActive(false);
- ScrollViewSecond.SetActive(false);
- ScrollViewThree.SetActive(false);
- _ExitBtn.gameObject.SetActive(false);
- _CleanBtn.gameObject.SetActive(false);
- _Dropdown.SetActive(true);
- _WarehouseCountBG.SetActive(false);
- _Dropdown2.SetActive(true);
- _Dropdown3.SetActive(true);
- _ExitBtn.gameObject.SetActive(true);
- _DeleteBtn.gameObject.SetActive(true);
- _bool = true;
- SelectiveCleaningEquipment();//閫夋嫨娓呯悊瑁呭
- }
- else
- {
- ScrollTip.ShowTip(Language.Get("Z1079"));
-
- }
- }
-
- void ExitButton()//閫�鍑虹鐞嗘寜閽�
- {
- _ExitBtn.gameObject.SetActive(true);
- _CleanBtn.gameObject.SetActive(true);
- _WarehouseCountBG.SetActive(true);
- _Dropdown.SetActive(false);
- _Dropdown2.SetActive(false);
- _Dropdown3.SetActive(false);
- _ExitBtn.gameObject.SetActive(false);
- _DeleteBtn.gameObject.SetActive(false);
- _bool = false;
- _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- _EquipmentArray.Clear();
- }
-
- void DeleteButton()//瑁呭閿�姣佹寜閽�
- {
- if (_EquipmentArray.Count == 0)
- {
- ScrollTip.ShowTip(Language.Get("SelectEquipDestroy"));
- return;
- }
-
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("Z1078"), (bool isOk) =>
- {
- if (isOk)
- {
- CA409_tagCGFamilyStoreDel _CA409 = new CA409_tagCGFamilyStoreDel();
- byte[] List = new byte[_EquipmentArray.Count];
- int type = 0;
- foreach (int index in _EquipmentArray.Keys)
- {
- List[type] = (byte)(index - 1);
- type += 1;
- }
- _CA409.IndexCount = (byte)List.Length;
- _CA409.StoreItemIndex = List;
- GameNetSystem.Instance.SendInfo(_CA409);
- _EquipmentArray.Clear();
- }
- });
- }
-
- void Arrow1()//浠撳簱鏄熺骇鎸夐挳1
-
- {
- ScrollViewFirst.gameObject.SetActive(!ScrollViewFirst.activeSelf);
- }
-
- void Arrow2()//瑁呭鍚告敹鎸夐挳鍒囨崲鎸夐挳2
-
- {
- ScrollViewSecond.gameObject.SetActive(!ScrollViewSecond.activeSelf);
- }
- void Arrow3()//鏄熺骇鍒囨崲鎸夐挳
- {
- ScrollViewThree.gameObject.SetActive(!ScrollViewThree.activeSelf);
- }
- #region//涓�鎺ㄧ殑Toggle
- void IsNoConentA(Toggle toogleA, Toggle toogleC)
- {
- for (int i = 0; i < _ContentOne.childCount; i++)
- {
-
- if (_ContentOne.GetChild(i).GetComponent<Toggle>().name == toogleA.name)
- {
- _ContentOne.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentOne.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
- for (int i = 0; i < _ContentThree.childCount; i++)
- {
-
- if (_ContentThree.GetChild(i).GetComponent<Toggle>().name == toogleC.name)
- {
- _ContentThree.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentThree.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
- }
- void IsNoConentB(Toggle ToogleB, Toggle ToogleC)
- {
- for (int i = 0; i < _ContentTwo.childCount; i++)
- {
-
- if (_ContentTwo.GetChild(i).GetComponent<Toggle>().name == ToogleB.name)
- {
- _ContentTwo.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentTwo.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
- for (int i = 0; i < _ContentThree.childCount; i++)
- {
-
- if (_ContentThree.GetChild(i).GetComponent<Toggle>().name == ToogleC.name)
- {
- _ContentThree.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentThree.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
- }
- void IsNoConentC(Toggle ToogleA, Toggle ToogleB)
- {
- for (int i = 0; i < _ContentOne.childCount; i++)
- {
-
- if (_ContentOne.GetChild(i).GetComponent<Toggle>().name == ToogleA.name)
- {
- _ContentOne.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentOne.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
- for (int i = 0; i < _ContentTwo.childCount; i++)
- {
-
- if (_ContentTwo.GetChild(i).GetComponent<Toggle>().name == ToogleB.name)
- {
- _ContentTwo.GetChild(i).GetComponent<Toggle>().isOn = true;
- }
- else
- {
- _ContentTwo.GetChild(i).GetComponent<Toggle>().isOn = false;
- }
- }
-
- }
- void ToggleRed(bool _bool)//绾㈣壊
- {
- if (_bool)
- {
- Label_A.text = _ToggleRed.transform.Find("Label").GetComponent<Text>().text;
- Label_A.color = _ToggleRed.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewFirst.gameObject.SetActive(false);
- if (_ToggleEmpty.isOn)
- {
- IsNoConentB(_ToggleAny, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Toggleorange(bool _bool)//姗欒壊
- {
- if (_bool)
- {
- Label_A.text = _Toggleorange.transform.Find("Label").GetComponent<Text>().text;
- Label_A.color = _Toggleorange.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewFirst.gameObject.SetActive(false);
- if (_ToggleEmpty.isOn)
- {
- IsNoConentB(_ToggleAny, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
-
- void Togglepurple(bool _bool)//绱壊
- {
- if (_bool)
- {
- Label_A.text = _Togglepurple.transform.Find("Label").GetComponent<Text>().text;
- Label_A.color = _Togglepurple.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewFirst.gameObject.SetActive(false);
- if (_ToggleEmpty.isOn)
- {
- IsNoConentB(_ToggleAny, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
-
- }
-
- }
-
- void ToggleeMpty(bool _bool)//娓呯┖閫夋嫨
- {
- if (_bool)
- {
- Label_A.text = _ToggleeMpty.transform.Find("Label").GetComponent<Text>().text;
- Label_A.color = _ToggleeMpty.transform.Find("Label").GetComponent<Text>().color;
- IsNoConentB(_ToggleEmpty, _ToggleStarMp);
- ScrollViewFirst.gameObject.SetActive(false);
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
-
-
-
-
- void ToggleEmpty(bool _bool)//娓呯┖閫夋嫨
- {
- if (_bool)
- {
-
- Label_B.text = _ToggleEmpty.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _ToggleEmpty.transform.Find("Label").GetComponent<Text>().color;
- IsNoConentA(_ToggleeMpty, _ToggleStarMp);
- ScrollViewSecond.gameObject.SetActive(false);
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
-
- void ToggleAny(bool _bool)//浠绘剰闃舵暟
- {
- if (_bool)
- {
-
- Label_B.text = _ToggleAny.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _ToggleAny.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_1(bool _bool)//涓�闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_1.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_1.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_2(bool _bool)//浜岄樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_2.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_2.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_3(bool _bool)//涓夐樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_3.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_3.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_4(bool _bool)//鍥涢樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_4.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_4.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_5(bool _bool)//浜旈樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_5.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_5.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_6(bool _bool)//鍏樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_6.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_6.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_7(bool _bool)//涓冮樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_7.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_7.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_8(bool _bool)//鍏樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_8.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_8.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_9(bool _bool)//涔濋樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_9.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_9.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_10(bool _bool)//鍗侀樁
- {
- if (_bool)
- {
- Label_B.text = _Togle_10.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_10.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_11(bool _bool)//鍗佷竴闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_11.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_11.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_12(bool _bool)//鍗佷簩闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_12.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_12.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_13(bool _bool)//鍗佷笁闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_13.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_13.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_14(bool _bool)//鍗佸洓闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_14.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_14.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Togle_15(bool _bool)//鍗佷簲闃�
- {
- if (_bool)
- {
- Label_B.text = _Togle_15.transform.Find("Label").GetComponent<Text>().text;
- Label_B.color = _Togle_15.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewSecond.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn)
- {
- IsNoConentA(_Togglepurple, _ToggleStar1);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
- void Toggle_Star1(bool _bool)//涓�鏄�
- {
- if (_bool)
- {
- Label_C.text = _ToggleStar1.transform.Find("Label").GetComponent<Text>().text;
- Label_C.color = _ToggleStar1.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewThree.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn && _ToggleEmpty.isOn)
- {
- IsNoConentC(_Togglepurple, _ToggleAny);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
- }
-
- void Toggle_Star2(bool _bool)//浜屾槦
- {
- if (_bool)
- {
- Label_C.text = _ToggleStar2.transform.Find("Label").GetComponent<Text>().text;
- Label_C.color = _ToggleStar2.transform.Find("Label").GetComponent<Text>().color;
- ScrollViewThree.gameObject.SetActive(false);
- if (_ToggleeMpty.isOn && _ToggleEmpty.isOn)
- {
- IsNoConentC(_Togglepurple, _ToggleAny);
- }
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
- }
-
- void Toggle_StarMP(bool _bool)//娓呯┖閫夋嫨
- {
- if (_bool)
- {
-
- Label_C.text = _ToggleStarMp.transform.Find("Label").GetComponent<Text>().text;
- Label_C.color = _ToggleStarMp.transform.Find("Label").GetComponent<Text>().color;
- IsNoConentC(_ToggleeMpty, _ToggleEmpty);
- ScrollViewThree.gameObject.SetActive(false);
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- }
-
-
- private void ToggleStar(bool isBool)
- {
- SelectiveCleaningEquipment();//閫夋嫨閿�姣�
- }
-
- #endregion
-
- void SelectiveCleaningEquipment()//閫夋嫨娓呯悊瑁呭
- {
- int type_A = Color_T();//绫诲瀷1瑁呭鍝佽川
- int type_B = Class_T();//绫诲瀷2瑁呭闃剁骇
- int Type_C = Start_T();//绫诲瀷3鏄熺骇
- Item_lv = type_B;
- Item_Color = type_A;
- Item_Star = Type_C;
- _EquipmentArray.Clear();
- foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- var itemConfig = ItemConfig.Get(playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID);
- if ((Item_lv >= itemConfig.LV && Item_Color >= itemConfig.ItemColor && playerFairyAuTreasureData._DicfamilyStoreItem[key].Index != 0 && Item_Star >= itemConfig.StarLevel))
- {
- _EquipmentArray.Add(playerFairyAuTreasureData._DicfamilyStoreItem[key].Index, true);
- }
- }
-
- _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- }
- int Color_T()//杩斿洖鍊�1
- {
- for (int i = 0; i < _ContentOne.childCount; i++)
- {
- if (_ContentOne.GetChild(i).GetComponent<Toggle>().isOn)
- {
- switch (_ContentOne.GetChild(i).name)
- {
- case "ToggleRed":
- return 5;
-
- case "Toggleorange":
- return 4;
- case "Togglepurple":
- return 3;
- case "ToggleeMpty":
- return 0;
- }
- }
- }
- return 0;
- }
-
- int Class_T()//杩斿洖鍊�2
- {
- for (int i = 0; i < _ContentTwo.childCount; i++)
- {
- if (_ContentTwo.GetChild(i).GetComponent<Toggle>().isOn)
- {
- switch (_ContentTwo.GetChild(i).name)
- {
- case "Togle_1":
- return 1;
- case "Togle_2":
- return 2;
- case "Togle_3":
- return 3;
- case "Togle_4":
- return 4;
- case "Togle_5":
- return 5;
- case "Togle_6":
- return 6;
- case "Togle_7":
- return 7;
- case "Togle_8":
- return 8;
- case "Togle_9":
- return 9;
- case "Togle_10":
- return 10;
- case "Togle_11":
- return 11;
- case "Togle_12":
- return 12;
- case "Togle_13":
- return 13;
- case "Togle_14":
- return 14;
- case "Togle_15":
- return 15;
- case "ToggleAny":
- return 30;
- case "ToggleEmpty":
- return 0;
- }
- }
- }
- return 0;
- }
-
- int Start_T()
- {
- for (int i = 0; i < _ContentThree.childCount; i++)
- {
- if (_ContentThree.GetChild(i).GetComponent<Toggle>().isOn)
- {
- switch (_ContentThree.GetChild(i).name)
- {
- case "Togle_Star2":
- return 2;
- case "Togle_Star1":
- return 1;
- case "Toggle_StarMP":
- return 0;
- }
- }
- }
- return 0;
-
- }
- void QueryFamilyAction()//瀹舵棌琛屼负淇℃伅鏌ヨ
- {
- CA408_tagCGQueryFamilyAction _CA408 = new CA408_tagCGQueryFamilyAction();
- _CA408.ActionType = 7;
- _CA408.FamilyID = PlayerDatas.Instance.fairyData.fairy.FamilyID;
-
- GameNetSystem.Instance.SendInfo(_CA408);
- }
-
- void FamilyStoreItemInfo()//浠撳簱淇℃伅鍒锋柊
- {
- QueryFamilyAction();//瀹舵棌琛屼负淇℃伅鏌ヨ
- _listArray.Clear();
- foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- _listArray.Add(key);
- }
- SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
- _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- }
-
- void Del_FamilyStoreItemInfo(List<int> List)//鐗╁搧鍒犻櫎
- {
- QueryFamilyAction();//瀹舵棌琛屼负淇℃伅鏌ヨ
- _listArray.Clear();
- foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- _listArray.Add(key);
- }
- SetItemID();//鑾峰彇楂樹寒鐗规晥鐗╁搧ID
- _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
-
- }
-
- void FamilyActionInfo()
- {
- _listArray.Clear();
- foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- _listArray.Add(key);
- }
- _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//鍒锋柊褰撳墠鍙
- }
-
- private void HandleAchievement()
- {
- if (AchievementGoto.achievementType == AchievementGoto.EquipmentDonated)//浠撳簱瑁呭鎹愮尞锛�220锛�
- {
- var effcet = AchievementGuideEffectPool.Require(1);
- if (effcet.effect != null)
- {
- effcet.effect.ResetOrder(3500);
- }
- effcet.transform.SetParentEx(_DonateBtn.transform, Vector3.zero, Vector3.zero, Vector3.one);
- }
- }
-
- private bool IsDonateEquipment()//鍒ゆ柇鏄惁鏈夊彲鎹愮尞瑁呭
- {
- Dictionary<int, ItemModel> backpack_dic = playerPack.GetSinglePack(PackType.Item).GetAllItems();
- Dictionary<int, ProductOrderJudgment> _ProductOrderJudgment = AttributeJudgment();
- foreach (int item_id in backpack_dic.Keys)
- {
- ItemConfig _ChinItem = ItemConfig.Get((int)backpack_dic[item_id].itemId);
- foreach (int key in _ProductOrderJudgment.Keys)
- {
- if (_ChinItem.EquipPlace == key && _ChinItem.LV >= _ProductOrderJudgment[key].Class && _ChinItem.StarLevel >= _ProductOrderJudgment[key].TheStar && _ChinItem.ItemColor >= _ProductOrderJudgment[key].Color)
- {
- return true;
- }
- }
- }
- return false;
- }
- class ProductOrderJudgment
- {
- public int Class;//闃剁骇
- public int TheStar;//鏄熺骇
- public int Color;//棰滆壊
-
-
- }
- Dictionary<int, ProductOrderJudgment> AttributeJudgment()//灞炴�у垽鏂�
- {
- Dictionary<int, ProductOrderJudgment> _DicConditions = new Dictionary<int, ProductOrderJudgment>();//鏉′欢瀛楀吀
- FuncConfigConfig Number1 = FuncConfigConfig.Get("FamilyStoreItemRule1");
- FuncConfigConfig Number2 = FuncConfigConfig.Get("FamilyStoreItemRule2");
- string[] strA = Number1.Numerical1.Split('|');
- string[] strA1 = Number1.Numerical2.Split('|');
- for (int i = 0; i < strA.Length; i++)
- {
- if (!_DicConditions.ContainsKey(int.Parse(strA[i])))
- {
- ProductOrderJudgment _ProductOrder = new ProductOrderJudgment();
- _ProductOrder.Class = int.Parse(strA1[0]);
- _ProductOrder.TheStar = int.Parse(strA1[1]);
- _ProductOrder.Color = int.Parse(strA1[2]);
- _DicConditions.Add(int.Parse(strA[i]), _ProductOrder);
- }
- }
-
- string[] strB = Number2.Numerical1.Split('|');
- string[] strB1 = Number2.Numerical2.Split('|');
- for (int j = 0; j < strB.Length; j++)
- {
- if (!_DicConditions.ContainsKey(int.Parse(strB[j])))
- {
- ProductOrderJudgment _ProductOrder = new ProductOrderJudgment();
- _ProductOrder.Class = int.Parse(strB1[0]);
- _ProductOrder.TheStar = int.Parse(strB1[1]);
- _ProductOrder.Color = int.Parse(strB1[2]);
- _DicConditions.Add(int.Parse(strB[j]), _ProductOrder);
- }
-
- }
- return _DicConditions;
- }
-
- private void SetItemID()//鑾峰彇鐗╁搧ID
- {
- DicHighlight.Clear();//闇�瑕佷寒鐨勪粨搴撶墿鍝佷笅鏍�
- int Order = 0;//闃舵暟
- int Color = 0;//棰滆壊
- int Star = 0;//棰滆壊
- int EquipPlace = 0;//瑁呭浣嶇疆
- if (playerFairyAuTreasureData.JumpItemID == null || playerFairyAuTreasureData.JumpItemID.Count <= 0)
- {
- return;
- }
- for (int i = 0; i < playerFairyAuTreasureData.JumpItemID.Count; i++)
- {
- int ItemId = playerFairyAuTreasureData.JumpItemID[i];
- var itemconfig = ItemConfig.Get(ItemId);
- if (itemconfig.EquipPlace == 0 && itemconfig.EquipPlace > 10)
- {
- return;
- }
- Order = itemconfig.LV;
- Color = itemconfig.ItemColor;
- Star = itemconfig.StarLevel;
- EquipPlace = itemconfig.EquipPlace;
- foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
- {
- var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID;
- var item_config = ItemConfig.Get(Item_ID);
- if (item_config == null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10)
- {
- continue;
- }
- if (item_config.LV >= Order && item_config.ItemColor >= Color
- && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace
- && ItemLogicUtility.Instance.IsJobCompatibleItem(Item_ID))
- {
- if (!DicHighlight.ContainsKey(key))
- {
- DicHighlight.Add(key, 1);
- }
- }
- }
- }
- }
-
- private void ClearItemID(int Index)
- {
- if (DicHighlight.ContainsKey(Index))
- {
- DicHighlight.Clear();
- }
- }
- }
-}
-
-
-
-
diff --git a/System/FairyAu/WarehouseTipsWin.cs.meta b/System/FairyAu/WarehouseTipsWin.cs.meta
deleted file mode 100644
index 6b29579..0000000
--- a/System/FairyAu/WarehouseTipsWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 96a9374acb810aa44a328de76fb7e659
-timeCreated: 1505206662
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/WindowBase/ModelCenter.cs b/System/WindowBase/ModelCenter.cs
index 99d7ad0..9d876a2 100644
--- a/System/WindowBase/ModelCenter.cs
+++ b/System/WindowBase/ModelCenter.cs
@@ -145,7 +145,6 @@
RegisterModel<PreciousItemGetModel>();
RegisterModel<PlayerMainDate>();
RegisterModel<StoryMissionsModel>();
- RegisterModel<FairyAuTreasureModel>();
RegisterModel<BoxGetItemModel>();
RegisterModel<RedPacketModel>();
RegisterModel<GuardModel>();
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index d3e8f1e..2ec3b1b 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -455,7 +455,7 @@
SetJumpLogic<TreasureSelectWin>();
break;
case JumpUIType.UnionWarehouse:
- SetJumpLogic<WarehouseTipsWin>(_tagWinSearchModel.TABID);
+ DebugEx.LogError("鍘熸湰浠欑洘浠撳簱宸插垹闄�");
break;
case JumpUIType.UnionHall:
SetJumpLogic<HallTipsWin>(_tagWinSearchModel.TABID);
--
Gitblit v1.8.0