From 70fb8daef2d19b683e083948909aba549a75c8ac Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 21 十月 2025 19:02:56 +0800
Subject: [PATCH] 297 【常规】坊市系统-服务端(坊市、公会、将魂)

---
 /dev/null                                   |   16 --------
 ClientPack/CA2_Interaction/RefreshShop.h    |    7 +++
 ClientPack/CA3_Item/BuyItem.des             |    2 
 ClientPack/CA3_Item/BuyItem.h               |    8 ++--
 ServerPack/HA8_Item/ShopRefreshItemInfo     |    0 
 ServerPack/HA8_Item/ShopItemBuyCnt.h        |   15 +++++++
 ServerPack/HA8_Item/ShopRefreshItemInfo.des |    1 
 ServerPack/HA8_Item/ShopRefreshItemInfo.h   |   10 +++++
 ClientPack/CA2_Interaction/RefreshShop.des  |    1 
 ServerPack/HA8_Item/ShopItemBuyCnt.des      |    1 
 ClientPack/CA2_Interaction/RefreshShop      |    0 
 ServerPack/HA8_Item/ShopItemBuyCnt          |    0 
 12 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/ClientPack/CA2_Interaction/QueryNPCShopItem b/ClientPack/CA2_Interaction/QueryNPCShopItem
deleted file mode 100644
index e69de29..0000000
--- a/ClientPack/CA2_Interaction/QueryNPCShopItem
+++ /dev/null
diff --git a/ClientPack/CA2_Interaction/QueryNPCShopItem.des b/ClientPack/CA2_Interaction/QueryNPCShopItem.des
deleted file mode 100644
index 5cc932c..0000000
--- a/ClientPack/CA2_Interaction/QueryNPCShopItem.des
+++ /dev/null
@@ -1 +0,0 @@
-A2 01 请求npc商店物品信息 #tagCMQueryNPCShopItem
diff --git a/ClientPack/CA2_Interaction/QueryNPCShopItem.h b/ClientPack/CA2_Interaction/QueryNPCShopItem.h
deleted file mode 100644
index 2207310..0000000
--- a/ClientPack/CA2_Interaction/QueryNPCShopItem.h
+++ /dev/null
@@ -1,7 +0,0 @@
-//A2 01 请求npc商店物品信息 #tagCMQueryNPCShopItem
-
-struct	tagCMQueryNPCShopItem
-{
-	tagHead		Head;
-	DWORD		NPCShopID;		//商店npcid
-};
diff --git a/ClientPack/CA2_Interaction/RefreshMysticalShop.des b/ClientPack/CA2_Interaction/RefreshMysticalShop.des
deleted file mode 100644
index b81b089..0000000
--- a/ClientPack/CA2_Interaction/RefreshMysticalShop.des
+++ /dev/null
@@ -1 +0,0 @@
-A2 32 神秘商店刷新 #tagCMRefreshMysticalShop
diff --git a/ClientPack/CA2_Interaction/RefreshMysticalShop.h b/ClientPack/CA2_Interaction/RefreshMysticalShop.h
deleted file mode 100644
index 67f81fa..0000000
--- a/ClientPack/CA2_Interaction/RefreshMysticalShop.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// A2 32 神秘商店刷新 #tagCMRefreshMysticalShop
-struct	tagCMRefreshMysticalShop
-{
-	tagHead		Head;
-};
diff --git a/ClientPack/CA2_Interaction/RefreshMysticalShop b/ClientPack/CA2_Interaction/RefreshShop
similarity index 100%
rename from ClientPack/CA2_Interaction/RefreshMysticalShop
rename to ClientPack/CA2_Interaction/RefreshShop
diff --git a/ClientPack/CA2_Interaction/RefreshShop.des b/ClientPack/CA2_Interaction/RefreshShop.des
new file mode 100644
index 0000000..cf73b52
--- /dev/null
+++ b/ClientPack/CA2_Interaction/RefreshShop.des
@@ -0,0 +1 @@
+A2 32 刷新商店 #tagCSRefreshShop
diff --git a/ClientPack/CA2_Interaction/RefreshShop.h b/ClientPack/CA2_Interaction/RefreshShop.h
new file mode 100644
index 0000000..0d3451d
--- /dev/null
+++ b/ClientPack/CA2_Interaction/RefreshShop.h
@@ -0,0 +1,7 @@
+// A2 32 刷新商店 #tagCSRefreshShop
+
+struct	tagCSRefreshShop
+{
+	tagHead		Head;
+	WORD		ShopType;
+};
diff --git a/ClientPack/CA3_Item/BuyItem.des b/ClientPack/CA3_Item/BuyItem.des
index 87ba660..60dade4 100644
--- a/ClientPack/CA3_Item/BuyItem.des
+++ b/ClientPack/CA3_Item/BuyItem.des
@@ -1 +1 @@
-A3 10 购买商城物品 #tagCMBuyItem
+A3 10 购买商城物品 #tagCSBuyItem
diff --git a/ClientPack/CA3_Item/BuyItem.h b/ClientPack/CA3_Item/BuyItem.h
index 263e314..5837f72 100644
--- a/ClientPack/CA3_Item/BuyItem.h
+++ b/ClientPack/CA3_Item/BuyItem.h
@@ -1,8 +1,8 @@
-// A3 10 购买商城物品 #tagCMBuyItem
+// A3 10 购买商城物品 #tagCSBuyItem
 
