提交

JisolGameCocos/assets/script/App.ts

@@ -26,12 +26,12 @@ import { JAPI, JAPIConfig } from "../../extensions/ngame/assets/ngame/util/JAPI"
 import { AppData } from "./AppData";
 import AppAction from "./AppAction";
 
-let APIPath = `http://localhost:8080`
-let WsPath = `ws://localhost:8080/websocket`
+// let APIPath = `http://localhost:8080`
+// let WsPath = `ws://localhost:8080/websocket`
 // let APIPath = `http://192.168.1.23:8080`
 // let WsPath = `ws://192.168.1.23:8080/websocket`
-// let APIPath = `http://192.168.0.170:8080`
-// let WsPath = `ws://192.168.0.170:8080/websocket`
+let APIPath = `http://192.168.0.113:8080`
+let WsPath = `ws://192.168.0.113:8080/websocket`
 // let APIPath = `https://api.pet.jisol.cn`
 // let WsPath = `wss://api.pet.jisol.cn/websocket`
 
@@ -47,7 +47,7 @@ class JNGSocket extends JNSocket{
         this.on(GAction.TOKEN_EXPIRED,this.onTokenExpired.bind(this));
         await super.onInit();
     }
-    public url():Promise<string> {
+    public async url():Promise<string> {
         return new Promise<string>(resolve => {
             //获取Token
             let token = StorageData.get(StorageEnum.Token);

JisolGameCocos/assets/script/consts/API.ts

@@ -86,6 +86,7 @@ export interface ResourceOV{
     playerId:number;                  //玩家Id
     resourceTbId:number;              //资源配置表Id
     resourceValue:number;             //资源数量
+    version:number;                     //版本号
 }
 
 export const API = {

JisolGameCocos/assets/script/data/ResourceData.ts

@@ -24,6 +24,9 @@ export default class ResourceData extends BaseData{
     //资源数据 {资源Id:资源数量}
     data:{[key:number]:number} = {};
 
+    //资源更新的版本号
+    versions:{[key:number]:number} = {};
+
     //初始化
     async onInit() {
         await this.onUpdateResource();
@@ -47,6 +50,16 @@ export default class ResourceData extends BaseData{
         return this.data[type] || 0;
     }
 
+    //更新资源
+    onResource(resource:ResourceOV){
+        let version = this.versions[resource.resourceTbId] || 0;
+        if(resource.version >= version){
+            version = this.versions[resource.resourceTbId] = resource.version;
+            this.data[resource.resourceTbId] = resource.resourceValue;
+            app.event.emit(ResourceEvent.UPDATE,this.data[resource.resourceTbId])
+        }
+    }
+
     //刷新返回资源
     onUpdateOV(operation:number,resource:ResourceOV){
 
@@ -54,9 +67,7 @@ export default class ResourceData extends BaseData{
         if(!resource) return;
 
         if(operation == ResourceUpdateType.UPDATE){
-            //更新资源
-            this.data[resource.resourceTbId] = resource.resourceValue;
-            app.event.emit(ResourceEvent.UPDATE)
+            this.onResource(resource);
         }
 
     }

JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts

@@ -9,6 +9,7 @@ import { Vec3 } from 'cc';
 import { NodeEventType } from 'cc';
 import { EventTouch } from 'cc';
 import JNodeDrag from '../../../../../extensions/ngame/assets/ngame/util/components/JNodeDrag';
+import { PetIcon } from '../Pet/PetIcon';
 const { ccclass, property } = _decorator;
 
 @ccclass('PlayerTacticalItem')
@@ -25,6 +26,10 @@ export class PlayerTacticalItem extends Component {
     @property(Node)
     havePet:Node;
 
+    //宠物节点
+    @property(PetIcon)
+    petIcon:PetIcon;
+
     //拖拽
     @property(JNodeDrag)
     drag:JNodeDrag;
@@ -66,12 +71,10 @@ export class PlayerTacticalItem extends Component {
     //更新宠物信息
     onUpdatePetView(){
 
-        let spine = this.havePet.getComponentInChildren(sp.Skeleton);
         //获取宠物信息
         let info = PlayerPetData.getIns().petIdQueryPetInfo(this.petId);
-        spine.skeletonData = app.battleRes.roleSpine[info.petTbId];
-        spine.setAnimation(0,UIPetAnim.std,true);
-
+        this.petIcon.set(info);
+        
     }
     
     //打开选择阵法宠物