暂存

Merge branch 'main' into feature/xk/game
提交内容：
2025-02-21 10:51:34 +08:00 · 2025-02-21 09:24:15 +08:00 · 2025-02-21 09:23:45 +08:00 · 2025-02-12 11:22:14 +08:00 · 2025-02-12 11:21:25 +08:00
9 changed files with 156 additions and 32 deletions
--- a/tgx-games-client/assets/GameRes/scene_res/game4/model/game4.fbx.meta
+++ b/tgx-games-client/assets/GameRes/scene_res/game4/model/game4.fbx.meta
@ -77,6 +77,86 @@
      ],
      "subMetas": {}
    },
+    "425ef": {
+      "importer": "gltf-embeded-image",
+      "uuid": "b96ee992-bd40-4505-acc7-93faabe4b8a0@425ef",
+      "displayName": "",
+      "id": "425ef",
+      "name": "贴图 #2.image",
+      "userData": {
+        "gltfIndex": 0,
+        "fixAlphaTransparencyArtifacts": true,
+        "hasAlpha": true,
+        "type": "texture"
+      },
+      "ver": "1.0.3",
+      "imported": true,
+      "files": [
+        ".json",
+        ".png"
+      ],
+      "subMetas": {}
+    },
+    "1cdc4": {
+      "importer": "gltf-embeded-image",
+      "uuid": "b96ee992-bd40-4505-acc7-93faabe4b8a0@1cdc4",
+      "displayName": "",
+      "id": "1cdc4",
+      "name": "贴图 #3.image",
+      "userData": {
+        "gltfIndex": 1,
+        "fixAlphaTransparencyArtifacts": true,
+        "hasAlpha": true,
+        "type": "texture"
+      },
+      "ver": "1.0.3",
+      "imported": true,
+      "files": [
+        ".json",
+        ".png"
+      ],
+      "subMetas": {}
+    },
+    "181cb": {
+      "importer": "gltf-embeded-image",
+      "uuid": "b96ee992-bd40-4505-acc7-93faabe4b8a0@181cb",
+      "displayName": "",
+      "id": "181cb",
+      "name": "贴图 #4.image",
+      "userData": {
+        "gltfIndex": 2,
+        "fixAlphaTransparencyArtifacts": true,
+        "hasAlpha": true,
+        "type": "texture"
+      },
+      "ver": "1.0.3",
+      "imported": true,
+      "files": [
+        ".json",
+        ".png"
+      ],
+      "subMetas": {}
+    },
+    "c4b7a": {
+      "importer": "gltf-embeded-image",
+      "uuid": "b96ee992-bd40-4505-acc7-93faabe4b8a0@c4b7a",
+      "displayName": "",
+      "id": "c4b7a",
+      "name": "贴图 #6.image",
+      "userData": {
+        "gltfIndex": 3,
+        "fixAlphaTransparencyArtifacts": true,
+        "hasAlpha": true,
+        "type": "texture"
+      },
+      "ver": "1.0.3",
+      "imported": true,
+      "files": [
+        ".json",
+        ".png"
+      ],
+      "subMetas": {}
+    },
    "59f96": {
      "importer": "texture",
      "uuid": "b96ee992-bd40-4505-acc7-93faabe4b8a0@59f96",
@ -90,8 +170,8 @@
        "magfilter": "linear",
        "mipfilter": "none",
        "anisotropy": 0,
-        "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/GameRes/scene_res/game4/texture/game4_1.png"
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@425ef"
      },
      "ver": "1.0.22",
      "imported": true,
@ -113,8 +193,8 @@
        "magfilter": "linear",
        "mipfilter": "none",
        "anisotropy": 0,
-        "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/GameRes/scene_res/game4/texture/game4_2.png"
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@1cdc4"
      },
      "ver": "1.0.22",
      "imported": true,
@ -136,8 +216,8 @@
        "magfilter": "linear",
        "mipfilter": "none",
        "anisotropy": 0,
-        "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/GameRes/scene_res/game4/texture/game4_3.png"
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@181cb"
      },
      "ver": "1.0.22",
      "imported": true,
