Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

tower_sanguo/assets/scripts/data/GameData.ts

@@ -75,7 +75,7 @@ export default class GameData {
         'star', 'help', 'turntable', 'taskActive', 'task', 'commanderskill', 'openfun'];
 
     /** 是否使用本地资源，不使用oss资源 */
-    private useLocal: boolean = false;
+    private useLocal: boolean = true;
 
     async initLocalConfigs() {
         console.log('initLocalConfigs');

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

@@ -895,7 +895,7 @@ export default class FightUI extends BaseUI {
     }
 
     private createFetter(gaming: boolean) {
-        let ids = this.fetterVO.buffs;
+        let ids = this.fetterVO && this.fetterVO.buffs;
         let addedbuffs = 0;
         if (ids && ids.length > 0) {
             for (let i = 0; i < this.general_arr.length; i++) {

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

@@ -40,7 +40,7 @@ export default class AttackSkill extends FightModel implements IPool {
 
     init(vo: SkillVO, damage, target: Monster) {
         this.vo = vo;
-        this.damage = damage;
+        this.damage = Math.ceil(damage);
         this.skeleton.skeletonData = cc.loader.getRes('module/fight/spine/attack_full/' + vo.res + '_1', sp.SkeletonData);
         this.skeleton.node.scale = 1.3;
         this.skeleton.animation = 'animation';