From d0e6824f9b5265a7bfc8dee2d1d48ac8f3600eb9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 15 Sep 2022 16:20:47 +0800
Subject: [PATCH] 1

---
 doc/Battle.py                             | 4 ++++
 webapp/controller/BagController.class.php | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/Battle.py b/doc/Battle.py
index 892fd43f..18b4adb7 100644
--- a/doc/Battle.py
+++ b/doc/Battle.py
@@ -30,6 +30,7 @@ class Battle(object):
                     _common.ReqHead(),
                     ['battle_uniid', '', 'battle_uuid'],
                     ['match_mode', 0, '0: 匹配赛模式 1: 排位赛 3: pve'],
+                    ['pve_instance_id', 0, 'pve副本id'],
                     ['is_valid_battle', 0, 'is_valid_battle'],
                     ['payload', '', 'payload'],
                     ['map_id', 0, '地图id'],
@@ -64,6 +65,9 @@ class Battle(object):
                     ['weapons_slot', '', '武器信息 weapon_id:use_times|'],
                     ['heros', '', '武器信息 hero_id:skill_lv:weapon_lv|'],
 
+                    ['pve_rank_score', 0, 'pve积分'],
+                    ['pve_kill_boss', 0, 'pve boss是否被击杀'],
+
                     ['rank_score', 0, '排位积分'],
                     #['pass_score', 0, '通行证积分'],
                     ['items', 0, '道具id:道具数量|'],
diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php
index 7e8cb632..f6533871 100644
--- a/webapp/controller/BagController.class.php
+++ b/webapp/controller/BagController.class.php
@@ -252,10 +252,12 @@ class BagController extends BaseAuthedController {
             return;
         }
         $items = array(
-            'item_id' => itemId,
-            'item_num' => 1
+            array(
+                'item_id' => $itemId,
+                'item_num' => 1
+            )
         );
-        $this->_addItems($items, $this->awardService, $this->propertyService);
+        $this->_addItems($items, $this->awardService, $this->propertyChgService);
         $this->propertyChgService->addBagChg();
         $this->_rspData(array(
             'award' => $this->awardService->toDto(),