From cd093eb7b0e9dbcc0fba9a5e08b8b7e49d6e9072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 17 十二月 2025 11:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/HappyXB/HappyXBModel.cs |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/Main/System/HappyXB/HappyXBModel.cs b/Main/System/HappyXB/HappyXBModel.cs
index 7d072a4..509a342 100644
--- a/Main/System/HappyXB/HappyXBModel.cs
+++ b/Main/System/HappyXB/HappyXBModel.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 
 
-public class HappyXBModel : GameSystemManager<HappyXBModel>
+public partial class HappyXBModel : GameSystemManager<HappyXBModel>
 {
     //瀵诲疂浜у嚭搴�
     private Dictionary<int, Dictionary<int, XBGetItemConfig>> xbGetItemDict = new Dictionary<int, Dictionary<int, XBGetItemConfig>>(); //濂栨睜鐨勬墍鏈夌墿鍝侊紙鎸夌被鍨�+绛夌骇锛�
@@ -214,6 +214,18 @@
                     int cnt = info.TreasuerInfoList[i].GridLimitCntList[j].GridCnt;
                     typeInfo.gridLimitCntDict[num] = cnt;
                 }
+                if (typeInfo.wishCntDict == null)
+                {
+                    typeInfo.wishCntDict = new Dictionary<int, int>();
+                }
+                typeInfo.wishCntDict.Clear();
+                for (int j = 0; j < info.TreasuerInfoList[i].WishCnt; j++)
+                {
+                    int num = info.TreasuerInfoList[i].WishList[j].WishID;
+                    int cnt = info.TreasuerInfoList[i].WishList[j].OutCnt;
+                    typeInfo.wishCntDict[num] = cnt;
+                }
+
                 xbTypeInfoDict.Add(info.TreasuerInfoList[i].TreasureType, typeInfo);
             }
             else
@@ -230,6 +242,14 @@
                     int num = info.TreasuerInfoList[i].GridLimitCntList[j].GridNum;
                     int cnt = info.TreasuerInfoList[i].GridLimitCntList[j].GridCnt;
                     xbTypeInfoDict[info.TreasuerInfoList[i].TreasureType].gridLimitCntDict[num] = cnt;
+                }
+                
+                xbTypeInfoDict[info.TreasuerInfoList[i].TreasureType].wishCntDict.Clear();
+                for (int j = 0; j < info.TreasuerInfoList[i].WishCnt; j++)
+                {
+                    int num = info.TreasuerInfoList[i].WishList[j].WishID;
+                    int cnt = info.TreasuerInfoList[i].WishList[j].OutCnt;
+                    xbTypeInfoDict[info.TreasuerInfoList[i].TreasureType].wishCntDict[num] = cnt;
                 }
             }
         }
@@ -597,6 +617,8 @@
         if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Hero))
             return;
 
+        UpdateWishRedpoint();
+
         // 鍏嶈垂 10杩� 绉垎
         bestXB10Red.state = RedPointState.None;
         bestXBFreeRed.state = RedPointState.None;
@@ -648,6 +670,7 @@
     public int treasureCountToday;        //浠婃棩宸插瀹濇�绘鏁�
     public int treasureCntAward;        //绱瀵诲疂娆℃暟瀵瑰簲濂栧姳棰嗗鐘舵�侊紝鎸夊鍔辫褰曠储寮曚簩杩涘埗璁板綍鏄惁宸查鍙�
     public Dictionary<int, int> gridLimitCntDict;        //<鏈夐檺鍒舵娊鍙栨鏁扮殑鏍煎瓙缂栧彿,宸叉娊鍒版鏁�> 鏈夐檺鍒舵娊鍙栨鏁扮殑鏍煎瓙娆℃暟淇℃伅
+    public Dictionary<int, int> wishCntDict;        //蹇冩効鎶藉彇鎯呭喌 <蹇冩効ID,宸叉娊鍒版鏁�>
 }
 
 

--
Gitblit v1.8.0