Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

lua/app/module/battle/controller/battle_controller.lua

@@ -938,21 +938,21 @@ end
 
 function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap)
     local elementTypeCount = 0
-    local assistingList = nil
+    -- local assistingList = nil
     ---- 援助
     for element, count in pairs(elementTypeMap) do
-        if element == elementType then
+        -- if element == elementType then
-            elementTypeCount = count
+            elementTypeCount = elementTypeCount + count
-        else
+        -- else
-            if assistingList == nil then
+        --     if assistingList == nil then
-                assistingList = {}
+        --         assistingList = {}
-            end
+        --     end
-            local obj = {
+        --     local obj = {
-                count = count,
+        --         count = count,
-                skillMatch = element,
+        --         skillMatch = element,
-            }
+        --     }
-            table.insert(assistingList, obj)
+        --     table.insert(assistingList, obj)
-        end
+        -- end
     end
 
     ---- 技能
@@ -990,12 +990,12 @@ function BattleController:generateInstructions(skillEntity, elementType, lineCou
         end
     end
 
-    if assistingList then
+    -- if assistingList then
-        table.insert(self.instructions, {
+    --     table.insert(self.instructions, {
-            name = BattleConst.INSTRUCTION_NAME.ASSISTING,
+    --         name = BattleConst.INSTRUCTION_NAME.ASSISTING,
-            assistingList = assistingList,
+    --         assistingList = assistingList,
-        })
+    --     })
-    end
+    -- end
 
     ---- 加buff
     if skillEntity then

lua/app/server/data/server_base_data.lua

@@ -32,7 +32,7 @@ function ServerBaseData:loadLocalData()
 end
 
 function ServerBaseData:saveLocalData()
-	local str = json.encode(GFunc.getTable(self.data)) or ""
+	local str = json.encode(self.data) or ""
 	LocalData:setString(self:_getLocalSaveKey(), str)
 	if EDITOR_MODE then
 		Logger.logHighlight("save data:%s=%s", self:_getLocalSaveKey(), str)

lua/app/server/data/server_item_data.lua

@@ -116,7 +116,6 @@ function ServerItemData:recoveryItem(data, maxCount)
 		addCount = maxCount - currentCount
 	end
 	self:_addItem(data.cfg_id, addCount)
-	ServerDataManager:saveData()
 end
 
 function ServerItemData:resetVitRecoverTime()

lua/app/server/server_game_data.lua

@@ -82,7 +82,6 @@ function ServerGameData:initData()
 			end
 		end
 		self:setNotNewPlayer()
-		self:saveData()
 	else
 		for k, v in pairs(self.dataMap) do
 			v:loadLocalData()