提交

2025-09-27 02:36:14 +00:00 · 2023-12-13 19:33:57 +08:00
parent 5bc3f1d954
commit 3dde3c30b3
37 changed files with 104 additions and 51 deletions
--- a/JisolGameCocos/assets/script/battle/base/anim.meta
+++ b/JisolGameCocos/assets/script/battle/base/anim.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "e39de726-3f70-4b81-8d41-13c5f661ab06",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/JisolGameCocos/assets/script/battle/base/anim/GPetAnim.ts
+++ b/JisolGameCocos/assets/script/battle/base/anim/GPetAnim.ts
@@ -0,0 +1,8 @@
+
+//角色动画名称枚举
+export enum GPetAminEnum {
+    Wait = "std", //等待
+    Walk = "walk", //移动
+    Attack = "atk", //攻击
+    Fly = "jifei", //击飞
+}
--- a/JisolGameCocos/assets/script/battle/base/anim/GPetAnim.ts.meta
+++ b/JisolGameCocos/assets/script/battle/base/anim/GPetAnim.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "7ed00aa2-048c-4956-8f94-ccd16fe1f702",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts
+++ b/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts
@@ -4,7 +4,7 @@ import { UITransform } from "cc";
 import GButtleBase from "../bullet/GButtleBase";
 import GRoleDefault from "../role/GRoleDefault";
 import GNode from "../common/GNode";
