From 1a97e8a3fd5856d165bde1833bd370ace853adb3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 5 Sep 2022 10:47:40 +0800
Subject: [PATCH] 1

---
 doc/Battle.py  | 51 ++++++++++++--------------------------------------
 doc/_common.py | 11 +++++++++++
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/doc/Battle.py b/doc/Battle.py
index d91ba146..2f3b1db4 100644
--- a/doc/Battle.py
+++ b/doc/Battle.py
@@ -24,48 +24,21 @@ class Battle(object):
         self.internalApis = [
             {
                 'desc': '服务器战报(客户端不用处理)battleReport',
-                'group': 'User',
+                'group': 'Battle',
                 'url': 'webapp/index.php?c=Battle&a=battleReport',
                 'params': [
                     _common.ReqHead(),
-                    ['battle_uniid', '', 'battle_uuid'],
-                    ['is_valid_battle', 0, 'is_valid_battle'],
-                    ['payload', '', 'payload'],
-                    ['map_id', 0, '地图id'],
-                    ['map_tpl_name', '', '地图模板名'],
-                    ['room_uuid', 0, '房间唯一id'],
-                    ['room_mode', 0, '房间模式 0:吃鸡模式 1:匹配赛模式'],
-                    ['hero_id', 0, '英雄id'],
-                    ['hero_uniid', 0, '英雄uniid'],
-                    ['hero_quality', 0, '英雄quality'],
-                    ['map_name', '', '地图名'],
-                    ['team_mode', 0, '队伍模式 0:单人 1：组队'],
-                    ['game_time', 0, '游戏时间'],
-                    ['alive_time', 0, '存活时间'],
-                    ['ranked', 0, '排名'],
-                    ['kills', 0, '击杀数'],
-                    ['damage_out', 0, '伤害输出'],
-                    ['weapon_uuid1', '', 'weapon_uuid1'],
-                    ['weapon_uuid2', '', 'weapon_uuid2'],
-                    ['rescue_teammate_times', 0, '救起队友次数'],
-                    ['diving_times', 0, '潜水次数'],
-                    ['damage_in', 0, '伤害输入'],
-                    ['recover_hp', 0, '治疗量'],
-                    ['open_airdrop_times', 0, '开启空投补给次数'],
-                    ['use_medicine_times', 0, '使用药物次数'],
-                    ['destory_car_times', 0, '破坏载具次数'],
-                    ['use_camouflage_times', 0, '使用伪装物'],
-                    ['use_skill_times', 0, '使用技能次数'],
-                    ['ride_car_move_distance', 0, '驾驶或乘坐载具累计移动X米'],
-                    ['ride_car_kills', 0, '驾驶或乘坐载具累计击杀X个敌人'],
-                    ['max_hero_skill_lv', 0, '单局内英雄技能升级到X级'],
-                    ['weapons_type', '', '武器信息 weapon_id:kills:damage_out:obtain_count|'],
-                    ['weapons_slot', '', '武器信息 weapon_id:use_times|'],
-                    ['heros', '', '武器信息 hero_id:skill_lv:weapon_lv|'],
-
-                    ['rank_score', 0, '排位积分'],
-                    #['pass_score', 0, '通行证积分'],
-                    ['items', 0, '道具id:道具数量|'],
+                ],
+                'response': [
+                    _common.RspHead(),
+                ]
+            },
+            {
+                'desc': '获取战斗数据(客户端不用处理)getBattleData',
+                'group': 'Battle',
+                'url': 'webapp/index.php?c=Battle&a=getBattleData',
+                'params': [
+                    _common.ReqHead(),
                 ],
                 'response': [
                     _common.RspHead(),
diff --git a/doc/_common.py b/doc/_common.py
index 7952e42f..62ddeb0c 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -709,3 +709,14 @@ class  ChipPro(object):
             ['!rand_attr_after', [ChipAttr()], '芯片升级后的属性'],
             ['upgrade_cost', '', '芯片升级所需价值'],
         ]
+
+class  BattleMember(object):
+
+    def __init__(self):
+        self.fields = [
+            ['account_id', '', '账号id'],
+            ['session_id', '', '会话id'],
+            ['hero_uniid', '', '英雄唯一id'],
+            ['weapon_uniid1', '', '武器1唯一id'],
+            ['weapon_uniid2', '', '武器2唯一id'],
+        ]