mirror of
https://gitee.com/jisol/jisol-game/
synced 2025-09-27 02:36:14 +00:00
提交
This commit is contained in:
@@ -8,7 +8,7 @@ import { TD, app } from "../App";
|
||||
import { JNFrameInfo, JNSyncFrameEvent } from "../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame";
|
||||
import { CCObject } from "cc";
|
||||
import { Env, EnvCurrent } from "../Env";
|
||||
import { TB } from "../../resources/config/data/schema";
|
||||
import { TB } from "../config/data/schema";
|
||||
import BattleResource from "../tools/BattleResource";
|
||||
|
||||
export enum BattleMode{
|
||||
|
9
JisolGameCocos/assets/script/battle/base/anim.meta
Normal file
9
JisolGameCocos/assets/script/battle/base/anim.meta
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"ver": "1.2.0",
|
||||
"importer": "directory",
|
||||
"imported": true,
|
||||
"uuid": "e39de726-3f70-4b81-8d41-13c5f661ab06",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
@@ -0,0 +1,8 @@
|
||||
|
||||
//角色动画名称枚举
|
||||
export enum GPetAminEnum {
|
||||
Wait = "std", //等待
|
||||
Walk = "walk", //移动
|
||||
Attack = "atk", //攻击
|
||||
Fly = "jifei", //击飞
|
||||
}
|
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"ver": "4.0.23",
|
||||
"importer": "typescript",
|
||||
"imported": true,
|
||||
"uuid": "7ed00aa2-048c-4956-8f94-ccd16fe1f702",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
@@ -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{
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
||||
|
@@ -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],
|
||||
}
|
||||
|
@@ -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{
|
||||
|
@@ -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{
|
||||
|
@@ -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);
|
||||
|
||||
//更新技能
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import { TD } from "../../App";
|
||||
import GRoleBase from "../base/role/GRoleBase";
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import { Vec2 } from "cc";
|
||||
import GDefaultMode from "./default/GDefaultMode";
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import GRoleDefault from "../base/role/GRoleDefault";
|
||||
import { _decorator } from "cc";
|
||||
import GBaseMode from "../GBaseMode";
|
||||
@@ -12,6 +12,7 @@ import { GTowards } from "../base/GObject";
|
||||
import GRoleBase from "../base/role/GRoleBase";
|
||||
import { GTactical } from "../entity/GTactical";
|
||||
import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime";
|
||||
import { TbGPetId } from "../../config/TbGPet";
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
//阵营守护 角色
|
||||
@@ -55,7 +56,10 @@ export default class GCampGuardianMode extends GBaseMode<{},{}>{
|
||||
|
||||
//定时器生成
|
||||
JNFrameTime.getInstance().setInterval(() => {
|
||||
// this.onGenRole(GCampGuardianEnum.PLAYER,TD.TbGRole.get());
|
||||
this.onGenRole(GCampGuardianEnum.PLAYER,TD.TbGRole.get(TbGPetId.坚强小石));
|
||||
this.onGenRole(GCampGuardianEnum.PLAYER,TD.TbGRole.get(TbGPetId.坚强小石));
|
||||
this.onGenRole(GCampGuardianEnum.PLAYER,TD.TbGRole.get(TbGPetId.坚强小石));
|
||||
this.onGenRole(GCampGuardianEnum.ENEMY,TD.TbGRole.get(TbGPetId.雷吉艾斯));
|
||||
},1000)
|
||||
|
||||
}
|
||||
@@ -65,7 +69,7 @@ export default class GCampGuardianMode extends GBaseMode<{},{}>{
|
||||
|
||||
let crystalNode = instantiate(this.crystalPrefab);
|
||||
let crystal = crystalNode.getComponent(GRoleCGCrystal);
|
||||
crystal.init(TD.TbGRole.get(10005));
|
||||
crystal.init(TD.TbGRole.get(TbGPetId.雷吉艾斯));
|
||||
|
||||
switch(type){
|
||||
case GCampGuardianEnum.PLAYER:
|
||||
|
@@ -15,7 +15,7 @@ import { TD, app } from "../../App";
|
||||
import { v3 } from "cc";
|
||||
import { v2 } from "cc";
|
||||
import GFSMOnHookMode from "./OnHook/GFSMOnHookMode";
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import PlayerTacticalData, { PlayerTacticalEvent } from "../../data/PlayerTacticalData";
|
||||
import GRoleOnHookPlayerExpand from "../base/role/expand/OnHook/GRoleOnHookPlayerExpand";
|
||||
import PlayerPetData from "../../data/PlayerPetData";
|
||||
|
@@ -7,7 +7,7 @@ import { Vec2 } from "cc";
|
||||
import { GRoleUtil } from "../entity/GRole";
|
||||
import GRoleDefault from "../base/role/GRoleDefault";
|
||||
import { v3 } from "cc";
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime";
|
||||
import GBattleModeManager from "../GBattleModeManager";
|
||||
import { app, TD } from "../../App";
|
||||
|
@@ -2,7 +2,7 @@ import { _decorator } from "cc";
|
||||
import GBaseMode from "../../GBaseMode";
|
||||
import { GMapLoop } from "../../base/common/map/GMapLoop";
|
||||
import { TD, app } from "../../../App";
|
||||
import { TB } from "../../../../resources/config/data/schema";
|
||||
import { TB } from "../../../config/data/schema";
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
export default class GDefaultMode<T,DT> extends GBaseMode<T,DT>{
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import GSkillCrazySquirrel from "./RoleSkill/疯狂松鼠/GSkillCrazySquirrel";
|
||||
import GSkillBulbasaurDoubleHit from "./RoleSkill/妙蛙种子/GSkillBulbasaurDoubleHit";
|
||||
import GRoleDefault from "../base/role/GRoleDefault";
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
|
||||
//技能状态
|
||||
export enum GSkillState{
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import GRoleDefault from "../base/role/GRoleDefault";
|
||||
import { GSkillBase, GSkillState } from "./GSkill";
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TB } from "../../../resources/config/data/schema";
|
||||
import { TB } from "../../config/data/schema";
|
||||
import GRoleDefault from "../base/role/GRoleDefault";
|
||||
import { GSkillBase, GSkillState } from "./GSkill";
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TB } from "../../../../../resources/config/data/schema";
|
||||
import { TB } from "../../../../config/data/schema";
|
||||
import GRoleAttack from "../../../base/common/GRoleAttack";
|
||||
import GRoleBase from "../../../base/role/GRoleBase";
|
||||
import GRoleDefault from "../../../base/role/GRoleDefault";
|
||||
|
@@ -8,7 +8,7 @@ import GBaseMode from "../../../GBaseMode";
|
||||
import GDetection from "../../../base/common/GDetection";
|
||||
import { rect } from "cc";
|
||||
import GRoleDefault from "../../../base/role/GRoleDefault";
|
||||
import { TB } from "../../../../../resources/config/data/schema";
|
||||
import { TB } from "../../../../config/data/schema";
|
||||
import GRoleAttack from "../../../base/common/GRoleAttack";
|
||||
import { sp } from "cc";
|
||||
|
||||
|
Reference in New Issue
Block a user