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

lua/app/module/battle/battle_const.lua

@@ -91,10 +91,10 @@ BattleConst.MATCH_WEAKNESS_NAME = {
 
 BattleConst.SPINE_ANIMATION_NAME = {
 	IDLE = "idle",
-    ATTACK = "atk1",
+    ATTACK = "attack01",
     MOVE = "move",
-    HIT = "hit",
-    DEAD = "die",
+    HIT = "suffer",
+    DEAD = "death",
 }
 
 BattleConst.EFFECT_TYPE = {

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

@@ -694,21 +694,22 @@ function BattleController:generateInstructions(skillEntity, elementType, influen
         end
     end
 
-    ---- 普攻
-    if elementTypeCount > 0 then
-        table.insert(self.instructions, {
-            name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
-            count = elementTypeCount,
-            skillMatch = elementType
-        })
-    end
-
     ---- 技能
     if skillEntity then
         table.insert(self.instructions, {
             name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
-            skillMatch = elementType
+            skillMatch = elementType,
+            count = elementTypeCount,
         })
+    else
+        ---- 普攻
+        if elementTypeCount > 0 then
+            table.insert(self.instructions, {
+                name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
+                skillMatch = elementType,
+                count = elementTypeCount,
+            })
+        end
     end
 end
 

lua/app/userdata/battle/skill/battle_skill_entity.lua

@@ -31,7 +31,7 @@ end
 
 function BattleSkillEntity:getRandomNormalAttackName()
 	if self.normalSkillNameList == nil then
-		self.normalSkillNameList = {"atk1", "atk2", "atk3"}
+		self.normalSkillNameList = {"attack01", "attack02", "attack03"}
 	end
 	if self.normalSkillNameIndex == nil then
 		self.normalSkillNameIndex = math.random(1, #self.normalSkillNameList)
@@ -46,7 +46,7 @@ end
 
 function BattleSkillEntity:getSkillAttackName()
 	-- return self.skillInfo.name_act
-	return "atk1"
+	return "attack01"
 end
 
 function BattleSkillEntity:getEffectList()