revert gameManager
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"ver": "4.0.23",
|
||||
"importer": "typescript",
|
||||
"imported": true,
|
||||
"uuid": "462c5922-0190-42df-a20e-963ccd552d2f",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
import { WsClient } from "tsrpc-browser";
|
||||
import { GameSystem } from "../scripts/shared/game/GameSystem";
|
||||
import { GameSystemState } from "../scripts/shared/game/GameSystemState";
|
||||
import { ClientInput, MsgGameInput } from "../scripts/shared/protocols/game/client/MsgGameInput";
|
||||
import { MsgGameStart } from "../scripts/shared/protocols/game/server/MsgGameStart";
|
||||
import { MsgServerFrame } from "../scripts/shared/protocols/game/server/MsgServerFrame";
|
||||
import { serviceProto, ServiceType } from "../scripts/shared/protocols/serviceProto";
|
||||
import { CurrentUser } from "../scripts/shared/types/CurrentUser";
|
||||
import { RoomState } from "../scripts/shared/types/RoomState";
|
||||
import { GameSystem } from "../script/shared/game/GameSystem";
|
||||
import { GameSystemState } from "../script/shared/game/GameSystemState";
|
||||
import { ClientInput, MsgGameInput } from "../script/shared/protocols/game/client/MsgGameInput";
|
||||
import { MsgGameStart } from "../script/shared/protocols/game/server/MsgGameStart";
|
||||
import { MsgServerFrame } from "../script/shared/protocols/game/server/MsgServerFrame";
|
||||
import { serviceProto, ServiceType } from "../script/shared/protocols/serviceProto";
|
||||
import { CurrentUser } from "../script/shared/types/CurrentUser";
|
||||
import { RoomState } from "../script/shared/types/RoomState";
|
||||
|
||||
/**
|
||||
* 前端游戏状态管理
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"ver": "4.0.23",
|
||||
"importer": "typescript",
|
||||
"imported": true,
|
||||
"uuid": "3a083653-ef15-4e15-a5a4-12b96b55a050",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import { _decorator, Component, Node, Collider, find, ITriggerEvent, Script } from 'cc';
|
||||
import { Collider, Component, ITriggerEvent, _decorator } from 'cc';
|
||||
import { Constant } from '../framework/constant';
|
||||
import { GameManager } from '../GameController';
|
||||
import { GameManager } from '../gameManager';
|
||||
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
@@ -55,7 +55,7 @@ export class bulletManager extends Component {
|
||||
//console.log("敌人子弹的位置",this.node.getPosition());
|
||||
|
||||
this.node.setPosition(this.node.position.x, this.node.position.y, this.node.position.z + 1);
|
||||
|
||||
|
||||
//地图边界值为100,即子弹到达屏幕外以后
|
||||
if (this.node.position.z >= 100) {
|
||||
if (this._bullet1) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import { _decorator, Component, Node, Collider, ITriggerEvent } from 'cc';
|
||||
import { Collider, Component, ITriggerEvent, _decorator } from 'cc';
|
||||
import { Constant } from '../framework/constant';
|
||||
import { GameManager } from '../GameController';
|
||||
import { GameManager } from '../gameManager';
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { _decorator, sys, log } from "cc";
|
||||
import { log, sys, _decorator } from "cc";
|
||||
import { Util } from './util';
|
||||
|
||||
const { ccclass, property } = _decorator;
|
||||
@@ -7,7 +7,7 @@ const { ccclass, property } = _decorator;
|
||||
export class StorageManager {
|
||||
private static _instance: StorageManager;
|
||||
|
||||
public static get instance () {
|
||||
public static get instance() {
|
||||
if (this._instance) {
|
||||
return this._instance;
|
||||
}
|
||||
@@ -17,13 +17,13 @@ export class StorageManager {
|
||||
return this._instance;
|
||||
}
|
||||
|
||||
private _jsonData: {[key: string]: any} = {};
|
||||
private _jsonData: { [key: string]: any } = {};
|
||||
private _path: any = null;
|
||||
private KEY_CONFIG: string = 'template';
|
||||
private _markSave: boolean = false;
|
||||
private _saveTimer: number = -1;
|
||||
|
||||
start () {
|
||||
start() {
|
||||
this._jsonData = {
|
||||
"userId": "",
|
||||
};
|
||||
@@ -49,14 +49,14 @@ export class StorageManager {
|
||||
if (content && content.length) {
|
||||
if (content.startsWith('@')) {
|
||||
content = content.substring(1);
|
||||
content = util.decrypt(content);
|
||||
content = Util.decrypt(content);
|
||||
}
|
||||
|
||||
try {
|
||||
//初始化操作
|
||||
var jsonData = JSON.parse(content);
|
||||
this._jsonData = jsonData;
|
||||
}catch (excepaiton) {
|
||||
} catch (excepaiton) {
|
||||
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ export class StorageManager {
|
||||
// }, 500);
|
||||
|
||||
//每隔5秒保存一次数据,主要是为了保存最新在线时间,方便离线奖励时间判定
|
||||
this._saveTimer = setInterval(() =>{
|
||||
this._saveTimer = setInterval(() => {
|
||||
this.scheduleSave();
|
||||
}, 5000);
|
||||
}
|
||||
@@ -78,8 +78,8 @@ export class StorageManager {
|
||||
* @param {string}key 关键字
|
||||
* @param {any}value 存储值
|
||||
*/
|
||||
setConfigDataWithoutSave (key: string, value: any) {
|
||||
let account: string= this._jsonData.userId;
|
||||
setConfigDataWithoutSave(key: string, value: any) {
|
||||
let account: string = this._jsonData.userId;
|
||||
if (this._jsonData[account]) {
|
||||
this._jsonData[account][key] = value;
|
||||
} else {
|
||||
@@ -87,12 +87,12 @@ export class StorageManager {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 存储配置文件,保存到本地
|
||||
* @param {string}key 关键字
|
||||
* @param {any}value 存储值
|
||||
*/
|
||||
setConfigData (key: string, value: any) {
|
||||
/**
|
||||
* 存储配置文件,保存到本地
|
||||
* @param {string}key 关键字
|
||||
* @param {any}value 存储值
|
||||
*/
|
||||
setConfigData(key: string, value: any) {
|
||||
this.setConfigDataWithoutSave(key, value);
|
||||
this._markSave = true; //标记为需要存储,避免一直在写入,而是每隔一段时间进行写入
|
||||
}
|
||||
@@ -102,7 +102,7 @@ export class StorageManager {
|
||||
* @param {string} key 关键字
|
||||
* @returns
|
||||
*/
|
||||
getConfigData (key: string) {
|
||||
getConfigData(key: string) {
|
||||
let account: string = this._jsonData.userId;
|
||||
if (this._jsonData[account]) {
|
||||
var value = this._jsonData[account][key];
|
||||
@@ -119,7 +119,7 @@ export class StorageManager {
|
||||
* @param {any}value 存储值
|
||||
* @returns
|
||||
*/
|
||||
public setGlobalData (key:string, value: any) {
|
||||
public setGlobalData(key: string, value: any) {
|
||||
this._jsonData[key] = value;
|
||||
this.save();
|
||||
}
|
||||
@@ -129,7 +129,7 @@ export class StorageManager {
|
||||
* @param {string} key 关键字
|
||||
* @returns
|
||||
*/
|
||||
public getGlobalData (key:string) {
|
||||
public getGlobalData(key: string) {
|
||||
return this._jsonData[key];
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@ export class StorageManager {
|
||||
* @param {any}value 存储值
|
||||
* @returns
|
||||
*/
|
||||
public setUserId (userId:string) {
|
||||
public setUserId(userId: string) {
|
||||
this._jsonData.userId = userId;
|
||||
if (!this._jsonData[userId]) {
|
||||
this._jsonData[userId] = {};
|
||||
@@ -152,7 +152,7 @@ export class StorageManager {
|
||||
* 获取用户唯一标示符
|
||||
* @returns {string}
|
||||
*/
|
||||
public getUserId () {
|
||||
public getUserId() {
|
||||
return this._jsonData.userId;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ export class StorageManager {
|
||||
* 定时存储
|
||||
* @returns
|
||||
*/
|
||||
public scheduleSave () {
|
||||
public scheduleSave() {
|
||||
if (!this._markSave) {
|
||||
return;
|
||||
}
|
||||
@@ -171,7 +171,7 @@ export class StorageManager {
|
||||
/**
|
||||
* 标记为已修改
|
||||
*/
|
||||
public markModified () {
|
||||
public markModified() {
|
||||
this._markSave = true;
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ export class StorageManager {
|
||||
* 保存配置文件
|
||||
* @returns
|
||||
*/
|
||||
public save () {
|
||||
public save() {
|
||||
// 写入文件
|
||||
var str = JSON.stringify(this._jsonData);
|
||||
|
||||
@@ -192,7 +192,7 @@ export class StorageManager {
|
||||
// let zipStr = str;
|
||||
|
||||
this._markSave = false;
|
||||
|
||||
|
||||
if (!sys.isNative) {
|
||||
var ls = sys.localStorage;
|
||||
ls.setItem(this.KEY_CONFIG, zipStr);
|
||||
@@ -201,6 +201,7 @@ export class StorageManager {
|
||||
|
||||
var valueObj: any = {};
|
||||
valueObj[this.KEY_CONFIG] = zipStr;
|
||||
// @ts-ignore
|
||||
jsb.fileUtils.writeToFile(valueObj, this._path);
|
||||
// jsb.fileUtils.writeToFile(valueObj);
|
||||
}
|
||||
@@ -209,9 +210,9 @@ export class StorageManager {
|
||||
* 获取配置文件路径
|
||||
* @returns 获取配置文件路径
|
||||
*/
|
||||
private _getConfigPath () {
|
||||
private _getConfigPath() {
|
||||
|
||||
let platform: any= sys.platform;
|
||||
let platform: any = sys.platform;
|
||||
|
||||
let path: string = "";
|
||||
|
||||
|
||||
@@ -761,11 +761,11 @@ export class Util {
|
||||
* 获取当前机型性能是否为低端机
|
||||
*/
|
||||
public static checkIsLowPhone(): Boolean {
|
||||
if (window.wx) {
|
||||
if ((window as any).wx) {
|
||||
//微信性能数值参考:https://developers.weixin.qq.com/minigame/dev/guide/performance/perf-benchmarkLevel.html
|
||||
|
||||
let nowBenchmarkLevel: number = -1; //nowBenchmarkLevel = -1性能未知
|
||||
const sys = window.wx.getSystemInfoSync();
|
||||
const sys = (window as any).wx.getSystemInfoSync();
|
||||
const isIOS = sys.system.indexOf('iOS') >= 0;
|
||||
if (isIOS) {
|
||||
//微信不支持IO性能等级
|
||||
|
||||
@@ -16,8 +16,8 @@ let _temp_quat = new Quat;
|
||||
|
||||
|
||||
|
||||
@ccclass('GameController')
|
||||
export class GameController extends Component {
|
||||
@ccclass('GameManager')
|
||||
export class GameManager extends Component {
|
||||
|
||||
@property(Node)
|
||||
public playerPlane: Node = null; //玩家飞机节点
|
||||
@@ -1,8 +1,7 @@
|
||||
|
||||
import { _decorator, Component, Node, Collider, ITriggerEvent, physics, PhysicsSystem, find, Game, Prefab, NodePool, instantiate, Vec2, Vec3, AudioSource } from 'cc';
|
||||
import { bulletManager } from '../bullet/bulletManager';
|
||||
import { AudioSource, Collider, Component, ITriggerEvent, Node, Vec3, _decorator } from 'cc';
|
||||
import { Constant } from '../framework/constant';
|
||||
import { GameManager } from '../GameController';
|
||||
import { GameManager } from '../gameManager';
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
|
||||
@@ -18,7 +17,7 @@ export class enemyPlane extends Component {
|
||||
@property
|
||||
public enemyBulletSpeed: number = 60;
|
||||
@property(AudioSource)
|
||||
public audio:AudioSource = null!
|
||||
public audio: AudioSource = null!
|
||||
|
||||
private _enemyplane;
|
||||
private _isDie: boolean = false;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import { _decorator, Component, Node, Collider, ITriggerEvent } from 'cc';
|
||||
import { Constant } from '../framework/constant';
|
||||
import { GameManager } from '../GameController';
|
||||
import { GameManager } from '../gameManager';
|
||||
|
||||
const { ccclass, property } = _decorator;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"ver": "1.1.0",
|
||||
"importer": "directory",
|
||||
"imported": true,
|
||||
"uuid": "5fd42ea5-0316-4e48-86e1-1bcdba894b1c",
|
||||
"uuid": "f2949899-5bbd-4e1e-b02a-f763b5978ef9",
|
||||
"files": [],
|
||||
"subMetas": {},
|
||||
"userData": {
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
import { _decorator, Component, Node, UITransform, Vec2, Vec3, find, Script, game, Label, CameraComponent, Camera, EventTouch, v3 } from 'cc';
|
||||
import { GameManager } from '../GameController';
|
||||
import { GameManager } from '../gameManager';
|
||||
import { MovingSceneBg } from './common/movingSceneBg';
|
||||
import { Tips } from './common/tips';
|
||||
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
"uuid": "c794458c-05f6-4c9f-909b-20d54897d219",
|
||||
"version": "3.4.0",
|
||||
"dependencies": {
|
||||
"seedrandom": "^3.0.5",
|
||||
"tsrpc-browser": "^3.1.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/seedrandom": "^3.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
/* Add your custom configuration here. */
|
||||
"compilerOptions": {
|
||||
"strict": false,
|
||||
"allowSyntheticDefaultImports": true
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"skipLibCheck": true
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user