提交开宝箱

JisolGameCocos/assets/script/data/GBattleData.ts

@@ -0,0 +1,39 @@
+import { app } from "../App";
+import GAttributeData, { GBattleDataInfo } from "../battle/base/values/GAttributeData";
+import BaseData from "./BaseData";
+import PetEquipData from "./PetEquipData";
+import PlayerPetData from "./PlayerPetData";
+
+export enum GBattleDataEnum{
+    UPDARE_ATTRIBUTE = "GBattleDataEnum_UPDARE_ATTRIBUTE",     //更新属性
+    UPDARE_ATTRIBUTE_SUCCESS = "GBattleDataEnum_UPDARE_ATTRIBUTE_SUCCESS",     //更新成功
+}
+
+//游戏战斗数据
+export default class GBattleData extends BaseData{
+
+    //自己的战斗数据
+    data:GAttributeData = new GAttributeData();
+
+    onInit() {
+        this.onUpdateAttribute();
+        app.event.on(GBattleDataEnum.UPDARE_ATTRIBUTE,this.onUpdateAttribute,this);
+    }
+
+    destroy(): void {
+        app.event.off(GBattleDataEnum.UPDARE_ATTRIBUTE,this.onUpdateAttribute,this);
+    }
+
+    //刷新属性
+    onUpdateAttribute(){
+        this.data.assets({
+            petEquips:PetEquipData.getIns().equips,
+            pets:PlayerPetData.getIns().getTacticalData()
+        })
+
+        app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE_SUCCESS)
+
+    }
+
+}
+

JisolGameCocos/assets/script/data/GBattleData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "a403abff-7b31-45c9-9ba9-5eb00b64c86c",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/data/GOnHookData.ts

@@ -1,11 +1,12 @@
 import { app } from "../App";
+import GBattleData, { GBattleDataInfo } from "../battle/base/values/GAttributeData";
 import { API } from "../consts/API";
 import { GAPI, ModeOnHookOV } from "../consts/GAPI";
 import { GUI } from "../ui/UIConfig";
 import BaseData from "./BaseData";
 
 export enum GOnHookDataEnum{
-    UPDATE = "GOnHookDataEnum_UPDATE"   //刷新信息
+    UPDATE = "GOnHookDataEnum_UPDATE",                  //刷新信息
 }
 
 //无限模式数据类
@@ -22,6 +23,7 @@ export default class GOnHookData extends BaseData{
     async onInit() {
         await this.onUpdateInfo();
         console.log("GOnHookData Info",this.info);
+
     }
 
     //刷新数据

JisolGameCocos/assets/script/data/PetEquipData.ts

@@ -3,6 +3,8 @@ import { TD, app } from "../App";
 import { API, EquipForgingBench, PetEquip } from "../consts/API";
 import { GUI } from "../ui/UIConfig";
 import BaseData from "./BaseData";
+import { GBattleDataEnum } from "./GBattleData";
+import GOnHookData from "./GOnHookData";
 import PlayerPetData from "./PlayerPetData";
 
 export enum PetEquipDataEnum{
@@ -34,8 +36,15 @@ export default class PetEquipData extends BaseData{
     }
 
     async onInit() {
-        this.equips = await API.PetEquipAll();
-        this.onUpdateInfo(await API.PetEquipForgingInfo())
+        this.onUpdateEquips(await API.PetEquipAll());
+        this.onUpdateInfo(await API.PetEquipForgingInfo());
+    }
+
+    //更新装备
+    onUpdateEquips(equips:PetEquip[]){
+        this.equips = equips;
+
+        app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE); //刷新属性
     }
 
     //更新锻造数据
@@ -50,8 +59,10 @@ export default class PetEquipData extends BaseData{
     //锻造
     async forging(){
         let info = await API.PetEquipForging();
-        this.onUpdateInfo(info.info);
-        return this.addEquip(info.equip);
+        if(info){
+            this.onUpdateInfo(info.info);
+            return this.addEquip(info.equip);
+        }else return null;
     }
 
     //添加装备
@@ -84,6 +95,8 @@ export default class PetEquipData extends BaseData{
             })
             Object.assign(equip,info);
             app.event.emit(PetEquipDataEnum.UPDATE_EQUIP);
+
+            app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE); //刷新属性
         }
     }
 

JisolGameCocos/assets/script/data/PlayerPetData.ts

@@ -1,6 +1,8 @@
 import { app } from "../App";
 import { API, PlayerInfoOV, PlayerPetOV } from "../consts/API";
 import BaseData from "./BaseData";
+import { GBattleDataEnum } from "./GBattleData";
+import GOnHookData from "./GOnHookData";
 import PlayerTacticalData from "./PlayerTacticalData";
 import { ResourceUpdateType } from "./ResourceData";
 
@@ -39,10 +41,17 @@ export default class PlayerPetData extends BaseData{
         return this.datas.filter(data => PlayerTacticalData.getIns().getTacticalInfo().indexOf(data.petId) < 0);
     }
 
+    //获取上阵的宠物
+    getTacticalData():PlayerPetOV[]{
+        return this.datas.filter(data => PlayerTacticalData.getIns().getTacticalInfo().indexOf(data.petId) >= 0);
+    }
+
     //更新玩家宠物
     async UpdatePlayerPet(){
         //获取全部宠物
         this.datas = await API.GetPlayerPets();
+        
+        app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE); //刷新属性
     }
 
     //选择宠物

JisolGameCocos/assets/script/data/PlayerTacticalData.ts

@@ -1,6 +1,8 @@
 import { app } from "../App";
 import { API, PlayerTacticalOV } from "../consts/API";
 import BaseData from "./BaseData";
+import { GBattleDataEnum } from "./GBattleData";
+import GOnHookData from "./GOnHookData";
 import PlayerPetData from "./PlayerPetData";
 
 export enum PlayerTacticalEvent{
@@ -34,9 +36,12 @@ export default class PlayerTacticalData extends BaseData{
             ...ov,
             roles: JSON.parse(ov.tacticalData).map(id => PlayerPetData.getIns().petIdQueryPetInfo(id) ? id : 0),
         }
+        
+        app.event.emit(GBattleDataEnum.UPDARE_ATTRIBUTE); //刷新属性
 
         //通知阵法信息已更新
         app.event.emit(PlayerTacticalEvent.UPDATE_TACTICAL);
+
     }
 
     //更新阵法信息