军团：许愿池活跃

game-server/app/servers/guild/handler/wishPoolHandler.ts

@@ -117,7 +117,7 @@ export class WishPoolHandler {
         }
         await WishPoolReportModel.addReport(code, wishRoleId, role.roleName , dntRoleId, dntRoleName, wishGood.goodId, 1);
         let goods = await addItems(dntRoleId, dntRoleName, sid, [getHonourObject(dicWishReward.honourReward)], ITEM_CHANGE_REASON.WISH_POOL_DONATE);
-        await addActive(dntRoleId, serverId, GUILD_POINT_WAYS.DONATE);
+        await addActive(dntRoleId, serverId, GUILD_POINT_WAYS.WISH_POOL);
 
         return resResult(STATUS.SUCCESS, { wishDntCnt, goods, updateWishGoods: resWishGoods.map(({type, goodId, count, receiveCnt, drawCnt, id})=>{
                 return { type, goodId, count, receiveCnt, drawCnt, id, roleId: wishRoleId };

shared/consts/constModules/guildConst.ts

@@ -230,10 +230,10 @@ export const GUILD_REPORT_NUM = 40;
 // 获得活跃值途径id
 export enum GUILD_POINT_WAYS {
     DONATE = 1,            // 捐赠
-    TRAIN = 2,             // 训练场
-    BOSS_WAR = 3,          // 演武台
-    ACTIVITY = 4,          // 军团活动 
-    WISH_POOL = 5,         // 许愿池 
+    WISH_POOL = 2,         // 许愿池 
+    TRAIN = 3,             // 训练场
+    BOSS_WAR = 4,          // 演武台
+    ACTIVITY = 5,          // 军团活动 
 }
 
 // 军团活动id

shared/resource/jsons/dic_army_activePointWays.json

@@ -5,38 +5,43 @@
         "cout": 10,
         "activePoint": "1&5|2&10|3&20",
         "icon": "juanxiansuo",
-        "structureId": 7
+        "structureId": 7,
+        "content": "捐献所捐献三种每次活跃+5/+10/+20"
     },
     {
         "id": 2,
-        "name": "练兵场",
-        "cout": 4,
-        "activePoint": "1&10",
-        "icon": "lianbingchang",
-        "structureId": 4
-    },
-    {
-        "id": 3,
-        "name": "演武台",
-        "cout": 1,
-        "activePoint": "1&15",
-        "icon": "yanwutai",
-        "structureId": 3
-    },
-    {
-        "id": 4,
-        "name": "军团活动",
-        "cout": 1,
-        "activePoint": "1&20",
-        "icon": "juntuanhuodong",
-        "structureId": 9
-    },
-    {
-        "id": 5,
         "name": "许愿池",
         "cout": 3,
         "activePoint": "1&5",
         "icon": "juanxiansuo",
-        "structureId": 5
+        "structureId": 5,
+        "content": "许愿池捐献活跃+5/次"
+    },
+    {
+        "id": 3,
+        "name": "练兵场",
+        "cout": 4,
+        "activePoint": "1&10",
+        "icon": "lianbingchang",
+        "structureId": 4,
+        "content": "挑战练兵场活跃+10/次"
+    },
+    {
+        "id": 4,
+        "name": "演武台",
+        "cout": 1,
+        "activePoint": "1&15",
+        "icon": "yanwutai",
+        "structureId": 3,
+        "content": "挑战演武台活跃+10/次"
+    },
+    {
+        "id": 5,
+        "name": "军团活动",
+        "cout": 1,
+        "activePoint": "1&20",
+        "icon": "juntuanhuodong",
+        "structureId": 9,
+        "content": "参与军团活动活跃+20/次"
     }
 ]