From be2f8fb881f04cbd66ea2357dccfd885c6dc93cc Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 04 十二月 2024 14:21:57 +0800
Subject: [PATCH] 10060 所有战令修改展示规则,蒙版图片放到公共图集,统一锁的图片。骑宠养成战令,古宝养成战令文字显示全

---
 System/ZhanLingH/GatheringSoulZhanLingCell.cs             |   16 ++++-
 System/LoopAct/FairyAffinity/FairyAffinityZhanLingCell.cs |    5 +
 System/ZhanLingH/GuBaoCultivateZhanLingCell.cs            |   16 ++++-
 System/ZhanLingH/MountedPetZhanLingCell.cs                |   16 ++++-
 LogicProject/System/Recharge/RealmLVZhanlingCell.cs       |   12 ++-
 LogicProject/System/Recharge/CelestialStarTowerCell.cs    |   12 ++-
 System/ZhanLingH/PhantasmPavilionZhanLingCell.cs          |   16 ++++-
 LogicProject/System/Recharge/LvZhanlingCell.cs            |   12 ++-
 System/ZhanLing/LoginZhanLingCell.cs                      |   18 ++++-
 LogicProject/System/Recharge/GuBaoTotalStarsCell.cs       |   12 ++-
 10 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/LogicProject/System/Recharge/CelestialStarTowerCell.cs b/LogicProject/System/Recharge/CelestialStarTowerCell.cs
