From 58feefe78ef4974deea7fa5fd8945d418cbc9cde Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 31 Jul 2024 16:38:57 +0800
Subject: [PATCH] 1

---
 doc/Recharge.py                               | 22 -------------------
 .../controller/RechargeController.class.php   | 21 ------------------
 webapp/services/RoomBattleDataService.php     |  3 ++-
 webapp/services/TameBattleDataService.php     |  1 +
 4 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 doc/Recharge.py
 delete mode 100644 webapp/controller/RechargeController.class.php

diff --git a/doc/Recharge.py b/doc/Recharge.py
deleted file mode 100644
index 106163c9..00000000
--- a/doc/Recharge.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import _common
-
-class Recharge(object):
-
-    def __init__(self):
-        self.apis = [
-            {
-                'name': 'goodsList',
-                'desc': '充值-商品列表',
-                'group': 'Recharge',
-                'url': 'webapp/index.php?c=Recharge&a=goodsList',
-                'params': [
-                    _common.ReqHead(),
-                ],
-                'response': [
-                    _common.RspHead(),
-                    ['!goods', [_common.RechargeGoods()], '商品列表']
-                ]
-            }
-        ]
diff --git a/webapp/controller/RechargeController.class.php b/webapp/controller/RechargeController.class.php
deleted file mode 100644
index 6434012b..00000000
--- a/webapp/controller/RechargeController.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require_once('mt/Recharge.php');
-
-class RechargeController extends BaseAuthedController {
-
-    public function goodsList()
-    {
-        $goods = array();
-        mt\Recharge::traverseMeta(function ($meta) use(&$goods) {
-            array_push($goods, array(
-                'goods_id' => $meta['id'],
-                'goods_meta' => $meta,
-            ));
-        });
-        myself()->_rspData(array(
-            'goods' => $goods
-        ));
-    }
-
-}
diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 50a32728..8fee71ea 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -260,8 +260,9 @@ class RoomBattleDataService extends BaseService {
             //宝箱掉落
             $chestLootProbArr = explode(";",$rewardMeta['chestLootProb']);
             $rate = isset($chestLootProbArr[$teamRank-1]) ? $chestLootProbArr[$teamRank-1] : 0;
+            //error_log(json_encode($member));
             if ($rate > 0 && !empty($member['box_num'])){
-                for ($i = 0; i < $member['box_num']; ++$i) {
+                for ($i = 0; $i < $member['box_num']; ++$i) {
                     $rand = $rate * 100;
                     $rnd = rand(1,100);
                     if ($rnd <= $rand){
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index 1209525f..27067e2a 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -720,6 +720,7 @@ class TameBattleDataService extends BaseService {
                 'pve_boss_killed'=> getXVal($info,'pve_boss_killed', 0),
                 'hero_lv'=> getXVal($info,'hero_lv', 1),
                 'dead_times'=> getXVal($info,'dead_times', 0),
+                'box_num'=> getXVal($info,'box_num', 0),
                 'battle_score'=> 0,
                 'reward' => $rewards,
                 'winningPro' => $winningPro,