1,技能伤害红色飘字优化

2，修复万箭齐发在兵营升级后会多次触发的bug

tower_sanguo/assets/MOKA/manager/SDKManager.ts

@@ -18,8 +18,6 @@ export default class SDKManager {
     static sendReport: boolean = false
 
     init() {
-        console.log("sdkManager.init", cc.sys.os, cc.sys.platform, cc.sys.isNative);
-
         if (cc.sys.isNative) {
             this.sdk = new AndroidSDK();
         }

tower_sanguo/assets/resources/data/resList.json

@@ -8,22 +8,22 @@
 		"type": "font"
 	},
 	{
-		"url": "font/font_skill",
+		"url": "font/font3",
 		"type": "font"
 	},
 	{
-		"url": "module/loading/loading",
-		"type": "prefab"
-	},
-	{
-		"url": "module/main/main",
-		"type": "prefab"
+		"url": "font/font_skill",
+		"type": "font"
 	},
 	{
 		"url": "music/Button_click",
 		"type": "mp3"
 	},
 	{
+		"url": "music/Sutra_PickUP",
+		"type": "wav"
+	},
+	{
 		"url": "music/turntable1",
 		"type": "mp3"
 	},
@@ -32,11 +32,27 @@
 		"type": "mp3"
 	},
 	{
+		"url": "music/Get_gold",
+		"type": "mp3"
+	},
+	{
+		"url": "data/barrack_data",
+		"type": "json"
+	},
+	{
+		"url": "music/turntable_2",
+		"type": "mp3"
+	},
+	{
 		"url": "data/1",
 		"type": "bin"
 	},
 	{
-		"url": "data/barrack_data",
+		"url": "data/fundes_data",
+		"type": "json"
+	},
+	{
+		"url": "data/db_data",
 		"type": "json"
 	},
 	{
@@ -44,7 +60,7 @@
 		"type": "json"
 	},
 	{
-		"url": "data/task_data",
+		"url": "data/fetter_data",
 		"type": "json"
 	},
 	{
@@ -52,15 +68,15 @@
 		"type": "json"
 	},
 	{
-		"url": "data/db_data",
+		"url": "data/help_data",
 		"type": "json"
 	},
 	{
-		"url": "data/fetter_data",
+		"url": "data/general_data",
 		"type": "json"
 	},
 	{
-		"url": "data/general_data",
+		"url": "data/invest_data",
 		"type": "json"
 	},
 	{
@@ -68,31 +84,31 @@
 		"type": "json"
 	},
 	{
-		"url": "data/help_data",
+		"url": "data/openfun_data",
 		"type": "json"
 	},
 	{
-		"url": "data/mission_data",
-		"type": "json"
+		"url": "music/Background_music1",
+		"type": "mp3"
 	},
 	{
-		"url": "data/monster_data",
+		"url": "data/resList",
 		"type": "json"
 	},
 	{
-		"url": "data/resList",
+		"url": "data/skill_data",
 		"type": "json"
 	},
 	{
-		"url": "data/serverConfig_data",
+		"url": "data/star_data",
 		"type": "json"
 	},
 	{
-		"url": "data/skill_data",
+		"url": "data/monster_data",
 		"type": "json"
 	},
 	{
-		"url": "data/star_data",
+		"url": "data/task_data",
 		"type": "json"
 	},
 	{
@@ -100,16 +116,20 @@
 		"type": "json"
 	},
 	{
-		"url": "music/Sutra_PickUP",
-		"type": "wav"
+		"url": "module/loading/loading",
+		"type": "prefab"
 	},
 	{
-		"url": "music/turntable_2",
-		"type": "mp3"
+		"url": "module/main/main",
+		"type": "prefab"
 	},
 	{
-		"url": "music/Background_music1",
-		"type": "mp3"
+		"url": "data/mission_data",
+		"type": "json"
+	},
+	{
+		"url": "data/serverConfig_data",
+		"type": "json"
 	},
 	{
 		"url": "module/fight/fight",
@@ -124,31 +144,23 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/main/texture/guan3",
-		"type": "texture"
-	},
-	{
-		"url": "module/main/texture/guan4",
-		"type": "texture"
-	},
-	{
 		"url": "module/main/texture/guan1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/prefab/attack_light",
+		"url": "module/fight/prefab/attack_flash",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_flash",
-		"type": "prefab"
+		"url": "module/main/texture/guan4",
+		"type": "texture"
 	},
 	{
-		"url": "module/fight/prefab/attack_skill",
+		"url": "module/fight/prefab/attack_normal",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/attack_normal",
+		"url": "module/fight/prefab/attack_skill",
 		"type": "prefab"
 	},
 	{
@@ -160,11 +172,11 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_boss",
+		"url": "module/fight/prefab/bar_jingyan_circle",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/bar_jingyan_circle",
+		"url": "module/fight/prefab/attack_light",
 		"type": "prefab"
 	},
 	{
@@ -172,6 +184,10 @@
 		"type": "prefab"
 	},
 	{
+		"url": "module/fight/prefab/bar_boss",
+		"type": "prefab"
+	},
+	{
 		"url": "module/fight/prefab/bar_monster",
 		"type": "prefab"
 	},
