From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Store/StoreModel.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Main/System/Store/StoreModel.cs b/Main/System/Store/StoreModel.cs
index 8310ac8..d0b8220 100644
--- a/Main/System/Store/StoreModel.cs
+++ b/Main/System/Store/StoreModel.cs
@@ -43,7 +43,6 @@
public override void Init()
{
- RedpointCenter.Instance.AddParent(MainRedDot.MainGuildRedpoint, MainRedDot.Store_REDPOINT);
FuncOpen.Instance.OnFuncStateChangeEvent += FuncStateChange;
TimeMgr.Instance.OnDayEvent += RefreshDay;
GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
@@ -281,6 +280,11 @@
for (int i = 0; i < netPack.ShopIDList.Length; i++)
{
var config = StoreConfig.Get((int)netPack.ShopIDList[i]);
+ if (config == null)
+ {
+ Debug.LogError("鍓嶅悗绔晢搴楁暟鎹笉涓�鑷�");
+ continue;
+ }
//UnlockType 2 鐢辨湇鍔＄閫氱煡
StoreData storeData = new StoreData();
storeData.shopId = config.ID;
@@ -450,6 +454,10 @@
{
if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store)) return;
+ if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Guild) && PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ RedpointCenter.Instance.AddParent(MainRedDot.MainGuildRedpoint, MainRedDot.Store_REDPOINT);
+ }
normalRedpoint.state = RedPointState.None;
guildRedpoint.state = RedPointState.None;
--
Gitblit v1.8.0