-struct	tagCMBuyItem
+struct	tagCSBuyItem
 {
 	tagHead		Head;
-	WORD		BuyItemIndex;		//购买的物品索引
-	DWORD		BuyCount;		//购买数量
+	DWORD		ShopID;		//商品ID
+	DWORD		BuyCount;	//购买数量
 };
diff --git a/ServerPack/HA8_Item/MCShoppingResult b/ServerPack/HA8_Item/MCShoppingResult
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA8_Item/MCShoppingResult
+++ /dev/null
diff --git a/ServerPack/HA8_Item/MCShoppingResult.des b/ServerPack/HA8_Item/MCShoppingResult.des
deleted file mode 100644
index dee4b6d..0000000
--- a/ServerPack/HA8_Item/MCShoppingResult.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 11 商店购买结果 #tagMCShoppingResult
diff --git a/ServerPack/HA8_Item/MCShoppingResult.h b/ServerPack/HA8_Item/MCShoppingResult.h
deleted file mode 100644
index c6238bc..0000000
--- a/ServerPack/HA8_Item/MCShoppingResult.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// A8 11 商店购买结果 #tagMCShoppingResult
-
-struct	tagMCShoppingResult
-{
-	tagHead		Head;
-	DWORD		ItemIndex;
-	DWORD		ItemCnt;		//购买数量
-};
diff --git a/ServerPack/HA8_Item/MysticalShopInfo.des b/ServerPack/HA8_Item/MysticalShopInfo.des
deleted file mode 100644
index 9717d15..0000000
--- a/ServerPack/HA8_Item/MysticalShopInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 16 神秘商店商品信息 #tagMCMysticalShopInfo
diff --git a/ServerPack/HA8_Item/MysticalShopInfo.h b/ServerPack/HA8_Item/MysticalShopInfo.h
deleted file mode 100644
index b7752f3..0000000
--- a/ServerPack/HA8_Item/MysticalShopInfo.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// A8 16 神秘商店商品信息 #tagMCMysticalShopInfo
-struct    tagMCMysticalShopGoods
-{
-	DWORD		GoodsID;	// 商品ID
-};
-
-struct    tagMCMysticalShopInfo
-{
-	tagHead		Head;
-	WORD		RefreshCnt;	// 刷新次数
-	BYTE		Count;	// 商品数
-	tagMCMysticalShopGoods		GoodsList[Count];	// 商品信息
-};
diff --git a/ServerPack/HA8_Item/MysticalShopTimeInfo b/ServerPack/HA8_Item/MysticalShopTimeInfo
deleted file mode 100644
index e69de29..0000000
--- a/ServerPack/HA8_Item/MysticalShopTimeInfo
+++ /dev/null
diff --git a/ServerPack/HA8_Item/MysticalShopTimeInfo.des b/ServerPack/HA8_Item/MysticalShopTimeInfo.des
deleted file mode 100644
index 3384de4..0000000
--- a/ServerPack/HA8_Item/MysticalShopTimeInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 06 通知神秘限购商品时间 #tagMCMysticalShopTimeInfo
diff --git a/ServerPack/HA8_Item/MysticalShopTimeInfo.h b/ServerPack/HA8_Item/MysticalShopTimeInfo.h
deleted file mode 100644
index 76cc089..0000000
--- a/ServerPack/HA8_Item/MysticalShopTimeInfo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// A8 06 通知神秘限购商品时间 #tagMCMysticalShopTimeInfo
-
-struct    tagMCMysticalShopTime
-{
-	DWORD		GoodsID;	// 商品ID
-	DWORD		StartTime;	// 开卖时间
-};
-
-struct    tagMCMysticalShopTimeInfo
-{
-	tagHead		Head;
-	WORD		Count;	// 商品数
-	tagMCMysticalShopTime		ShopTimeList[Count];	// 商品开卖信息
-};
diff --git a/ServerPack/HA8_Item/ShopItemDayBuyCnt b/ServerPack/HA8_Item/ShopItemBuyCnt
similarity index 100%
rename from ServerPack/HA8_Item/ShopItemDayBuyCnt
rename to ServerPack/HA8_Item/ShopItemBuyCnt
diff --git a/ServerPack/HA8_Item/ShopItemBuyCnt.des b/ServerPack/HA8_Item/ShopItemBuyCnt.des
new file mode 100644
index 0000000..2188abe
--- /dev/null
+++ b/ServerPack/HA8_Item/ShopItemBuyCnt.des
@@ -0,0 +1 @@
+A8 02 商店物品已购买次数 #tagSCShopItemBuyCntInfo
diff --git a/ServerPack/HA8_Item/ShopItemBuyCnt.h b/ServerPack/HA8_Item/ShopItemBuyCnt.h
new file mode 100644
index 0000000..bec4352
--- /dev/null
+++ b/ServerPack/HA8_Item/ShopItemBuyCnt.h
@@ -0,0 +1,15 @@
+// A8 02 商店物品已购买次数 #tagSCShopItemBuyCntInfo
+
+struct    tagSCShopItemBuyCnt
+{
+	DWORD		ShopID;	// 商品ID
+	DWORD		BuyCnt;	// 已购买次数
+};
+
+struct    tagSCShopItemBuyCntInfo
+
+{
+	tagHead		Head;
+	WORD		Count;
+	tagSCShopItemBuyCnt	BuyCntList[Count];	//仅通知有限购次数的商品
+};
diff --git a/ServerPack/HA8_Item/ShopItemDayBuyCnt.des b/ServerPack/HA8_Item/ShopItemDayBuyCnt.des
deleted file mode 100644
index 20fddac..0000000
--- a/ServerPack/HA8_Item/ShopItemDayBuyCnt.des
+++ /dev/null
@@ -1 +0,0 @@
-A8 02 通知NPC商店物品今日已购买次数 #tagMCShopItemDayBuyCntInfo
diff --git a/ServerPack/HA8_Item/ShopItemDayBuyCnt.h b/ServerPack/HA8_Item/ShopItemDayBuyCnt.h
deleted file mode 100644
index 12fbbdc..0000000
--- a/ServerPack/HA8_Item/ShopItemDayBuyCnt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// A8 02 通知NPC商店物品今日已购买次数 #tagMCShopItemDayBuyCntInfo
-
-struct    tagMCShopItemDayBuyCnt
-{
-	DWORD		ItemIndex;
-	DWORD		BuyCnt; // 今日已购买次数
-	BYTE		IsReset; //是否重置
-};
-
-struct    tagMCShopItemDayBuyCntInfo
-
-{
-	tagHead		Head;
-	WORD		Count; //通知个数,注意不限制每日购买次数的默认不通知
-	tagMCShopItemDayBuyCnt	DayBuyCntList[Count];
-};
diff --git a/ServerPack/HA8_Item/MysticalShopInfo b/ServerPack/HA8_Item/ShopRefreshItemInfo
similarity index 100%
rename from ServerPack/HA8_Item/MysticalShopInfo
rename to ServerPack/HA8_Item/ShopRefreshItemInfo
diff --git a/ServerPack/HA8_Item/ShopRefreshItemInfo.des b/ServerPack/HA8_Item/ShopRefreshItemInfo.des
new file mode 100644
index 0000000..d9f746f
--- /dev/null
+++ b/ServerPack/HA8_Item/ShopRefreshItemInfo.des
@@ -0,0 +1 @@
+A8 03 商店刷新解锁的商品信息 #tagSCShopRefreshItemInfo
diff --git a/ServerPack/HA8_Item/ShopRefreshItemInfo.h b/ServerPack/HA8_Item/ShopRefreshItemInfo.h
new file mode 100644
index 0000000..21a5615
--- /dev/null
+++ b/ServerPack/HA8_Item/ShopRefreshItemInfo.h
@@ -0,0 +1,10 @@
+// A8 03 商店刷新解锁的商品信息 #tagSCShopRefreshItemInfo
+
+struct	tagSCShopRefreshItemInfo
+{
+	tagHead		Head;
+	WORD		ShopType;	// 商店类型
+	BYTE		RefreshCnt;	// 今日已刷新次数
+	BYTE		Count;
+	DWORD		ShopIDList[Count];	// 对应刷新出来的商店表商品ID列表
+};

--
Gitblit v1.8.0