@ -159,8 +239,8 @@
        "magfilter": "linear",
        "mipfilter": "none",
        "anisotropy": 0,
-        "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/GameRes/scene_res/game4/texture/game4_4.png"
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@c4b7a"
      },
      "ver": "1.0.22",
      "imported": true,
@ -254,19 +334,19 @@
    "imageMetas": [
      {
        "name": "贴图 #2",
-        "uri": "db://assets/GameRes/scene_res/game4/texture/game4_1.png"
+        "uri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@425ef"
      },
      {
        "name": "贴图 #3",
-        "uri": "db://assets/GameRes/scene_res/game4/texture/game4_2.png"
+        "uri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@1cdc4"
      },
      {
        "name": "贴图 #4",
-        "uri": "db://assets/GameRes/scene_res/game4/texture/game4_3.png"
+        "uri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@181cb"
      },
      {
        "name": "贴图 #6",
-        "uri": "db://assets/GameRes/scene_res/game4/texture/game4_4.png"
+        "uri": "b96ee992-bd40-4505-acc7-93faabe4b8a0@c4b7a"
      }
    ],
    "fbx": {
--- a/tgx-games-client/assets/module_arean/Define.meta
+++ b/tgx-games-client/assets/module_arean/Define.meta
@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "85ed63ec-135a-40dd-a689-ef3a4c3b08d4",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/tgx-games-client/assets/module_arean/Define/GameDefine.ts
+++ b/tgx-games-client/assets/module_arean/Define/GameDefine.ts
@ -0,0 +1,17 @@
+/************************************************************************************
+
+ * FileName    : GameDefine.ts
+ * Description :
+ * Version     : v1.0.0
+ * CreateTime  : 2025-02-21 09:46:26
+ * Author      :
+ * Copyright (c) since 2025
+ * ==============================================================
+ * Method Description:
+ *
+ * ==============================================================
+ ************************************************************************************/
+export enum EGameDefine{
+    /** 匹配花费 */
+    GameMatchCost = 100,
+}
--- a/tgx-games-client/assets/module_arean/Define/GameDefine.ts.meta
+++ b/tgx-games-client/assets/module_arean/Define/GameDefine.ts.meta
@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "008bcc9e-5467-443b-bbd1-76c6843796d0",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
+++ b/tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
@ -1,6 +1,14 @@
 import {_decorator, Component, director, instantiate, JsonAsset, Label, Node, Prefab, tween, v3, SpriteFrame, Sprite, PageView, Input, EventTouch} from 'cc';
 import {UserMgr} from '../../module_basic/scripts/UserMgr';
-import {tgxAudioMgr, tgxModuleContext, tgxSceneUtil, tgxUIAlert, tgxUIMgr, tgxUIWaiting} from '../../core_tgx/tgx';
+import {
+    tgxAudioMgr,
+    tgxModuleContext,
+    tgxSceneUtil,
+    tgxUIAlert,
+    tgxUIMgr,
+    tgxUITipsBar,
+    tgxUIWaiting
+} from '../../core_tgx/tgx';
 import {SceneDef} from '../../scripts/SceneDef';
 import {SceneUtil} from '../../core_tgx/base/SceneUtils';
 import {UI_SearchingRival} from 'db://assets/module_arean/ui_searching_rival/UI_SearchingRival';
@ -22,6 +30,7 @@ import {UIMail} from "db://assets/module_arean/ui_mail/UIMail";
 import {UIMoreModel} from "db://assets/module_arean/ui_more_model/UIMoreModel";
 import { UIShopScreen } from '../shop/ui_shop/UIShopScreen';
 import {UISettings} from "db://assets/module_arean/ui_settings/UISettings";
+import {EGameDefine} from "db://assets/module_arean/Define/GameDefine";

 const { ccclass, property } = _decorator;

@ -182,19 +191,20 @@ export class AreanLobbyScene extends Component {
        if(!this._canClick) return;
        this._canClick = false;
        tgxAudioMgr.inst.playCommonBtn(EMusicDefine.EFFECT_CLICK);
+        let curCoin = UserMgr.inst.userInfo.coin;
+        if(curCoin < EGameDefine.GameMatchCost){
+            tgxUITipsBar.show("金币不足，请前往商店购买!");
+            this._canClick = true;
+            return;
+        }
        this._updateFightModel();
-        // if(UserLocalCache.inst.fightModel === EFightModel.Match){
-        //     tgxUIAlert.show("研发团队加班中，敬请期待!");
-        // }else{
-            tgxUIWaiting.hide();
-            tgxUIMgr.inst.showUI(UI_SearchingRival, (ui: UI_SearchingRival) => {
-                this.scheduleOnce(() => {
-                    ui.startMatch('arean',this.loadGame);
-                    this.setCanClick(true);
-                }, 1.5);
-            });
-        // }
-        // director.loadScene(SceneDef.Arean.name);
+        tgxUIWaiting.hide();
+        tgxUIMgr.inst.showUI(UI_SearchingRival, (ui: UI_SearchingRival) => {
+            this.scheduleOnce(() => {
+                ui.startMatch('arean',this.loadGame);
+                this.setCanClick(true);
+            }, 1.5);
+        });
    }

    private async loadGame(params?: any) {
--- a/tgx-games-client/assets/module_basic/scripts/UserMgr.ts
+++ b/tgx-games-client/assets/module_basic/scripts/UserMgr.ts
@ -401,8 +401,9 @@ export class UserMgr {
    }

    async rpc_QuickPlay(type: string, immediate?: boolean) {
-        console.log("rpc_QuickPlay----快速游戏", type, immediate);
+        console.log("rpc_QuickPlay----快速游戏001", type, immediate);
        let ret = await NetGameServer.inst.callApi("lobby/StartMatch", { type: type, immediate: immediate,gameModel:UserLocalCache.inst.fightModel });
+        console.log("rpc_QuickPlay----快速游戏002", ret);
        return ret;
    }

--- a/tgx-games-server/src/db/mongodb/MongoDBHero.ts
+++ b/tgx-games-server/src/db/mongodb/MongoDBHero.ts
@ -21,11 +21,9 @@ import {IPropCfg} from "../../shared/configs/interface/IPropCfg";

 const schema = new mongoose.Schema<DBHeroInfo>({
    heroId : {
-        type : Number,
-        index: { unique: false }},
+        type : Number},
    playerId : {
-        type: String,
-        index: { unique: false }  // 不需要唯一索引，因为玩家 ID 可能在玩家表中不是索引
+        type: String
    },
    level : {type : Number,required: true,default : 0},
    skinId : {type : Number,required: true,default : 0},
--- a/tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
+++ b/tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
@ -2,7 +2,7 @@
  "ver": "2.0.1",
  "importer": "json",
  "imported": true,
-  "uuid": "5566689f-43df-438d-905d-58e620e7b768",
+  "uuid": "951ae3a7-94fb-4562-8ee2-c0ba1a5d4eb9",
  "files": [
    ".json"
  ],
--- a/tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
+++ b/tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
@ -2,7 +2,7 @@
  "ver": "4.0.24",
  "importer": "typescript",
  "imported": true,
-  "uuid": "a98382da-b005-4eb2-bfb1-83884fce3af2",
+  "uuid": "efd788be-293b-4be1-877d-5a926a18a3e9",
  "files": [],
  "subMetas": {},
  "userData": {}
Author	SHA1	Message	Date
xukuan	fa81645638	暂存	2025-02-21 10:51:34 +08:00
xukuan	31cbb3f511	Merge branch 'main' into feature/xk/game	2025-02-21 09:24:15 +08:00
xukuan	4e97d84926	提交内容：	2025-02-21 09:23:45 +08:00
MushrooMagician	d128078e84	Merge branch 'main' of http://chengchennet.cn:3000/mushroom/squidGame # Conflicts: # tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta # tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta	2025-02-12 11:22:14 +08:00
MushrooMagician	d204e3a061	表更新	2025-02-12 11:21:25 +08:00