@@ -180,19 +196,23 @@
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/mission_start",
+		"url": "module/fight/prefab/general_game",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/node_skill",
+		"url": "module/fight/prefab/star_general",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/general_game",
+		"url": "module/main/texture/guan3",
+		"type": "texture"
+	},
+	{
+		"url": "module/fight/prefab/node_skill",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/star_general",
+		"url": "module/fight/prefab/mission_over",
 		"type": "prefab"
 	},
 	{
@@ -200,11 +220,11 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/prefab/monster",
+		"url": "module/fight/prefab/mission_start",
 		"type": "prefab"
 	},
 	{
-		"url": "module/fight/prefab/mission_over",
+		"url": "module/fight/prefab/monster",
 		"type": "prefab"
 	},
 	{
@@ -248,35 +268,35 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_2",
+		"url": "module/fight/texture/fight_5",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_3",
+		"url": "module/fight/texture/fight_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_4",
+		"url": "module/fight/texture/fight_3",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/fight_5",
+		"url": "module/fight/texture/qi_1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_1",
+		"url": "module/fight/texture/qi_2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_3",
+		"url": "module/fight/texture/qi_4",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_2",
+		"url": "module/fight/texture/fight_4",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/qi_4",
+		"url": "module/fight/texture/qi_3",
 		"type": "texture"
 	},
 	{
@@ -316,19 +336,19 @@
 		"type": "spine"
 	},
 	{
-		"url": "module/fight/texture/skill/buff2",
+		"url": "module/fight/texture/skill/buff1",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff1",
+		"url": "module/fight/texture/skill/buff2",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff3",
+		"url": "module/fight/texture/skill/buff4",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff4",
+		"url": "module/fight/texture/skill/buff3",
 		"type": "texture"
 	},
 	{
@@ -336,31 +356,31 @@
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/buff6",
+		"url": "module/fight/texture/skill/skill02",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill01",
+		"url": "module/fight/texture/skill/skill03",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill03",
+		"url": "module/fight/texture/skill/skill05",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill02",
+		"url": "module/fight/texture/skill/skill06",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill04",
+		"url": "module/fight/texture/skill/buff6",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill05",
+		"url": "module/fight/texture/skill/skill04",
 		"type": "texture"
 	},
 	{
-		"url": "module/fight/texture/skill/skill06",
+		"url": "module/fight/texture/skill/skill01",
 		"type": "texture"
 	}
 ]

tower_sanguo/assets/resources/font/font3.fnt

