diff --git a/webapp/mt/BattlePotion.php b/webapp/mt/BattlePotion.php
new file mode 100644
index 00000000..fa07981b
--- /dev/null
+++ b/webapp/mt/BattlePotion.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace mt;
+
+
+class BattlePotion
+{
+    public static function find($id){
+        foreach (self::getMetaList() as $meta){
+            if ($meta['potionId'] == $id){
+                return $meta;
+            }
+        }
+        return array();
+    }
+
+
+
+    protected static function getMetaList()
+    {
+        if (!self::$metaList) {
+            self::$metaList = getMetaTable('battlePotion@battlePotion.php');
+        }
+        return self::$metaList;
+    }
+
+    protected static $metaList;
+
+}
\ No newline at end of file
diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 6bc405cc..884036f8 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -14,6 +14,8 @@ require_once('mt/RankSeason.php');
 require_once('mt/EconomyAttribute.php');
 require_once('mt/CircuitTime.php');
 require_once('mt/StakingVip.php');
+require_once('mt/BattlePotion.php');
+require_once('mt/Item.php');
 
 require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
@@ -184,6 +186,20 @@ class RoomBattleDataService extends BaseService {
         $teamRank = getXVal($this->teamData,'pvp_team_rank', 0);
         if ($mapModeMeta){
             $accountLucky = Hero::getAccountLuckyTemp();
+            $battleItems = getXVal($member,'battle_items', 0);
+            if (count($battleItems) > 0){
+                foreach ($battleItems as $item){
+                    $itemMeta = mt\Item::get($item['item_id']);
+                    if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == mt\Item::LUCKY_SYMBOL_SUBTYPE){
+                        $potionMeta = mt\BattlePotion::find($item['item_id']);
+                        if ($potionMeta){
+                            $effect = explode(':',$potionMeta['effect']);
+                            $accountLucky += $effect[1];
+                        }
+
+                    }
+                }
+            }
             $rewardMeta = mt\BattleReward::find($mapModeMeta['rewardMode'],$accountLucky);
             if (!$rewardMeta){
                 return ;
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index 61457faf..3db2682f 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -171,11 +171,11 @@ class TameBattleDataService extends BaseService {
         if (count($battleItems) > 0){
             foreach ($battleItems as $item){
                 $itemMeta = mt\Item::get($item['item_id']);
-                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == 8){
-                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_LUCKY_CHARM_COND,$item['item_num']);
+                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == mt\Item::LUCKY_SYMBOL_SUBTYPE){
+                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_LUCKY_CHARM_COND,$item['use_num']);
                 }
-                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == 9){
-                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_BATTLE_MIXTURES_COND,$item['item_num']);
+                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == mt\Item::BATTLE_POTION_SUBTYPE){
+                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_BATTLE_MIXTURES_COND,$item['use_num']);
                 }
             }
         }