From 59cfdf4a5b3498c602389df6686075a48df9fed0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 五月 2021 11:40:13 +0800
Subject: [PATCH] 8921 【主干】【BT2】【后端】H.活动-节日活动-垃圾分类（环保抽奖独立活动封包修改）
---
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem | 0
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult | 0
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.h | 30 +++++++++++++++
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.des | 1
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.des | 1
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.h | 4 +-
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.des | 1
ServerPack/MapServerPack/HAA_SaleActivity/ActGarbageSortingInfo.h | 18 --------
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.h | 12 ++++++
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.h | 7 +++
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery | 0
/dev/null | 20 ----------
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh | 0
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.h | 8 ++++
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.des | 1
ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo | 0
ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.des | 1
17 files changed, 65 insertions(+), 39 deletions(-)
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.des b/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.des
deleted file mode 100644
index 41d04e3..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 16 垃圾分类活动选择大奖 #tagCMActGarbageChooseSuperItem
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.des b/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.des
deleted file mode 100644
index 490d1cf..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 17 垃圾分类活动抽奖 #tagCMActGarbageLottery
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.h b/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.h
deleted file mode 100644
index 8e61b30..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// AA 17 垃圾分类活动抽奖 #tagCMActGarbageLottery
-
-struct tagCMActGarbageLottery
-{
- tagHead Head;
- BYTE ActNum; //活动编号
- BYTE PosNum; //玩家点击的奖励位置编号，从1开始
-};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh
similarity index 100%
rename from ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh
rename to ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.des b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.des
new file mode 100644
index 0000000..f0cf063
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.des
@@ -0,0 +1 @@
+AA 18 仙匣秘境活动奖池刷新 #tagCMActXianXiaMJAwardPoolRefresh
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.h b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.h
new file mode 100644
index 0000000..e3fe52a
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJAwardPoolRefresh.h
@@ -0,0 +1,7 @@
+// AA 18 仙匣秘境活动奖池刷新 #tagCMActXianXiaMJAwardPoolRefresh
+
+struct tagCMActXianXiaMJAwardPoolRefresh
+{
+ tagHead Head;
+ BYTE ActNum; //活动编号
+};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery
similarity index 100%
rename from ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageLottery
rename to ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.des b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.des
new file mode 100644
index 0000000..8bd3c08
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.des
@@ -0,0 +1 @@
+AA 17 仙匣秘境活动抽奖 #tagCMActXianXiaMJLottery
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.h b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.h
new file mode 100644
index 0000000..a37b8fe
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJLottery.h
@@ -0,0 +1,8 @@
+// AA 17 仙匣秘境活动抽奖 #tagCMActXianXiaMJLottery
+
+struct tagCMActXianXiaMJLottery
+{
+ tagHead Head;
+ BYTE ActNum; //活动编号
+ BYTE PosNum; //玩家点击的奖励位置编号，从1开始
+};
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem
similarity index 100%
rename from ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem
rename to ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.des b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.des
new file mode 100644
index 0000000..308b163
--- /dev/null
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.des
@@ -0,0 +1 @@
+AA 16 仙匣秘境活动选择大奖 #tagCMActXianXiaMJSuperItem
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.h b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.h
similarity index 67%
rename from ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.h
rename to ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.h
index 3f3d55d..04d895d 100644
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/ActGarbageChooseSuperItem.h
+++ b/ClientPack/ClientToMapServer/CAA SaleActivity/ActXianXiaMJSuperItem.h
@@ -1,6 +1,6 @@
-// AA 16 垃圾分类活动选择大奖 #tagCMActGarbageChooseSuperItem
+// AA 16 仙匣秘境活动选择大奖 #tagCMActXianXiaMJSuperItem
-struct tagCMActGarbageChooseSuperItem
+struct tagCMActXianXiaMJSuperItem
{
tagHead Head;
BYTE ActNum; //活动编号
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.des b/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.des
deleted file mode 100644
index 8280cc8..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 18 垃圾分类活动奖池刷新 #tagCMGarbageAwardPoolRefresh
diff --git a/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.h b/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.h
deleted file mode 100644
index 5e83f3d..0000000
--- a/ClientPack/ClientToMapServer/CAA SaleActivity/GarbageAwardPoolRefresh.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// AA 18 垃圾分类活动奖池刷新 #tagCMGarbageAwardPoolRefresh
-
-struct tagCMGarbageAwardPoolRefresh
-{
- tagHead Head;
- BYTE ActNum; //活动编号
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.des b/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.des
deleted file mode 100644
index f0213d6..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.des
+++ /dev/null
@@ -1 +0,0 @@
-AA 57 垃圾收集活动玩家信息 #tagMCActGarbagePlayerInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.h
deleted file mode 100644
index 0f6bbd7..0000000
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// AA 57 垃圾收集活动玩家信息 #tagMCActGarbagePlayerInfo
-
-struct tagMCActGarbageAwardItemResult
-{
- BYTE ItemLibType; //物品库类型；9-固定为大奖库，非9-策划自定义库
- DWORD ItemID; // 注意： 不同库物品ID可能相同，但个数不同
- WORD ItemCount;
- BYTE PosNum; // 被抽中时的位置编号，1~99，前端自定义展示位置编号，0代表未被抽中；
- BYTE TotalTimesNow; //当前已产出次数，不限制次数时不记录，即同样为0
-};
-
-struct tagMCActGarbagePlayerInfo
-{
- tagHead Head;
- BYTE ActNum; //活动编号
- BYTE GuideTaskFinish; //引导任务是否已完成，有需要NPC对话引导任务时，则需要先完成才显示活动界面
- DWORD EnvironmentValue; //当前可用环保值
- DWORD EnvironmentValueHis; //历史环保值
- tagMCActGarbageAwardItemResult AwardItemResult; //本次抽奖结果物品信息，可能为空
-};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbageSortingInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbageSortingInfo.h
index edd5ee6..64205f9 100644
--- a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbageSortingInfo.h
+++ b/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbageSortingInfo.h
@@ -1,16 +1,5 @@
// AA 55 垃圾收集活动信息 #tagMCActGarbageSortingInfo
-struct tagMCActGarbageAwardItem
-{
- BYTE ItemLibType; //物品库类型；9-固定为大奖库，非9-策划自定义库
- DWORD ItemID; // 注意： 不同库物品ID可能相同，但个数不同
- WORD ItemCount;
- BYTE PosNum; // 被抽中时的位置编号，1~99，前端自定义展示位置编号，0代表未被抽中；
- BYTE TotalTimesNow; //当前已产出次数，不限制次数时不记录，即同样为0
- BYTE TotalTimesMax; //最大可产出次数，0不限
- BYTE LayerLimit; //大于等于X层后可产出，0不限
-};
-
struct tagMCActGarbageSortingInfo
{
tagHead Head;
@@ -18,10 +7,5 @@
char StartDate[10]; // 开始日期 y-m-d
char EndtDate[10]; // 结束日期 y-m-d
WORD LimitLV; // 限制等级
- BYTE LayerNum; //当前奖池第几层
- BYTE AwardItemCount;
- tagMCActGarbageAwardItem AwardItemList[AwardItemCount]; // 奖池物品列表，已生成的，包含已选择的大奖物品
- BYTE SuperItemCount;
- tagMCActGarbageAwardItem SuperItemList[SuperItemCount]; // 大奖物品待选择库，由玩家从库中选择放入奖池的物品；
- BYTE SuperItemCanChooseCount; // 大奖物品可选择个数
+ BYTE ResetType; // 重置类型，0-0点重置；1-5点开，5点重置；2-5点开，0点重置
};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult
similarity index 100%
copy from ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo
copy to ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.des b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.des
new file mode 100644
index 0000000..8127292
--- /dev/null
+++ b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.des
@@ -0,0 +1 @@
+AA 59 仙匣秘境抽奖结果 #tagMCActXianXiaMJAwardItemResult
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.h b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.h
new file mode 100644
index 0000000..4b1b15e
--- /dev/null
+++ b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJAwardItemResult.h
@@ -0,0 +1,12 @@
+// AA 59 仙匣秘境抽奖结果 #tagMCActXianXiaMJAwardItemResult
+
+struct tagMCActXianXiaMJAwardItemResult
+{
+ tagHead Head;
+ BYTE ActNum; // 活动编号
+ BYTE ItemLibType; //物品库类型；9-固定为大奖库，非9-策划自定义库
+ DWORD ItemID; // 注意： 不同库物品ID可能相同，但个数不同
+ WORD ItemCount;
+ BYTE PosNum; // 被抽中时的位置编号，1~99，前端自定义展示位置编号，0代表未被抽中；
+ BYTE TotalTimesNow; //当前已产出次数，不限制次数时不记录，即同样为0
+};
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo
similarity index 100%
rename from ServerPack/MapServerPack/HAA_SaleActivity/ActGarbagePlayerInfo
rename to ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.des b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.des
new file mode 100644
index 0000000..358b904
--- /dev/null
+++ b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.des
@@ -0,0 +1 @@
+AA 58 仙匣秘境活动信息 #tagMCActXianXiaMJInfo
diff --git a/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.h b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.h
new file mode 100644
index 0000000..c119d12
--- /dev/null
+++ b/ServerPack/MapServerPack/HAA_SaleActivity/ActXianXiaMJInfo.h
@@ -0,0 +1,30 @@
+// AA 58 仙匣秘境活动信息 #tagMCActXianXiaMJInfo
+
+struct tagMCActXianXiaMJAwardItem
+{
+ BYTE ItemLibType; //物品库类型；9-固定为大奖库，非9-策划自定义库
+ DWORD ItemID; // 注意： 不同库物品ID可能相同，但个数不同
+ WORD ItemCount;
+ BYTE PosNum; // 被抽中时的位置编号，1~99，前端自定义展示位置编号，0代表未被抽中；
+ BYTE TotalTimesNow; //当前已产出次数，不限制次数时不记录，即同样为0
+ BYTE TotalTimesMax; //最大可产出次数，0不限
+ BYTE LayerLimit; //大于等于X层后可产出，0不限
+};
+
+struct tagMCActXianXiaMJInfo
+{
+ tagHead Head;
+ BYTE ActNum; // 活动编号
+ char StartDate[10]; // 开始日期 y-m-d
+ char EndtDate[10]; // 结束日期 y-m-d
+ WORD LimitLV; // 限制等级
+ BYTE ResetType; // 重置类型，0-0点重置；1-5点开，5点重置；2-5点开，0点重置
+ BYTE MoneyType; //消耗货币类型
+ WORD MoneyValue; //消耗货币值
+ BYTE LayerNum; //当前奖池第几层
+ BYTE AwardItemCount;
+ tagMCActXianXiaMJAwardItem AwardItemList[AwardItemCount]; // 奖池物品列表，已生成的，包含已选择的大奖物品
+ BYTE SuperItemCount;
+ tagMCActXianXiaMJAwardItem SuperItemList[SuperItemCount]; // 大奖物品待选择库，由玩家从库中选择放入奖池的物品；
+ BYTE SuperItemCanChooseCount; // 大奖物品可选择个数
+};
--
Gitblit v1.8.0