@@ -8,7 +8,7 @@ char id=54 x=62 y=2 width=18 height=22 xoffset=0 yoffset=0 xadvance=18
 char id=55 x=82 y=2 width=19 height=22 xoffset=0 yoffset=0 xadvance=19 
 char id=56 x=103 y=2 width=18 height=22 xoffset=0 yoffset=0 xadvance=18 
 char id=57 x=123 y=2 width=18 height=22 xoffset=0 yoffset=0 xadvance=18 
-char id=110 x=143 y=2 width=22 height=26 xoffset=0 yoffset=0 xadvance=22 
+char id=46 x=143 y=2 width=22 height=26 xoffset=0 yoffset=0 xadvance=22 
 char id=107 x=167 y=2 width=16 height=20 xoffset=0 yoffset=0 xadvance=16 
 char id=109 x=185 y=2 width=45 height=25 xoffset=0 yoffset=0 xadvance=45 
 char id=102 x=232 y=2 width=134 height=51 xoffset=0 yoffset=0 xadvance=134 

tower_sanguo/assets/resources/font/font3.fnt.meta

@@ -1,7 +1,7 @@
 {
   "ver": "2.1.0",
-  "uuid": "08f95e11-0fc9-4f8b-ac26-d112c3b1a438",
-  "textureUuid": "754c02ad-ff1e-414d-97cb-266e59b9f536",
+  "uuid": "991d23a0-0568-47f3-9a91-f14b37b27208",
+  "textureUuid": "18deb346-3f7a-4725-a2bb-76fd6115cd4b",
   "fontSize": 51,
   "subMetas": {}
 }

