mushroom
/
squidGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/xk/language' into dajun 

# Conflicts:
#	tgx-games-client/assets/Prefebs.meta
#	tgx-games-client/assets/Prefebs/role/Character001.prefab
#	tgx-games-client/assets/Prefebs/role/Character002.prefab
#	tgx-games-client/assets/Prefebs/role/Character003.prefab
#	tgx-games-client/assets/level1/Script/AreanPlayer.ts.meta
#	tgx-games-client/assets/level1/Script/BattleView.ts.meta
#	tgx-games-client/assets/level1/Script/PlayerController.ts
#	tgx-games-client/assets/level1/Script/WoodenManGame.ts.meta
#	tgx-games-client/assets/level1/Script/gameManager.ts
#	tgx-games-client/assets/level1/Script/player.ts
#	tgx-games-client/assets/level1/UI/图层 0.png.meta
#	tgx-games-client/assets/level1/scene/level1Scene.scene
#	tgx-games-client/assets/level3/scene/BallScene.scene
#	tgx-games-client/assets/level3/script/GameManager.ts
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_bluegray.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_red.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_yellow.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Button/btn_sqeure_01.png.meta
#	tgx-games-client/assets/module_arean/common/comUI/Label/label_tag_01_Demo.png.meta
#	tgx-games-client/assets/module_arean/common/role/doll.prefab
#	tgx-games-client/assets/module_arean/common/role/red_c.prefab
#	tgx-games-client/assets/module_arean/lobby_arean.scene
#	tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
#	tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
#	tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts
#	tgx-games-client/assets/module_arean/ui_searching_rival/ui_searching_rival.prefab
#	tgx-games-client/assets/module_basic/scripts/FrontConfig.ts
#	tgx-games-client/tsconfig.json
#	tgx-games-server/src/SrvGame/RoomArean.ts
#	tgx-games-server/src/db/mongodb/MongoDBHero.ts
#	tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
#	tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
This commit is contained in:
MushrooMagician 2025-02-21 14:15:16 +08:00
parent e11e4a25b9
commit b41f6e9453
9 changed files with 77 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tgx-games-client/assets/Prefebs.meta Normal file
View File

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "b53fd94c-6d04-4e1e-967b-a9962d5c56bd",
"files": [],
"subMetas": {},
"userData": {}
}

9
tgx-games-client/assets/Prefebs/role.meta Normal file
View File

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "f6db9553-6ca0-4260-9a81-f9cd1f0c53ad",
"files": [],
"subMetas": {},
"userData": {}
}

9
tgx-games-client/assets/level1/UI.meta Normal file
View File

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "085df255-5bfc-49de-a5cf-0a107a209406",
"files": [],
"subMetas": {},
"userData": {}
}

2
tgx-games-client/assets/level1/scene/level1Scene.scene
View File

@ -219,7 +219,7 @@
"node": { "node": {
"__id__": 5 "__id__": 5
}, },
"_enabled": true, "_enabled": false,
"__prefab": null, "__prefab": null,
"roleItem": { "roleItem": {
"__uuid__": "b91905ff-fb95-4680-bcd6-5603f2b07dee", "__uuid__": "b91905ff-fb95-4680-bcd6-5603f2b07dee",

1
tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
View File

@ -65,6 +65,7 @@ export class AreanGameScene extends Component {
assetManager.loadBundle("level1",()=>{ assetManager.loadBundle("level1",()=>{
director.loadScene("scene/level1Scene"); director.loadScene("scene/level1Scene");
tgxUIWaiting.hide(); tgxUIWaiting.hide();
this.onCompleteCallback();
}) })
} }

27
tgx-games-client/assets/module_arean/scripts/AreanManager.ts
View File

@ -1,5 +1,7 @@
import {AreanConfigManager} from "db://assets/module_arean/scripts/DataConfig/AreanConfigManager"; import {AreanConfigManager} from "db://assets/module_arean/scripts/DataConfig/AreanConfigManager";
import { BattleView } from "../../level1/Script/BattleView";
import { AreanPlayer } from "./AreanPlayer";
export class AreanManager { export class AreanManager {
@ -27,19 +29,18 @@ export class AreanManager {
public cfgMgr: AreanConfigManager = new AreanConfigManager(); public cfgMgr: AreanConfigManager = new AreanConfigManager();
private battleView: BattleView = null;
// private battleView: BattleView = null;
// get BattleView(): BattleView {
// get BattleView(): BattleView { return this.battleView;
// return this.battleView; }
// } set BattleView(value: BattleView) {
// set BattleView(value: BattleView) { this.battleView = value;
// this.battleView = value; }
// }
//
// player:AreanPlayer = null;
// player:AreanPlayer = null; playerGroup:AreanPlayer[] = [];
// playerGroup:AreanPlayer[] = [];
/** /**
* 初始化 * 初始化

46
tgx-games-client/settings/v2/packages/cocos-service.json
View File

@ -1,23 +1,23 @@
{ {
"__version__": "3.0.7", "__version__": "3.0.7",
"game": { "game": {
"name": "未知游戏", "name": "未知游戏",
"app_id": "UNKNOW", "app_id": "UNKNOW",
"c_id": "0" "c_id": "0"
}, },
"appConfigMaps": [ "appConfigMaps": [
{ {
"app_id": "UNKNOW", "app_id": "UNKNOW",
"config_id": "3e2173" "config_id": "3e2173"
} }
], ],
"configs": [ "configs": [
{ {
"app_id": "UNKNOW", "app_id": "UNKNOW",
"config_id": "3e2173", "config_id": "3e2173",
"config_name": "Default", "config_name": "Default",
"config_remarks": "", "config_remarks": "",
"services": [] "services": []
} }
] ]
} }

4
tgx-games-server/src/SrvGame/RoomArean.ts
View File

@ -493,8 +493,8 @@ export class RoomArean extends Room {
} }
this.updateGameStatus(stage.afterCard, 3); this.updateGameStatus(stage.afterCard, 3);
//生成战报 //生成战报，隐藏战斗
battleTime = this.battle(); //battleTime = this.battle();
} }
break; break;

9
tgx-games-server/src/shared/protocols/public/arean/AreanTypeDef.ts
View File

@ -557,11 +557,20 @@ export enum GameStage {
export enum stage { export enum stage {
await = 0, await = 0,
career = 1, career = 1,
/**
* 玩家选卡阶段，服务器接受玩家请求
*/
card = 2, card = 2,
/**
* 演出阶段，通知前端演出
*/
battle = 3, battle = 3,
equip = 4, equip = 4,
treasure = 5, treasure = 5,
end = 6, end = 6,
/**
* 演出前阶段，服务器计算所有玩家请求并发送给客户端全部玩家的数据
*/
afterCard = 7 afterCard = 7
} }