diff --git a/assets/main.scene b/assets/main.scene index c5c2c9f..0e7bcea 100644 --- a/assets/main.scene +++ b/assets/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 382.0585048754063, + "_orthoHeight": 450.7042253521127, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/script/game/common/net/NetChannelManager.ts b/assets/script/game/common/net/NetChannelManager.ts index 44de581..5518636 100644 --- a/assets/script/game/common/net/NetChannelManager.ts +++ b/assets/script/game/common/net/NetChannelManager.ts @@ -3,10 +3,10 @@ * @LastEditors: dgflash * @LastEditTime: 2022-06-14 17:53:02 */ -import { NetData } from "../../../../../extensions/oops-framework/assets/core/network/NetInterface"; -import { NetManager } from "../../../../../extensions/oops-framework/assets/core/network/NetManager"; -import { NetProtocolPako } from "../../../../../extensions/oops-framework/assets/core/network/NetProtocolPako"; -import { WebSock } from "../../../../../extensions/oops-framework/assets/core/network/WebSock"; +import { NetData } from "../../../../../extensions/oops-framework/assets/libs/network/NetInterface"; +import { NetManager } from "../../../../../extensions/oops-framework/assets/libs/network/NetManager"; +import { NetProtocolPako } from "../../../../../extensions/oops-framework/assets/libs/network/NetProtocolPako"; +import { WebSock } from "../../../../../extensions/oops-framework/assets/libs/network/WebSock"; import { netConfig } from "./NetConfig"; import { NetGameTips } from "./NetGameTips"; import { NetNodeGame } from "./NetNodeGame"; diff --git a/assets/script/game/common/net/NetGameTips.ts b/assets/script/game/common/net/NetGameTips.ts index 437cac4..c4326aa 100644 --- a/assets/script/game/common/net/NetGameTips.ts +++ b/assets/script/game/common/net/NetGameTips.ts @@ -6,7 +6,7 @@ import { Message } from "../../../../../extensions/oops-framework/assets/core/common/event/MessageManager"; import { Logger } from "../../../../../extensions/oops-framework/assets/core/common/log/Logger"; import { tips } from "../prompt/TipsManager"; -import { INetworkTips } from "../../../../../extensions/oops-framework/assets/core/network/NetInterface"; +import { INetworkTips } from "../../../../../extensions/oops-framework/assets/libs/network/NetInterface"; import { GameEvent } from "../config/GameEvent"; /** 游戏服务器提示 */ diff --git a/assets/script/game/common/net/NetNodeGame.ts b/assets/script/game/common/net/NetNodeGame.ts index 5392c8c..4093e07 100644 --- a/assets/script/game/common/net/NetNodeGame.ts +++ b/assets/script/game/common/net/NetNodeGame.ts @@ -5,8 +5,8 @@ * @LastEditTime: 2022-06-14 17:52:54 */ -import { CallbackObject, IRequestProtocol } from "../../../../../extensions/oops-framework/assets/core/network/NetInterface"; -import { NetNode } from "../../../../../extensions/oops-framework/assets/core/network/NetNode"; +import { CallbackObject, IRequestProtocol } from "../../../../../extensions/oops-framework/assets/libs/network/NetInterface"; +import { NetNode } from "../../../../../extensions/oops-framework/assets/libs/network/NetNode"; import { netConfig } from "./NetConfig"; /** 网络节点扩展 */ diff --git a/extensions/oops-framework/assets/core/Oops.ts b/extensions/oops-framework/assets/core/Oops.ts index c1b2320..e5ee45d 100644 --- a/extensions/oops-framework/assets/core/Oops.ts +++ b/extensions/oops-framework/assets/core/Oops.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2022-02-11 09:32:47 * @LastEditors: dgflash - * @LastEditTime: 2022-07-19 13:37:44 + * @LastEditTime: 2022-07-25 10:20:36 */ import { ECSRootSystem } from "../libs/ecs/ECSSystem"; import { AudioManager } from "./common/audio/AudioManager"; @@ -13,7 +13,7 @@ import { storage } from "./common/storage/StorageManager"; import { GameManager } from "./game/GameManager"; import { LanguageManager } from "./gui/language/Language"; import { LayerManager } from "./gui/layer/LayerManager"; -import { HttpRequest } from "./network/HttpRequest"; +import { HttpRequest } from "../libs/network/HttpRequest"; /** 框架版本 */ export var version: string = "1.0.7"; diff --git a/extensions/oops-framework/assets/core/Root.ts b/extensions/oops-framework/assets/core/Root.ts index db24331..f12b461 100644 --- a/extensions/oops-framework/assets/core/Root.ts +++ b/extensions/oops-framework/assets/core/Root.ts @@ -13,7 +13,7 @@ import { GameManager } from "./game/GameManager"; import { GUI } from "./gui/GUI"; import { LanguageManager } from "./gui/language/Language"; import { LayerManager } from "./gui/layer/LayerManager"; -import { HttpRequest } from "./network/HttpRequest"; +import { HttpRequest } from "../libs/network/HttpRequest"; import { oops, version } from "./Oops"; const { ccclass, property } = _decorator; diff --git a/extensions/oops-framework/assets/core/network.meta b/extensions/oops-framework/assets/libs/network.meta similarity index 77% rename from extensions/oops-framework/assets/core/network.meta rename to extensions/oops-framework/assets/libs/network.meta index 0df4b8b..f613980 100644 --- a/extensions/oops-framework/assets/core/network.meta +++ b/extensions/oops-framework/assets/libs/network.meta @@ -2,7 +2,7 @@ "ver": "1.1.0", "importer": "directory", "imported": true, - "uuid": "9ce27886-ad43-49db-943b-948573ebc375", + "uuid": "2b3f701c-188a-4390-94a5-b5d3781f54f9", "files": [], "subMetas": {}, "userData": { diff --git a/extensions/oops-framework/assets/core/network/HttpRequest.ts b/extensions/oops-framework/assets/libs/network/HttpRequest.ts similarity index 100% rename from extensions/oops-framework/assets/core/network/HttpRequest.ts rename to extensions/oops-framework/assets/libs/network/HttpRequest.ts diff --git a/extensions/oops-framework/assets/core/network/HttpRequest.ts.meta b/extensions/oops-framework/assets/libs/network/HttpRequest.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/HttpRequest.ts.meta rename to extensions/oops-framework/assets/libs/network/HttpRequest.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetInterface.ts b/extensions/oops-framework/assets/libs/network/NetInterface.ts similarity index 100% rename from extensions/oops-framework/assets/core/network/NetInterface.ts rename to extensions/oops-framework/assets/libs/network/NetInterface.ts diff --git a/extensions/oops-framework/assets/core/network/NetInterface.ts.meta b/extensions/oops-framework/assets/libs/network/NetInterface.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetInterface.ts.meta rename to extensions/oops-framework/assets/libs/network/NetInterface.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetManager.ts b/extensions/oops-framework/assets/libs/network/NetManager.ts similarity index 100% rename from extensions/oops-framework/assets/core/network/NetManager.ts rename to extensions/oops-framework/assets/libs/network/NetManager.ts diff --git a/extensions/oops-framework/assets/core/network/NetManager.ts.meta b/extensions/oops-framework/assets/libs/network/NetManager.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetManager.ts.meta rename to extensions/oops-framework/assets/libs/network/NetManager.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetNode.ts b/extensions/oops-framework/assets/libs/network/NetNode.ts similarity index 97% rename from extensions/oops-framework/assets/core/network/NetNode.ts rename to extensions/oops-framework/assets/libs/network/NetNode.ts index 196cf9d..a1c46ea 100644 --- a/extensions/oops-framework/assets/core/network/NetNode.ts +++ b/extensions/oops-framework/assets/libs/network/NetNode.ts @@ -1,5 +1,5 @@ import { error, warn } from "cc"; -import { Logger } from "../common/log/Logger"; +import { Logger } from "../../core/common/log/Logger"; import { CallbackObject, INetworkTips, IProtocolHelper, IRequestProtocol, ISocket, NetCallFunc, NetData, RequestObject } from "./NetInterface"; /* diff --git a/extensions/oops-framework/assets/core/network/NetNode.ts.meta b/extensions/oops-framework/assets/libs/network/NetNode.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetNode.ts.meta rename to extensions/oops-framework/assets/libs/network/NetNode.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetProtocolPako.ts b/extensions/oops-framework/assets/libs/network/NetProtocolPako.ts similarity index 100% rename from extensions/oops-framework/assets/core/network/NetProtocolPako.ts rename to extensions/oops-framework/assets/libs/network/NetProtocolPako.ts diff --git a/extensions/oops-framework/assets/core/network/NetProtocolPako.ts.meta b/extensions/oops-framework/assets/libs/network/NetProtocolPako.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetProtocolPako.ts.meta rename to extensions/oops-framework/assets/libs/network/NetProtocolPako.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetProtocolProtobuf.ts b/extensions/oops-framework/assets/libs/network/NetProtocolProtobuf.ts similarity index 100% rename from extensions/oops-framework/assets/core/network/NetProtocolProtobuf.ts rename to extensions/oops-framework/assets/libs/network/NetProtocolProtobuf.ts diff --git a/extensions/oops-framework/assets/core/network/NetProtocolProtobuf.ts.meta b/extensions/oops-framework/assets/libs/network/NetProtocolProtobuf.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetProtocolProtobuf.ts.meta rename to extensions/oops-framework/assets/libs/network/NetProtocolProtobuf.ts.meta diff --git a/extensions/oops-framework/assets/core/network/NetState.ts b/extensions/oops-framework/assets/libs/network/NetState.ts similarity index 93% rename from extensions/oops-framework/assets/core/network/NetState.ts rename to extensions/oops-framework/assets/libs/network/NetState.ts index 8c4d708..4aec535 100644 --- a/extensions/oops-framework/assets/core/network/NetState.ts +++ b/extensions/oops-framework/assets/libs/network/NetState.ts @@ -3,7 +3,7 @@ * web模式基于HTML5 API */ import { log, sys } from "cc"; -import { EventDispatcher } from "../common/event/EventDispatcher"; +import { EventDispatcher } from "../../core/common/event/EventDispatcher"; export enum NetworkEvent { /** 网络变化事件 */ diff --git a/extensions/oops-framework/assets/core/network/NetState.ts.meta b/extensions/oops-framework/assets/libs/network/NetState.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/NetState.ts.meta rename to extensions/oops-framework/assets/libs/network/NetState.ts.meta diff --git a/extensions/oops-framework/assets/core/network/WebSock.ts b/extensions/oops-framework/assets/libs/network/WebSock.ts similarity index 94% rename from extensions/oops-framework/assets/core/network/WebSock.ts rename to extensions/oops-framework/assets/libs/network/WebSock.ts index e015b7b..76b1074 100644 --- a/extensions/oops-framework/assets/core/network/WebSock.ts +++ b/extensions/oops-framework/assets/libs/network/WebSock.ts @@ -4,7 +4,7 @@ * @LastEditors: dgflash * @LastEditTime: 2021-11-04 17:33:02 */ -import { Logger } from "../common/log/Logger"; +import { Logger } from "../../core/common/log/Logger"; import { ISocket, MessageFunc, NetData } from "./NetInterface"; type Connected = (event: any) => void; diff --git a/extensions/oops-framework/assets/core/network/WebSock.ts.meta b/extensions/oops-framework/assets/libs/network/WebSock.ts.meta similarity index 100% rename from extensions/oops-framework/assets/core/network/WebSock.ts.meta rename to extensions/oops-framework/assets/libs/network/WebSock.ts.meta