tower_sanguo/assets/resources/font/font3.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.4",
-  "uuid": "754c02ad-ff1e-414d-97cb-266e59b9f536",
+  "uuid": "18deb346-3f7a-4725-a2bb-76fd6115cd4b",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -13,8 +13,8 @@
   "subMetas": {
     "font3": {
       "ver": "1.0.4",
-      "uuid": "44ed2c58-da23-46fa-9d20-4e9cb0f333e1",
-      "rawTextureUuid": "754c02ad-ff1e-414d-97cb-266e59b9f536",
+      "uuid": "905048ab-fcf9-4928-a480-74b2fb98c745",
+      "rawTextureUuid": "18deb346-3f7a-4725-a2bb-76fd6115cd4b",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

tower_sanguo/assets/scripts/data/GameData.ts

@@ -17,7 +17,6 @@ import MonsterVO from "../vo/MonsterVO";
 import PlayerVO from "../vo/PlayerVO";
 import Prop from "../vo/Prop";
 import SkillVO from "../vo/SkillVO";
-import TaskVO from "../vo/TaskVO";
 import { GENERALPROP, GENERALSTATUS, ITEMTYPE, PLAYERPROP } from "./GameDefinition";
 
 const { ccclass } = cc._decorator;
@@ -57,16 +56,11 @@ export default class GameData {
     help_data: any;
     serverConfig_data: any;
     commanderskill_data: any;
-    private task_data: any;
 
     fullskillId: number[];
 
     async initLocalConfigs() {
-        console.log('initLocalConfigs');
-
         if (cc.sys.os == cc.sys.OS_WINDOWS) {
-            console.log('initLocalConfigs...windows');
-
             this.buff_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/buff_data.json?v=' + new Date().getTime());
             this.fetter_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/fetter_data.json?v=' + new Date().getTime());
             this.skill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/skill_data.json?v=' + new Date().getTime());
@@ -80,29 +74,26 @@ export default class GameData {
             this.serverConfig_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/serverConfig_data.json?v=' + new Date().getTime());
             this.help_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/help_data.json?v=' + new Date().getTime());
             this.commanderskill_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/commanderskill_data.json?v=' + new Date().getTime());
-            this.task_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/task_data.json?v=' + new Date().getTime());
             this.turntable_data = await GameController.resM.loadRemoteJson('https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/h5game/tower_sanguo/data/turntable_data.json?v=' + new Date().getTime());
 
-            // this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
-            // this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
-            // this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
-            // this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
-            // this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
-            // this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
-            // this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
-            // this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
-            // this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
-            // this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
-            // this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
-            // this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
-            // this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
-            // this.task_data = cc.loader.getRes("data/task_data", cc.JsonAsset).json;
-            // this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
+            this.db_data = cc.loader.getRes("data/db_data", cc.JsonAsset).json;
+            this.serverConfig_data = cc.loader.getRes("data/serverConfig_data", cc.JsonAsset).json;
+            this.fetter_data = cc.loader.getRes("data/fetter_data", cc.JsonAsset).json;
+            this.buff_data = cc.loader.getRes("data/buff_data", cc.JsonAsset).json;
+            this.skill_data = cc.loader.getRes("data/skill_data", cc.JsonAsset).json;
+            this.general_data = cc.loader.getRes("data/general_data", cc.JsonAsset).json;
+            this.monster_data = cc.loader.getRes("data/monster_data", cc.JsonAsset).json;
+            this.mission_data = cc.loader.getRes("data/mission_data", cc.JsonAsset).json;
+            this.item_data = cc.loader.getRes("data/item_data", cc.JsonAsset).json;
+            this.barrack_data = cc.loader.getRes("data/barrack_data", cc.JsonAsset).json;
+            this.star_data = cc.loader.getRes("data/star_data", cc.JsonAsset).json;
+            this.help_data = cc.loader.getRes("data/help_data", cc.JsonAsset).json;
+            this.turntable_data = cc.loader.getRes("data/turntable_data", cc.JsonAsset).json;
+            this.commanderskill_data = cc.loader.getRes("data/commanderskill_data", cc.JsonAsset).json;
 
             this.initJsonData();
         }
         else {
-            console.log('initLocalConfigs...zip');
             let data = cc.loader.getRes('data/1.bin', cc.BufferAsset);
             this.initZip(data._buffer);
         }
@@ -293,25 +284,10 @@ export default class GameData {
         }
 
         turntableModel.Instance.turntable_data = this.turntable_data;
-        // 任务
-        this.initTaskData();
+
         GameController.initSDK();
     }
-    /** 初始化任务 */
-    private initTaskData() {
-        for (let i in this.task_data) {
-            let o = this.task_data[i];
-            let vo = new TaskVO();
-            vo.id = o.id;
-            vo.description = o.description;
-            vo.count1 = o.count1;
-            vo.activevalue1 = o.activevalue1;
-            vo.count2 = o.count2;
-            vo.activevalue2 = o.activevalue2;
-            this.task_data[i] = vo;
-        }
-        cc.log(this.task_data)
-    }
+
     getAllGeneral() {
         return this.general_data;
     }
@@ -373,7 +349,7 @@ export default class GameData {
         this.fightData = new FightData();
         this.fightData.font1 = cc.loader.getRes("font/font1", cc.Font);
         this.fightData.font2 = cc.loader.getRes("font/font2", cc.Font);
-
+        this.fightData.font3 = cc.loader.getRes("font/font3", cc.Font);
 
         GameController.setLoadingTips('正在获取玩家数据...');
         GameController.http.getServerConfig(this.getServerConfig.bind(this));
@@ -708,7 +684,6 @@ export enum DAMAGE_TYPE {
     NORMAL = 1,
     CRIT = 2,
     FATAL = 3,
-
 }
 
 export enum CAMP {

tower_sanguo/assets/scripts/data/GameDefinition.ts

@@ -21,8 +21,7 @@ export enum PLAYERPROP {
 
     MISSION_ARRIVE = 20,//当前到达的最大关卡
     MISSION_PASSED = 21,//当前通过的最大关卡
-
-    USESKILL_TIME = 30,//上次使用统帅技能的时间
+    USESKILL_TIME = 22,//上次使用统帅技能的时间
 }
 
 export enum ITEMTYPE {

tower_sanguo/assets/scripts/module/fight/FightData.ts

@@ -13,6 +13,8 @@ export default class FightData {
     font1:cc.Font;
     /** 暴击伤害 .=n 暴击=b 闪避=m 致命一击=f */
     font2:cc.Font;
+    /** 技能伤害 .=n 暴击=b 闪避=m 致命一击=f */
+    font3:cc.Font;
 
     /** 铜墙铁壁 type 1左侧 2下面 3右侧 */
     stopWall:{x:number,y:number,type:number};

tower_sanguo/assets/scripts/module/fight/FightUI.ts

@@ -225,8 +225,10 @@ export default class FightUI extends BaseUI {
         sc.setActive(b);
     }
 
-    /** 更新武将后检测羁绊 */
-    private checkFetterSkill() {
+    /** 更新武将后检测羁绊
+     * @param gaming 是否游戏进行中  true游戏时不会走startMission
+     */
+    private checkFetterSkill(gaming:boolean = true) {
         let camps = [0, 0, 0, 0];
         let campGids = [[], [], [], []];
         for (let i = 0; i < this.general_arr.length; i++) {
@@ -291,10 +293,12 @@ export default class FightUI extends BaseUI {
         if (vo) {
             this.fetterVO = vo;
             this.fetterVO.nationbuff = campGids;//获取待优化
-            this.createFetter();
+            this.createFetter(gaming);
         }
         else {
-            this.startMission();
+            if(!gaming){
+                this.startMission();
+            }
         }
     }
 
@@ -427,7 +431,7 @@ export default class FightUI extends BaseUI {
     updateGeneralOpen() {
         if (this.first) {
             this.checkFsSkill();
-            this.checkFetterSkill();
+            this.checkFetterSkill(false);
             this.first = false;
         }
         else {
@@ -801,7 +805,7 @@ export default class FightUI extends BaseUI {
             let m: Monster = this.monster_arr[i];
             if (m && m.vo && !m.isDead()) {
                 let d = Math.floor(m.vo.maxhp * damage / 10000);
-                m.onAttack(1, { iscrit: false, damage: d, debuff: null }, 1);//万箭齐发受击特效缺少
+                m.onAttack(1, { iscrit: false, damage: d, debuff: null,isskill:true }, 1);//万箭齐发受击特效缺少
             }
         }
     }
@@ -823,7 +827,7 @@ export default class FightUI extends BaseUI {
         }
     }
 
-    private createFetter() {
+    private createFetter(gaming:boolean) {
         let ids = this.fetterVO.buffs;
         let addedbuffs = 0;
         if (ids && ids.length > 0) {
@@ -858,6 +862,9 @@ export default class FightUI extends BaseUI {
                 }
             }
         }
+        if(gaming){
+            return;
+        }
         if (addedbuffs > 0) {
             let time = addedbuffs * 1;
             this.scheduleOnce(this.startMission, time);
@@ -1123,3 +1130,11 @@ export default class FightUI extends BaseUI {
         }
     }
 }
+
+/** 技能伤害 */
+export interface DamageData {
+    iscrit: boolean, //是否暴击
+    damage: number, //伤害值
+    debuff: number, //是否触发debuff
+    isskill:boolean, //是否是技能释放
+}

tower_sanguo/assets/scripts/module/fight/HpTips.ts

@@ -35,9 +35,10 @@ export default class HpTips extends cc.Component implements IPool {
 	 * 
 	 * @param type 
 	 * @param monster_type 1monster 2boss
+	 * @param isskill true 统帅技能
 	 * @returns 
 	 */
-	play(type: DAMAGE_TYPE, monster_type: number) {
+	play(type: DAMAGE_TYPE, monster_type: number,isskill) {
 		if (!this.node) {
 			return;
 		}
@@ -54,7 +55,7 @@ export default class HpTips extends cc.Component implements IPool {
 
 		switch (type) {
 			case DAMAGE_TYPE.NORMAL:
-				this.lbl_damage.font = GameController.gameData.fightData.font1;
+				this.lbl_damage.font = isskill ? GameController.gameData.fightData.font3 : GameController.gameData.fightData.font1;
 				this.lbl_damage.fontSize = 50;
 				cc.tween(this.node).to(0.2, { x: x1, y: y1 }).delay(0.1).to(0.4, { scaleX: 0.5, scaleY: 0.5, opacity: 100, x: x2, y: y2 })
 					.call(this.clear.bind(this, false))

tower_sanguo/assets/scripts/module/fight/model/attack/AttackFlash.ts

@@ -7,7 +7,7 @@ import Monster from "../monsters/Monster";
 
 /**
  * 
- * 攻击效果
+ * 闪电攻击效果
  * 
  */
 const { ccclass, property } = cc._decorator;
@@ -47,7 +47,7 @@ export default class AttackFlash extends FightModel implements IPool {
 
     onHit() {
         if (this.target && !this.target.isDead()) {
-            this.target.onAttack(1, { iscrit: false, damage: this.damage, debuff: null }, 'flash');
+            this.target.onAttack(1, { iscrit: false, damage: this.damage, debuff: null,isskill:false }, 'flash');
         }
         this.clear();
     }

tower_sanguo/assets/scripts/module/fight/model/attack/AttackSkill.ts

@@ -70,7 +70,7 @@ export default class AttackSkill extends FightModel implements IPool {
     onHit() {
         if (this.target && !this.target.isDead()) {
             let debuff = this.vo.extra && this.vo.extra.length > 0 ? parseInt(this.vo.extra[0]) : null;
-            this.target.onAttack(1, { iscrit: false, damage: this.damage, debuff: debuff }, this.vo.res);
+            this.target.onAttack(1, { iscrit: false, damage: this.damage, debuff: debuff,isskill:true }, this.vo.res);
             GameController.mainui.getFightUI().setBlackBg(0);
         }
         this.clear();

tower_sanguo/assets/scripts/module/fight/model/attack/AttackWJQF.ts

@@ -6,11 +6,6 @@ import GameController from "../../../../GameController";
 import SkillVO from "../../../../vo/SkillVO";
 import FightModel from "../FightModel";
 
-/**
- * 
- * 攻击效果
- * 
- */
 const { ccclass, property } = cc._decorator;
 
 
@@ -45,13 +40,13 @@ export default class AttackWJQF extends FightModel implements IPool {
         this.count++;
         this.skeleton.node.active = true;
         this.skeleton.animation = 'animation';
-        if (this.count > this.vo.skillValue.length) {
+        if (this.count >= this.vo.skillValue.length) {
             this.clear();
         }
     }
 
     private actionComplete() {
-        
+        this.skeleton.node.active = false;
     }
 
     private spineEvent(a, b) {

tower_sanguo/assets/scripts/module/fight/model/generals/General.ts

@@ -192,7 +192,7 @@ export default class General extends FightModel implements IPool {
 
     /**
      * 
-     * @returns {iscrit:boolean,damage:number,debuff: BUFFTYPE}
+     * @returns DamageData
      */
     getDamage() {
         return this.vo.getDamage();

tower_sanguo/assets/scripts/module/fight/model/monsters/Monster.ts

@@ -1,14 +1,14 @@
 
 import GameUtil from "../../../../../MOKA/util/GameUtil";
-import FightUI from "../../FightUI";
+import FightUI, { DamageData } from "../../FightUI";
 import ProgressBar from "../../../../component/ProgressBar";
 import GameController from "../../../../GameController";
 import HpTips from "../../HpTips";
 import MonsterVO from "../../../../vo/MonsterVO";
 import AttackLight from "../attack/AttackLight";
-import { BUFFTYPE, DAMAGE_TYPE } from "../../../../data/GameData";
 import FightModel from "../FightModel";
 import BuffVO from "../../../../vo/BuffVO";
+import { BUFFTYPE, DAMAGE_TYPE } from "../../../../data/GameData";
 
 
 /**
@@ -119,7 +119,7 @@ export default class Monster extends FightModel implements IPool {
         this.img_stop.node.scale = this.scaleRate;
         this.skeleton.animation = 'run';
 
-        let attachUtil = this.skeleton.attachUtil;
+        let attachUtil = (this.skeleton as any).attachUtil;
         let boneNodes = attachUtil.generateAttachedNodes('boddy2');
         if (boneNodes.length == 0) {
             console.log("找不到该挂点:boddy2");
@@ -131,10 +131,10 @@ export default class Monster extends FightModel implements IPool {
     /**
      * 受到攻击
      * @param hitrate 命中率
-     * @param damage {iscrit:boolean,damage:number,debuff: number}
+     * @param damage 伤害参数
      * @param hit_type 受击效果类型(普攻攻击为number，统帅技能为资源名)
      */
-    onAttack(hitrate: number, damage: { iscrit: boolean, damage: number, debuff: number }, hit_type) {
+    onAttack(hitrate: number, damage: DamageData, hit_type) {
         if (!this.node || !this.vo) {
             return;
         }
@@ -152,7 +152,9 @@ export default class Monster extends FightModel implements IPool {
             type = DAMAGE_TYPE.FATAL;
         }
 
-        this.popHpTips(hitstr, type);
+        let isskill = typeof hit_type == 'string' && hit_type != 'flash';
+
+        this.popHpTips(hitstr, type,isskill);
 
         if (isHit && damage.debuff) {
             let debuff = GameController.gameData.getBuffByID(damage.debuff);
@@ -231,7 +233,7 @@ export default class Monster extends FightModel implements IPool {
      * @param type  
      * @returns 
      */
-    private popHpTips(str, type: DAMAGE_TYPE) {
+    private popHpTips(str, type: DAMAGE_TYPE,isskill:boolean=false) {
         if (!this.node || !this.vo) {
             return;
         }
@@ -241,7 +243,7 @@ export default class Monster extends FightModel implements IPool {
         let script = node_hp.getComponent(HpTips) as HpTips;
         let lbl: cc.Label = node_hp.getChildByName("lbl_hptips").getComponent(cc.Label);
         lbl.string = str;
-        script.play(type, this.vo.type);
+        script.play(type, this.vo.type,isskill);
         node_hp.parent = this.node;
         node_hp.zIndex = 0;
     }

tower_sanguo/assets/scripts/vo/GeneralVO.ts

@@ -5,6 +5,7 @@
 import { BUFFTYPE } from "../data/GameData";
 import { GENERALSTATUS } from "../data/GameDefinition";
 import GameController from "../GameController";
+import { DamageData } from "../module/fight/FightUI";
 import BuffVO from "./BuffVO";
 import SkillVO from "./SkillVO";
 
@@ -26,7 +27,7 @@ export default class GeneralVO {
     /** 兵营开启等级 */
     unlockLevel: number;
     /** 兵营开放抽卡等级 */
-    
+
 
     private _skillID: number;
     set skillID(v: number) {
@@ -119,10 +120,10 @@ export default class GeneralVO {
     exp: number;
     /** 状态  */
     _status: GENERALSTATUS;
-    set status(v:GENERALSTATUS){
+    set status(v: GENERALSTATUS) {
         this._status = v;
     }
-    get status():GENERALSTATUS{
+    get status(): GENERALSTATUS {
         return this._status;
     }
     /** 当前拥有碎片数量 */
@@ -178,10 +179,12 @@ export default class GeneralVO {
         let iscrit = Math.random() < this.crit_rate;
         let damage = this.getDamageNormal() * (iscrit ? 1.5 : 1);
         let buff = this.getNationBuff();
-        return {
+        let data = {
             iscrit: iscrit,
             debuff: buff ? buff : null,
-            damage: Math.ceil(damage)
+            damage: Math.ceil(damage),
+            isskill:false
         };
+        return data as DamageData;
     }
 }