From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Store/StoreModel.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Main/System/Store/StoreModel.cs b/Main/System/Store/StoreModel.cs
index 027a8b5..5cee567 100644
--- a/Main/System/Store/StoreModel.cs
+++ b/Main/System/Store/StoreModel.cs
@@ -1,7 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
-
+using Cysharp.Threading.Tasks;
using UnityEngine;
using LitJson;
using System.Collections;
@@ -41,7 +41,7 @@
public Dictionary<int, List<int>> freeShopDict = new Dictionary<int, List<int>>(); //鍏嶈垂鍟嗗搧 鍟嗗簵绫诲瀷锛氬晢鍝佸垪琛�
public Dictionary<int, int> shopMoneyTypeDict = new Dictionary<int, int>();
- public const int skinStoreType = 16;
+
public override void Init()
{
@@ -583,6 +583,30 @@
}
return true;
}
+
+ // 寮瑰嚭璐拱妗嗭紝涓嶈冻鍒欐彁绀哄凡鍞絼
+ public void ShowBuyItem(int shopID, int tipType = 0)
+ {
+ var cfg = StoreConfig.Get(shopID);
+ if (!TryGetIsSellOut(cfg, out var cnt))
+ {
+ buyShopID = shopID;
+ UIManager.Instance.OpenWindowAsync<BuyItemWin>().Forget();
+ }
+ else
+ {
+ if (tipType == 0)
+ {
+ //鍞絼
+ SysNotifyMgr.Instance.ShowTip("StoreTip1");
+ }
+ else if (tipType == 1)
+ {
+ //鐗╁搧涓嶈冻鎻愮ず
+ SysNotifyMgr.Instance.ShowTip("ItemNotEnough", ItemConfig.Get(cfg.ItemID).ItemName);
+ }
+ }
+ }
}
public enum StoreFunc
@@ -597,6 +621,11 @@
DailySpecialsFree = 8, //8: 姣忔棩鐗规儬-姣忔棩鐗规儬鍏嶈垂
DailyGiftFree = 9, //9: 姣忔棩鐗规儬-姣忔棩绀煎寘鍏嶈垂
WeeklyGiftFree = 10, //10: 姣忔棩鐗规儬-姣忓懆绀煎寘鍏嶈垂
+ HeroSkin = 16, //16: 鏃惰鍟嗗簵
+ OSBeautyMM = 17, //17: 绾㈤鍐叉绀煎寘
+ OSHeroTrain = 18, //18: 姝﹀皢鍐叉绀煎寘
+ OSMingge = 19, //19: 鍛芥牸鍐叉绀煎寘
+ Qunying = 20, //20: 缇よ嫳绉垎鍟嗗簵
}
--
Gitblit v1.8.0