index 83dcb10..dba5032 100644
--- a/LogicProject/System/Recharge/CelestialStarTowerCell.cs
+++ b/LogicProject/System/Recharge/CelestialStarTowerCell.cs
@@ -7,12 +7,13 @@
 {
     ImageEx imgUnlockLV;
     ImageEx imgFreeHave;
-    ImageEx imgFreeLock;
+    ImageEx imgFreeGrey;
     TextEx txtUnlockLV;
     ItemCell freeItemCell;
     List<ItemCell> paidItemCellList = new List<ItemCell>();
     List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     ImageEx imgBrownProgressBar;
     ImageEx imgGreenProgressBar;
     ImageEx imgBG;
@@ -23,7 +24,7 @@
     {
         imgUnlockLV = proxy.GetWidgtEx<ImageEx>("imgUnlockLV");
         imgFreeHave = proxy.GetWidgtEx<ImageEx>("imgFreeHave0");
-        imgFreeLock = proxy.GetWidgtEx<ImageEx>("imgFreeLock0");
+        imgFreeGrey = proxy.GetWidgtEx<ImageEx>("imgFreeGrey0");
         txtUnlockLV = proxy.GetWidgtEx<TextEx>("txtUnlockLV");
         freeItemCell = proxy.GetWidgtEx<ItemCell>("freeItemCell0");
         imgBrownProgressBar = proxy.GetWidgtEx<ImageEx>("imgBrownProgressBar");
@@ -33,6 +34,7 @@
         {
             imgPaidHaveList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidHave" + i));
             imgPaidLockList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidLock" + i));
+            imgPaidGreyList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidGrey" + i));
             paidItemCellList.Add(proxy.GetWidgtEx<ItemCell>("paidItemCell" + i));
             paidItemCellTweenList.Add(proxy.GetWidgtEx<RotationTween>("paidItemCell" + i));
         }
@@ -75,12 +77,14 @@
         int freeState = CelestialStarTowerModel.Instance.GetGiftState(3, needValue, true);
         int paidState = CelestialStarTowerModel.Instance.GetGiftState(3, needValue, false);
         imgFreeHave.SetActiveIL(freeState == 2);
-        imgFreeLock.SetActiveIL(freeState == 0);
+        imgFreeGrey.SetActiveIL(freeState == 2);
         imgGreenProgressBar.SetActiveIL(freeState != 0);
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
+            bool isBuy = CelestialStarTowerModel.Instance.zhanLingInfoDict[3].isActivite > 0;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
             imgPaidHaveList[i].SetActiveIL(paidState == 2);
-            imgPaidLockList[i].SetActiveIL(paidState == 0);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         if (ModelCenter.Instance.GetModel<SkyTowerModel>().highestPassFloor < needValue)
         {
diff --git a/LogicProject/System/Recharge/GuBaoTotalStarsCell.cs b/LogicProject/System/Recharge/GuBaoTotalStarsCell.cs
index 9b26237..52b1907 100644
--- a/LogicProject/System/Recharge/GuBaoTotalStarsCell.cs
+++ b/LogicProject/System/Recharge/GuBaoTotalStarsCell.cs
@@ -8,12 +8,13 @@
 {
     ImageEx imgUnlockLV;
     ImageEx imgFreeHave;
-    ImageEx imgFreeLock;
+    ImageEx imgFreeGrey;
     TextEx txtUnlockLV;
     ItemCell freeItemCell;
     List<ItemCell> paidItemCellList = new List<ItemCell>();
     List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     ImageEx imgBrownProgressBar;
     ImageEx imgGreenProgressBar;
     ImageEx imgBG;
@@ -24,7 +25,7 @@
     {
         imgUnlockLV = proxy.GetWidgtEx<ImageEx>("imgUnlockLV");
         imgFreeHave = proxy.GetWidgtEx<ImageEx>("imgFreeHave0");
-        imgFreeLock = proxy.GetWidgtEx<ImageEx>("imgFreeLock0");
+        imgFreeGrey = proxy.GetWidgtEx<ImageEx>("imgFreeGrey0");
         txtUnlockLV = proxy.GetWidgtEx<TextEx>("txtUnlockLV");
         freeItemCell = proxy.GetWidgtEx<ItemCell>("freeItemCell0");
         imgBrownProgressBar = proxy.GetWidgtEx<ImageEx>("imgBrownProgressBar");
@@ -34,6 +35,7 @@
         {
             imgPaidHaveList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidHave" + i));
             imgPaidLockList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidLock" + i));
+            imgPaidGreyList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidGrey" + i));
             paidItemCellList.Add(proxy.GetWidgtEx<ItemCell>("paidItemCell" + i));
             paidItemCellTweenList.Add(proxy.GetWidgtEx<RotationTween>("paidItemCell" + i));
         }
@@ -76,12 +78,14 @@
         int freeState = GuBaoTotalStarsModel.Instance.GetGiftState(4, needValue, true);
         int paidState = GuBaoTotalStarsModel.Instance.GetGiftState(4, needValue, false);
         imgFreeHave.SetActiveIL(freeState == 2);
-        imgFreeLock.SetActiveIL(freeState == 0);
+        imgFreeGrey.SetActiveIL(freeState == 2);
         imgGreenProgressBar.SetActiveIL(freeState != 0);
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
+            bool isBuy = GuBaoTotalStarsModel.Instance.zhanLingInfoDict[4].isActivite > 0;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
             imgPaidHaveList[i].SetActiveIL(paidState == 2);
-            imgPaidLockList[i].SetActiveIL(paidState == 0);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         if (GuBaoTotalStarsModel.Instance.GetAllGuBaoStarCount() < needValue)
         {
diff --git a/LogicProject/System/Recharge/LvZhanlingCell.cs b/LogicProject/System/Recharge/LvZhanlingCell.cs
index 0f383be..fc30b71 100644
--- a/LogicProject/System/Recharge/LvZhanlingCell.cs
+++ b/LogicProject/System/Recharge/LvZhanlingCell.cs
@@ -8,12 +8,13 @@
 {
     ImageEx imgUnlockLV;
     ImageEx imgFreeHave;
-    ImageEx imgFreeLock;
+    ImageEx imgFreeGrey;
     TextEx txtUnlockLV;
     ItemCell freeItemCell;
     List<ItemCell> paidItemCellList = new List<ItemCell>();
     List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     ImageEx imgBrownProgressBar;
     ImageEx imgGreenProgressBar;
     ImageEx imgBG;
@@ -24,7 +25,7 @@
     {
         imgUnlockLV = proxy.GetWidgtEx<ImageEx>("imgUnlockLV");
         imgFreeHave = proxy.GetWidgtEx<ImageEx>("imgFreeHave0");
-        imgFreeLock = proxy.GetWidgtEx<ImageEx>("imgFreeLock0");
+        imgFreeGrey = proxy.GetWidgtEx<ImageEx>("imgFreeGrey0");
         txtUnlockLV = proxy.GetWidgtEx<TextEx>("txtUnlockLV");
         freeItemCell = proxy.GetWidgtEx<ItemCell>("freeItemCell0");
         imgBrownProgressBar = proxy.GetWidgtEx<ImageEx>("imgBrownProgressBar");
@@ -36,6 +37,7 @@
             imgPaidLockList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidLock" + i));
             paidItemCellList.Add(proxy.GetWidgtEx<ItemCell>("paidItemCell" + i));
             paidItemCellTweenList.Add(proxy.GetWidgtEx<RotationTween>("paidItemCell" + i));
+            imgPaidGreyList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidGrey" + i));
         }
         freeItemCellTween = proxy.GetWidgtEx<RotationTween>("freeItemCell0");
     }
@@ -75,12 +77,14 @@
         int freeState = LvZhanlingModel.Instance.GetGiftState(1, needValue, true);
         int paidState = LvZhanlingModel.Instance.GetGiftState(1, needValue, false);
         imgFreeHave.SetActiveIL(freeState == 2);
-        imgFreeLock.SetActiveIL(freeState == 0);
+        imgFreeGrey.SetActiveIL(freeState == 2);
         imgGreenProgressBar.SetActiveIL(freeState != 0);
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
+            bool isBuy = LvZhanlingModel.Instance.zhanLingInfoDict[1].isActivite > 0;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
             imgPaidHaveList[i].SetActiveIL(paidState == 2);
-            imgPaidLockList[i].SetActiveIL(paidState == 0);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         if (PlayerDatas.Instance.baseData.LV < needValue)
         {
diff --git a/LogicProject/System/Recharge/RealmLVZhanlingCell.cs b/LogicProject/System/Recharge/RealmLVZhanlingCell.cs
index 9bc628c..69eacc2 100644
--- a/LogicProject/System/Recharge/RealmLVZhanlingCell.cs
+++ b/LogicProject/System/Recharge/RealmLVZhanlingCell.cs
@@ -8,12 +8,13 @@
 {
     ImageEx imgUnlockLV;
     ImageEx imgFreeHave;
-    ImageEx imgFreeLock;
+    ImageEx imgFreeGrey;
     TextEx txtUnlockLV;
     ItemCell freeItemCell;
     List<ItemCell> paidItemCellList = new List<ItemCell>();
     List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     ImageEx imgBrownProgressBar;
     ImageEx imgGreenProgressBar;
     ImageEx imgBG;
@@ -24,7 +25,7 @@
     {
         imgUnlockLV = proxy.GetWidgtEx<ImageEx>("imgUnlockLV");
         imgFreeHave = proxy.GetWidgtEx<ImageEx>("imgFreeHave0");
-        imgFreeLock = proxy.GetWidgtEx<ImageEx>("imgFreeLock0");
+        imgFreeGrey = proxy.GetWidgtEx<ImageEx>("imgFreeGrey0");
         txtUnlockLV = proxy.GetWidgtEx<TextEx>("txtUnlockLV");
         freeItemCell = proxy.GetWidgtEx<ItemCell>("freeItemCell0");
         imgBrownProgressBar = proxy.GetWidgtEx<ImageEx>("imgBrownProgressBar");
@@ -34,6 +35,7 @@
         {
             imgPaidHaveList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidHave" + i));
             imgPaidLockList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidLock" + i));
+            imgPaidGreyList.Add(proxy.GetWidgtEx<ImageEx>("imgPaidGrey" + i));
             paidItemCellList.Add(proxy.GetWidgtEx<ItemCell>("paidItemCell" + i));
             paidItemCellTweenList.Add(proxy.GetWidgtEx<RotationTween>("paidItemCell" + i));
         }
@@ -76,12 +78,14 @@
         int freeState = RealmLVZhanlingModel.Instance.GetGiftState(2, needValue, true);
         int paidState = RealmLVZhanlingModel.Instance.GetGiftState(2, needValue, false);
         imgFreeHave.SetActiveIL(freeState == 2);
-        imgFreeLock.SetActiveIL(freeState == 0);
+        imgFreeGrey.SetActiveIL(freeState == 2);
         imgGreenProgressBar.SetActiveIL(freeState != 0);
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
+            bool isBuy = RealmLVZhanlingModel.Instance.zhanLingInfoDict[2].isActivite > 0;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
             imgPaidHaveList[i].SetActiveIL(paidState == 2);
-            imgPaidLockList[i].SetActiveIL(paidState == 0);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         if (PlayerDatas.Instance.baseData.realmLevel < needValue)
         {
diff --git a/System/LoopAct/FairyAffinity/FairyAffinityZhanLingCell.cs b/System/LoopAct/FairyAffinity/FairyAffinityZhanLingCell.cs
index aaf9427..5582d5e 100644
--- a/System/LoopAct/FairyAffinity/FairyAffinityZhanLingCell.cs
+++ b/System/LoopAct/FairyAffinity/FairyAffinityZhanLingCell.cs
@@ -60,9 +60,10 @@
             imgGreenProgressBar.SetActiveIL(freeState != 0);
             for (int i = 0; i < paidItemCellList.Count; i++)
             {
+                bool isBuy = model.IsBuy();
+                imgPaidGrizzlyList[i].SetActiveIL(paidState == 2 || !isBuy);
                 imgPaidHaveList[i].SetActiveIL(paidState == 2);
-                imgPaidLockList[i].SetActiveIL(paidState == 0);
-                imgPaidGrizzlyList[i].SetActiveIL(paidState == 0|| paidState == 2);
+                imgPaidLockList[i].SetActiveIL(!isBuy);
             }
             if (model.GetNowValue() < (ulong)needValue)
             {
diff --git a/System/ZhanLing/LoginZhanLingCell.cs b/System/ZhanLing/LoginZhanLingCell.cs
index a7fc1fb..2e13e1f 100644
--- a/System/ZhanLing/LoginZhanLingCell.cs
+++ b/System/ZhanLing/LoginZhanLingCell.cs
@@ -7,14 +7,17 @@
 {
     [SerializeField] ImageEx imgUnlockLV;
     [SerializeField] ImageEx imgFreeHave;
+    [SerializeField] ImageEx imgFreeGrey;
     [SerializeField] TextEx txtUnlockLV;
     [SerializeField] ItemCell freeItemCell;
     [SerializeField] List<ItemCell> paidItemCellList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     [SerializeField] List<ItemCell> paidItemCellHList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveHList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockHList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyHList = new List<ImageEx>();
     [SerializeField] ImageEx imgBrownProgressBar;
     [SerializeField] ImageEx imgGreenProgressBar;
     [SerializeField] ImageEx imgBG;
@@ -79,17 +82,22 @@
         DebugEx.Log($"needValue {needValue} freeState {freeState} paidState {paidState} paidHState {paidHState}");
 
         imgFreeHave.SetActive(freeState == 2);
+        imgFreeGrey.SetActive(freeState == 2);
         imgGreenProgressBar.SetActive(freeState != 0);
-
+        
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
-            imgPaidHaveList[i].SetActive(paidState == 2);
-            imgPaidLockList[i].SetActive(paidState == 0);
+            bool isBuy = buyState == 1 || buyState == 3;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
+            imgPaidHaveList[i].SetActiveIL(paidState == 2);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         for (int i = 0; i < paidItemCellHList.Count; i++)
         {
-            imgPaidHaveHList[i].SetActive(paidHState == 2);
-            imgPaidLockHList[i].SetActive(paidHState == 0);
+            bool isBuy = buyState == 2 || buyState == 3;
+            imgPaidGreyHList[i].SetActiveIL(paidHState == 2 || !isBuy);
+            imgPaidHaveHList[i].SetActiveIL(paidHState == 2);
+            imgPaidLockHList[i].SetActiveIL(!isBuy);
         }
         imgUnlockLV.gray = !this.model.IsNeedValueOk(needValue);
         txtUnlockLV.text = needValue.ToString();
diff --git a/System/ZhanLingH/GatheringSoulZhanLingCell.cs b/System/ZhanLingH/GatheringSoulZhanLingCell.cs
index fba5094..01ae15c 100644
--- a/System/ZhanLingH/GatheringSoulZhanLingCell.cs
+++ b/System/ZhanLingH/GatheringSoulZhanLingCell.cs
@@ -7,14 +7,17 @@
 {
     [SerializeField] ImageEx imgUnlockLV;
     [SerializeField] ImageEx imgFreeHave;
+    [SerializeField] ImageEx imgFreeGrey;
     [SerializeField] TextEx txtUnlockLV;
     [SerializeField] ItemCell freeItemCell;
     [SerializeField] List<ItemCell> paidItemCellList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     [SerializeField] List<ItemCell> paidItemCellHList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveHList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockHList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyHList = new List<ImageEx>();
     [SerializeField] ImageEx imgBrownProgressBar;
     [SerializeField] ImageEx imgGreenProgressBar;
     [SerializeField] ImageEx imgBG;
@@ -79,17 +82,22 @@
         DebugEx.Log($"needValue {needValue} freeState {freeState} paidState {paidState} paidHState {paidHState}");
 
         imgFreeHave.SetActive(freeState == 2);
+        imgFreeGrey.SetActive(freeState == 2);
         imgGreenProgressBar.SetActive(freeState != 0);
 
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
-            imgPaidHaveList[i].SetActive(paidState == 2);
-            imgPaidLockList[i].SetActive(paidState == 0);
+            bool isBuy = buyState == 1 || buyState == 3;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
+            imgPaidHaveList[i].SetActiveIL(paidState == 2);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         for (int i = 0; i < paidItemCellHList.Count; i++)
         {
-            imgPaidHaveHList[i].SetActive(paidHState == 2);
-            imgPaidLockHList[i].SetActive(paidHState == 0);
+            bool isBuy = buyState == 2 || buyState == 3;
+            imgPaidGreyHList[i].SetActiveIL(paidHState == 2 || !isBuy);
+            imgPaidHaveHList[i].SetActiveIL(paidHState == 2);
+            imgPaidLockHList[i].SetActiveIL(!isBuy);
         }
         imgUnlockLV.gray = !gatheringSoulZhanLingModel.IsNeedValueOk(needValue);
         txtUnlockLV.text = needValue.ToString();
diff --git a/System/ZhanLingH/GuBaoCultivateZhanLingCell.cs b/System/ZhanLingH/GuBaoCultivateZhanLingCell.cs
index 14c08ad..96d4573 100644
--- a/System/ZhanLingH/GuBaoCultivateZhanLingCell.cs
+++ b/System/ZhanLingH/GuBaoCultivateZhanLingCell.cs
@@ -7,14 +7,17 @@
 {
     [SerializeField] ImageEx imgUnlockLV;
     [SerializeField] ImageEx imgFreeHave;
+    [SerializeField] ImageEx imgFreeGrey;
     [SerializeField] TextEx txtUnlockLV;
     [SerializeField] ItemCell freeItemCell;
     [SerializeField] List<ItemCell> paidItemCellList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     [SerializeField] List<ItemCell> paidItemCellHList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveHList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockHList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyHList = new List<ImageEx>();
     [SerializeField] ImageEx imgBrownProgressBar;
     [SerializeField] ImageEx imgGreenProgressBar;
     [SerializeField] ImageEx imgBG;
@@ -78,17 +81,22 @@
         DebugEx.Log($"needValue {needValue} freeState {freeState} paidState {paidState} paidHState {paidHState}");
 
         imgFreeHave.SetActive(freeState == 2);
+        imgFreeGrey.SetActive(freeState == 2);
         imgGreenProgressBar.SetActive(freeState != 0);
 
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
-            imgPaidHaveList[i].SetActive(paidState == 2);
-            imgPaidLockList[i].SetActive(paidState == 0);
+            bool isBuy = buyState == 1 || buyState == 3;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
+            imgPaidHaveList[i].SetActiveIL(paidState == 2);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         for (int i = 0; i < paidItemCellHList.Count; i++)
         {
-            imgPaidHaveHList[i].SetActive(paidHState == 2);
-            imgPaidLockHList[i].SetActive(paidHState == 0);
+            bool isBuy = buyState == 2 || buyState == 3;
+            imgPaidGreyHList[i].SetActiveIL(paidHState == 2 || !isBuy);
+            imgPaidHaveHList[i].SetActiveIL(paidHState == 2);
+            imgPaidLockHList[i].SetActiveIL(!isBuy);
         }
         imgUnlockLV.gray = !this.model.IsNeedValueOk(needValue);
         txtUnlockLV.text = needValue.ToString();
diff --git a/System/ZhanLingH/MountedPetZhanLingCell.cs b/System/ZhanLingH/MountedPetZhanLingCell.cs
index 707cfa9..af36c14 100644
--- a/System/ZhanLingH/MountedPetZhanLingCell.cs
+++ b/System/ZhanLingH/MountedPetZhanLingCell.cs
@@ -7,14 +7,17 @@
 {
     [SerializeField] ImageEx imgUnlockLV;
     [SerializeField] ImageEx imgFreeHave;
+    [SerializeField] ImageEx imgFreeGrey;
     [SerializeField] TextEx txtUnlockLV;
     [SerializeField] ItemCell freeItemCell;
     [SerializeField] List<ItemCell> paidItemCellList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyList = new List<ImageEx>();
     [SerializeField] List<ItemCell> paidItemCellHList = new List<ItemCell>();
     [SerializeField] List<ImageEx> imgPaidHaveHList = new List<ImageEx>();
     [SerializeField] List<ImageEx> imgPaidLockHList = new List<ImageEx>();
+    [SerializeField] List<ImageEx> imgPaidGreyHList = new List<ImageEx>();
     [SerializeField] ImageEx imgBrownProgressBar;
     [SerializeField] ImageEx imgGreenProgressBar;
     [SerializeField] ImageEx imgBG;
@@ -79,17 +82,22 @@
         DebugEx.Log($"needValue {needValue} freeState {freeState} paidState {paidState} paidHState {paidHState}");
 
         imgFreeHave.SetActive(freeState == 2);
+        imgFreeGrey.SetActive(freeState == 2);
         imgGreenProgressBar.SetActive(freeState != 0);
 
         for (int i = 0; i < paidItemCellList.Count; i++)
         {
-            imgPaidHaveList[i].SetActive(paidState == 2);
-            imgPaidLockList[i].SetActive(paidState == 0);
+            bool isBuy = buyState == 1 || buyState == 3;
+            imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
+            imgPaidHaveList[i].SetActiveIL(paidState == 2);
+            imgPaidLockList[i].SetActiveIL(!isBuy);
         }
         for (int i = 0; i < paidItemCellHList.Count; i++)
         {
-            imgPaidHaveHList[i].SetActive(paidHState == 2);
-            imgPaidLockHList[i].SetActive(paidHState == 0);
+            bool isBuy = buyState == 2 || buyState == 3;
+            imgPaidGreyHList[i].SetActiveIL(paidHState == 2 || !isBuy);
+            imgPaidHaveHList[i].SetActiveIL(paidHState == 2);
+            imgPaidLockHList[i].SetActiveIL(!isBuy);
         }
         imgUnlockLV.gray = !this.model.IsNeedValueOk(needValue);
         txtUnlockLV.text = needValue.ToString();
diff --git a/System/ZhanLingH/PhantasmPavilionZhanLingCell.cs b/System/ZhanLingH/PhantasmPavilionZhanLingCell.cs
index deeced5..4780657 100644
--- a/System/ZhanLingH/PhantasmPavilionZhanLingCell.cs
+++ b/System/ZhanLingH/PhantasmPavilionZhanLingCell.cs
@@ -8,14 +8,17 @@
     {
         [SerializeField] ImageEx imgUnlockLV;
         [SerializeField] ImageEx imgFreeHave;
+        [SerializeField] ImageEx imgFreeGrey;
         [SerializeField] TextEx txtUnlockLV;
         [SerializeField] ItemCell freeItemCell;
         [SerializeField] List<ItemCell> paidItemCellList = new List<ItemCell>();
         [SerializeField] List<ImageEx> imgPaidHaveList = new List<ImageEx>();
         [SerializeField] List<ImageEx> imgPaidLockList = new List<ImageEx>();
+        [SerializeField] List<ImageEx> imgPaidGreyList = new List<ImageEx>();
         [SerializeField] List<ItemCell> paidItemCellHList = new List<ItemCell>();
         [SerializeField] List<ImageEx> imgPaidHaveHList = new List<ImageEx>();
         [SerializeField] List<ImageEx> imgPaidLockHList = new List<ImageEx>();
+        [SerializeField] List<ImageEx> imgPaidGreyHList = new List<ImageEx>();
         [SerializeField] ImageEx imgBrownProgressBar;
         [SerializeField] ImageEx imgGreenProgressBar;
         [SerializeField] ImageEx imgBG;
@@ -79,17 +82,22 @@
             DebugEx.Log($"needValue {needValue} freeState {freeState} paidState {paidState} paidHState {paidHState}");
 
             imgFreeHave.SetActive(freeState == 2);
+            imgFreeGrey.SetActive(freeState == 2);
             imgGreenProgressBar.SetActive(freeState != 0);
 
             for (int i = 0; i < paidItemCellList.Count; i++)
             {
-                imgPaidHaveList[i].SetActive(paidState == 2);
-                imgPaidLockList[i].SetActive(paidState == 0);
+                bool isBuy = buyState == 1 || buyState == 3;
+                imgPaidGreyList[i].SetActiveIL(paidState == 2 || !isBuy);
+                imgPaidHaveList[i].SetActiveIL(paidState == 2);
+                imgPaidLockList[i].SetActiveIL(!isBuy);
             }
             for (int i = 0; i < paidItemCellHList.Count; i++)
             {
-                imgPaidHaveHList[i].SetActive(paidHState == 2);
-                imgPaidLockHList[i].SetActive(paidHState == 0);
+                bool isBuy = buyState == 2 || buyState == 3;
+                imgPaidGreyHList[i].SetActiveIL(paidHState == 2 || !isBuy);
+                imgPaidHaveHList[i].SetActiveIL(paidHState == 2);
+                imgPaidLockHList[i].SetActiveIL(!isBuy);
             }
             imgUnlockLV.gray = !this.model.IsNeedValueOk(needValue);
             txtUnlockLV.text = needValue.ToString();

--
Gitblit v1.8.0