-import { TB } from "../../../../resources/config/data/schema";
+import { TB } from "../../../config/data/schema";

 //攻击子弹类
 export class GAttackBullet{
--- a/JisolGameCocos/assets/script/battle/base/attack/GAttackNormal.ts
+++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackNormal.ts
@@ -1,4 +1,4 @@
-import { TB } from "../../../../resources/config/data/schema";
+import { TB } from "../../../config/data/schema";
 import GRoleAttack from "../common/GRoleAttack";
 import GRoleDefault from "../role/GRoleDefault";
 import { GRoleAttackType } from "../values/GRoleValues";
--- a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts
+++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts
@@ -11,7 +11,7 @@ import GEffectUtil from "../common/GEffectUtil";
 import GDetection from "../common/GDetection";
 import { rect } from "cc";
 import GRoleDefault from "../role/GRoleDefault";
-import { TB } from "../../../../resources/config/data/schema";
+import { TB } from "../../../config/data/schema";
 import GRoleAttack from "../common/GRoleAttack";
 import { sp } from "cc";

--- a/JisolGameCocos/assets/script/battle/base/fsm/Default/GFSMDefaultAnim.ts
+++ b/JisolGameCocos/assets/script/battle/base/fsm/Default/GFSMDefaultAnim.ts
@@ -1,13 +1,6 @@
+import { GPetAminEnum } from "../../anim/GPetAnim";
 import { GFSMAnimBase, GFSMProcessAnimInfo } from "../GFSMAnimBase";

-//角色动画名称枚举
-export enum GFSMBattleAminEnum {
-    Wait = "std", //等待
-    Walk = "walk", //移动
-    Attack = "atk", //攻击
-    Fly = "jifei", //击飞
-}
-
 //流程枚举
 enum ProcessEnum {
    //等待
@@ -37,7 +30,7 @@ export class GFSMDefaultAnim extends GFSMAnimBase{
        [ProcessEnum.Wait]:{
            title:"等待",
            isLoop:true,
-            animName:GFSMBattleAminEnum.Wait,
+            animName:GPetAminEnum.Wait,
            mixs:[0.1,0.1],
            to:[ProcessEnum.Move,ProcessEnum.Attack,ProcessEnum.Die],
            ifTo:[
@@ -48,7 +41,7 @@ export class GFSMDefaultAnim extends GFSMAnimBase{
        },
        [ProcessEnum.Move]:{
            title:"移动",
-            animName:GFSMBattleAminEnum.Walk,
+            animName:GPetAminEnum.Walk,
            isLoop:true,
            mixs:[0.1,0.1],
            to:[ProcessEnum.Wait,ProcessEnum.Attack,ProcessEnum.Die],
@@ -60,7 +53,7 @@ export class GFSMDefaultAnim extends GFSMAnimBase{
        },
        [ProcessEnum.Attack]:{
            title:"攻击",
-            animName:GFSMBattleAminEnum.Attack,
+            animName:GPetAminEnum.Attack,
            isLoop:true,
            mixs:[0.1,0.1],
            to:[ProcessEnum.Wait,ProcessEnum.Move,ProcessEnum.Die],
@@ -72,7 +65,7 @@ export class GFSMDefaultAnim extends GFSMAnimBase{
        },
        [ProcessEnum.Die]:{
            title:"死亡",
-            animName:GFSMBattleAminEnum.Fly,
+            animName:GPetAminEnum.Fly,
            isLoop:true,
            mixs:[0.1,0.1],
        }
--- a/JisolGameCocos/assets/script/battle/base/fsm/GFSMAnimBase.ts
+++ b/JisolGameCocos/assets/script/battle/base/fsm/GFSMAnimBase.ts
@@ -3,13 +3,6 @@ import GFSMBase, { GFSMProcessEnum, GFSMProcessInfo, GFSMProcessMode } from "./G
 import GObject from "../GObject";
 import { JNFrameInfo } from "../../../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame";

-//角色动画名称枚举
-export enum GFSMBattleAminEnum {
-    Wait = "std", //等待
-    Walk = "walk", //移动
-    Attack = "atk", //攻击
-    Fly = "jifei", //击飞
-}

 //动画流程信息
 export interface GFSMProcessAnimInfo extends GFSMProcessInfo{
--- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts
+++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts
@@ -7,9 +7,10 @@ import JNSkeleton from "../../../../../extensions/ngame/assets/ngame/sync/frame/
 import { GFSMAnimBase } from "../fsm/GFSMAnimBase";
 import GFSMBase from "../fsm/GFSMBase";
 import { app } from "../../../App";
-import { TB } from "../../../../resources/config/data/schema";
+import { TB } from "../../../config/data/schema";
 import GRoleValues, { GRoleAttackType } from "../values/GRoleValues";
 import GAttributeBase from "../values/attribute/GAttributeBase";
+import { GPetAminEnum } from "../anim/GPetAnim";
 const { ccclass, property } = _decorator;

 export enum GRoleAnimEvent{
--- a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts
+++ b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts
@@ -2,7 +2,7 @@ import { _decorator } from "cc";
 import GRoleBase, { GRoleAnimEvent } from "./GRoleBase";
 import { ProgressBar } from "cc";
 import { JNFrameInfo } from "../../../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame";
-import { GFSMAnimBase, GFSMBattleAminEnum } from "../fsm/GFSMAnimBase";
+import { GFSMAnimBase } from "../fsm/GFSMAnimBase";
 import { GFSMDefaultAnim } from "../fsm/Default/GFSMDefaultAnim";
 import GFSMDefault from "../fsm/Default/GFSMDefault";
 import { JEasing } from "../../../../../extensions/ngame/assets/ngame/sync/frame/game/tween/JNFrameTween";
@@ -10,8 +10,10 @@ import { GAttack } from "../attack/GAttack";
 import { v2 } from "cc";
 import { GTactical } from "../../entity/GTactical";
 import { GSkill, GSkillBase, GSkillState } from "../../skill/GSkill";
-import { TB } from "../../../../resources/config/data/schema";
+import { TB } from "../../../config/data/schema";
 import { TD } from "../../../App";
+import { GPetAminEnum } from "../anim/GPetAnim";
+import { UIOpacity } from "cc";
 const { property,ccclass } = _decorator;

 //默认角色类
@@ -66,17 +68,22 @@ export default class GRoleDefault extends GRoleBase<{}>{
    //宠物死亡回调
    killBack:((role:GRoleDefault) => {})[] = [];

+    @property(UIOpacity)
+    opacity:UIOpacity;
+
    onSyncLoad(){
        super.onSyncLoad();
        
        //监听攻击
        this.fsmAnim.addEventListener(GRoleAnimEvent.Attack,this.onAttack.bind(this));
        //监听死亡击飞
-        this.fsmAnim.addStartListener(GFSMBattleAminEnum.Fly,this.onFly.bind(this));
+        this.fsmAnim.addStartListener(GPetAminEnum.Fly,this.onFly.bind(this));
    }

    //初始化
    onInit(type:number,role:TB.TbGRole,tactical:GTactical,tacticalIndex:number){
+        this.opacity.opacity = 0;
+        
        super.init(role);
        this.type = type;

@@ -96,6 +103,8 @@ export default class GRoleDefault extends GRoleBase<{}>{

    onSyncUpdate(dt: number,frame:JNFrameInfo, input?: {}) {

+        this.opacity.opacity = 255;
+
        super.onSyncUpdate(dt,frame,input);

        //更新技能