Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

config/frienddb.mysql.cluster.php

@@ -6,6 +6,6 @@ return  array(
     'port' => 3306,
     'user' => 'root',
     'passwd' => 'keji178',
-    'dbname' => 'frienddb_dev_1'
+    'dbname' => 'frienddb_dev_new'
 );
 

doc/_common.py

@@ -1037,10 +1037,9 @@ class BattleItem(object):
     def __init__(self):
         self.fields = [
             ['item_id', 0, '道具id'],
-            ['item_num', 0, '道具数量'],
+            ['use_num', 0, '道具使用数量'],
         ]
 
-
 class BattleRankScore(object):
 
     def __init__(self):