打包成功

idiom/assets/Scripts/Hall.ts

@@ -1,35 +0,0 @@
-import { _decorator, Component, director, Node } from 'cc';
-import { UI_Hall } from '../module_game/ui/UI_Hall/UI_Hall';
-import { gui } from '../core/ui/ui';
-import PlayerData from '../module_game/game/PlayerData';
-import { ch } from '../ch/ch';
-import get_new_head_icon from '../core/util_class/HeadIcon';
-const { ccclass, property } = _decorator;
-
-@ccclass('Hall')
-export class Hall extends Component {
-    private static instance: Hall;
-    public player:PlayerData;
-    public head_icon=get_new_head_icon();
-
-    public static getInstance():Hall{
-        return Hall.instance;
-    }
-
-    start() {
-        if(!Hall.instance){
-            Hall.instance=this;
-        }
-        gui.show(UI_Hall);
-        director.addPersistRootNode(this.node);
-        this.init();
-    }
-
-    async init(){
-        this.player = PlayerData.getInstance(ch.sdk.get_gid(), ch.sdk.get_uid().toString());
-        this.player.init_user_info();
-        await this.player.load();
-    }
-}
-
-

idiom/assets/module_basic/ui_notify/UINotify.ts

@@ -29,7 +29,7 @@ class NotifyInfo {
       node.active = true;
    }
    public up(): void {
-      this.node.setPosition(this.node.position.x, this.node.position.y + NotifyInfo.up_y, this.node.position.z);
+      // this.node.setPosition(this.node.position.x, this.node.position.y + NotifyInfo.up_y, this.node.position.z);
    }
    public run(dt: number): boolean {
       this.time -= dt;

idiom/assets/Scripts/Container_Manager.ts → idiom/assets/module_game/game/Container_Manager.ts

@@ -1,15 +1,15 @@
 import { _decorator, BoxCollider, Component, find, instantiate, Node, NodePool, Prefab, Quat, random, RigidBody } from 'cc';
-import ch_util from '../ch/ch_util';
-
+import ch_util from '../../ch/ch_util';
+import { gui } from '../../core/ui/ui';
+import { table_idiom } from '../../module_extra/table_ts/table_idiom';
+import { table_level } from '../../module_extra/table_ts/table_level';
+import { Hall } from '../hall/Hall';
+import { UI_Idioms } from '../ui/UI_Idioms/UI_Idioms';
+import { UI_Main } from '../ui/UI_Main/UI_Main';
 import { CreateIdiom } from './CreateIdiom';
 import { Cube_Infor, Cube_State } from './Cube_Infor';
-import { UI_Idioms } from '../module_game/ui/UI_Idioms/UI_Idioms';
-import { gui } from '../core/ui/ui';
 import { GameCtl } from './GameCtl';
-import { UI_Main } from '../module_game/ui/UI_Main/UI_Main';
-import { table_level } from '../module_extra/table_ts/table_level';
-import { Hall } from './Hall';
-import { table_idiom } from '../module_extra/table_ts/table_idiom';
+
 const { ccclass, property } = _decorator;
 
 @ccclass('Container_Manager')
@@ -36,11 +36,12 @@ export class Container_Manager extends Component {
     Cube_Pool: NodePool = new NodePool();
     nodeReferences: Node[] = []; // 额外维护的节点引用数组
 
+    count:number=0;
+
     private instantiateCube() {
         for (let i = 0; i < this.idioms.length * 2; i++) {
             const newCube = instantiate(this.prefab);
             newCube.active = true; // 初始时设置为非激活状态
-
             // 按顺序为节点赋值文字内容
             let idiomIndex = Math.floor(i / 2);
             let isPiece1 = i % 2 === 0;
@@ -49,7 +50,6 @@ export class Container_Manager extends Component {
                 : this.idioms[idiomIndex].piece_2_word;
 
             console.log("生成第" + i + "个节点:" + newCube.getComponent(Cube_Infor).Text);
-
             this.Cube_Pool.put(newCube);
         }
     }
@@ -232,7 +232,7 @@ export class Container_Manager extends Component {
 
             console.log("最终选中的成语：", this.idioms); // 打印最终的成语数组
         }
-
+        this.count=this.level_config[level].count;
 
 
         await this.instantiateCube();
@@ -343,7 +343,7 @@ export class Container_Manager extends Component {
                 this.recycleCube(node); // 回收到池中
             }
         });
-
+        this.shufflePool();
         // 等待节点移动完成后执行后续逻辑
         await this.create_node.nodeMoving();
     }
@@ -362,6 +362,27 @@ export class Container_Manager extends Component {
 
         gui.get(UI_Idioms).all_light_Hide();
     }
+
+    private shufflePool() {
+        const poolSize = this.Cube_Pool.size();
+        const tempArray = [];
+    
+        // 从池中取出所有节点到临时数组
+        for (let i = 0; i < poolSize; i++) {
+            tempArray.push(this.Cube_Pool.get());
+        }
+    
+        // 只打乱部分节点（以 50% 为例，可调整比例）
+        const shuffleCount = Math.ceil(poolSize * 0.5); // 只打乱前 50%
+        for (let i = 0; i < shuffleCount; i++) {
+            const randomIndex = Math.floor(Math.random() * poolSize);
+            [tempArray[i], tempArray[randomIndex]] = [tempArray[randomIndex], tempArray[i]];
+        }
+    
+        // 将打乱的节点放回池中
+        tempArray.forEach(cube => this.Cube_Pool.put(cube));
+    }
+    
 }
 
 

idiom/assets/Scripts/GameCtl.ts → idiom/assets/module_game/game/GameCtl.ts

@@ -1,9 +1,10 @@
 import { _decorator, BoxCollider, Camera, Component, director, EventTouch, find, Game, geometry, Layers, Node, PhysicsSystem, Quat, RigidBody, Size, tween, UITransform, v3, Vec3 } from 'cc';
-import { Cube_Infor, Cube_State } from './Cube_Infor';
+import { gui } from '../../core/ui/ui';
+import { UI_Idioms } from '../ui/UI_Idioms/UI_Idioms';
+import { UI_Main } from '../ui/UI_Main/UI_Main';
 import { Container_Manager } from './Container_Manager';
-import { UI_Idioms } from '../module_game/ui/UI_Idioms/UI_Idioms';
-import { gui } from '../core/ui/ui';
-import { UI_Main } from '../module_game/ui/UI_Main/UI_Main';
+import { Cube_Infor, Cube_State } from './Cube_Infor';
+
 
 const { ccclass, property } = _decorator;
 

idiom/assets/module_game/game/PlayerData.ts

@@ -3,7 +3,6 @@ import { gui } from "../../core/ui/ui";
 import { Container } from "../../core/util_class/Container";
 import GameData from "../../core/util_class/GameData";
 import { UINotify } from "../../module_basic/ui_notify/UINotify";
-import { Hall } from "../../Scripts/Hall";
 import { Start } from "../../start/Start";
 import { Layout_Main } from "../ui/UI_Main/Layout_Main";
 import { UI_Main } from "../ui/UI_Main/UI_Main";

idiom/assets/module_game/game/game.scene

@@ -328,7 +328,7 @@
     "node": {
       "__id__": 7
     },
-    "_enabled": false,
+    "_enabled": true,
     "__prefab": null,
     "_materials": [
       {
@@ -570,7 +570,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_group": 8,
+    "_group": 4,
     "_type": 2,
     "_mass": 1,
     "_allowSleep": true,
@@ -675,7 +675,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_group": 8,
+    "_group": 4,
     "_type": 2,
     "_mass": 1,
     "_allowSleep": true,
@@ -780,7 +780,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_group": 8,
+    "_group": 4,
     "_type": 2,
     "_mass": 1,
     "_allowSleep": true,
@@ -885,7 +885,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_group": 8,
+    "_group": 4,
     "_type": 2,
     "_mass": 1,
     "_allowSleep": true,

idiom/assets/module_game/hall/Hall.ts

@@ -0,0 +1,49 @@
+import { _decorator, Component, director, Node } from 'cc';
+import { ch } from '../../ch/ch';
+import { gui } from '../../core/ui/ui';
+import get_new_head_icon from '../../core/util_class/HeadIcon';
+import PlayerData from '../game/PlayerData';
+import { UI_Hall } from '../ui/UI_Hall/UI_Hall';
+import TableLoadUtil from '../../core/util/TableLoadUtil';
+import { TableUtil } from '../../module_extra/table_ts/TableUtil';
+import { ModuleDef } from '../../Scripts/ModuleDef';
+
+const { ccclass, property } = _decorator;
+
+@ccclass('Hall')
+export class Hall extends Component {
+    private static instance: Hall;
+    public player:PlayerData;
+    public head_icon=get_new_head_icon();
+
+    public static getInstance():Hall{
+        return Hall.instance;
+    }
+
+    start() {
+        if(!Hall.instance){
+            Hall.instance=this;
+        }
+        gui.show(UI_Hall);
+        director.addPersistRootNode(this.node);
+        this.init();
+        this.loadTable();
+    }
+
+    async init(){
+        this.player = PlayerData.getInstance(ch.sdk.get_gid(), ch.sdk.get_uid().toString());
+        this.player.init_user_info();
+        await this.player.load();
+    }
+
+
+    private loadTable(): void {
+        // ch.log.log_start("加载配置初始化");
+        TableLoadUtil.preloadAll(ModuleDef.EXTRA, "table_json", async () => {
+            // this.onPreloadingComplete();
+            console.log("加载配置初始化完成");
+        }, TableUtil.set);
+    }
+}
+
+

idiom/assets/module_game/ui/UI/UI_Head_Icon.ts

@@ -1,5 +1,6 @@
 import { _decorator, Component, Node, Sprite, SpriteFrame } from 'cc';
-import { Hall } from 'db://assets/Scripts/Hall';
+import { Hall } from '../../hall/Hall';
+
 const { ccclass, property } = _decorator;
 
 @ccclass('UI_Head_Icon')

idiom/assets/module_game/ui/UI/UI_Item.ts

@@ -2,11 +2,12 @@ import { _decorator, Button, Component, instantiate, Label, Node, Sprite, Sprite
 import { Enum } from 'cc';
 import { ch } from '../../../ch/ch';
 import { gui } from '../../../core/ui/ui';
-import { UIAlert } from '../../../module_basic/ui_alert/UIAlert';
 import { UINotify } from '../../../module_basic/ui_notify/UINotify';
-import { Hall } from 'db://assets/Scripts/Hall';
+
 import { UI_Main } from '../UI_Main/UI_Main';
 import { Layout_Main } from '../UI_Main/Layout_Main';
+import { Hall } from '../../hall/Hall';
+
 // import { GameLink } from '../../game/GameLink';
 // import { UI_ad_get } from '../ad_get/UI_ad_get';
 // import { LvDir } from '../../game/Lv';

idiom/assets/module_game/ui/UI_Fail/Layout_Fail.ts

@@ -1,5 +1,6 @@
 import { _decorator, Button, Component, Label, Node, ProgressBar } from 'cc';
-import { Container_Manager } from '../../../Scripts/Container_Manager';
+import { Container_Manager } from '../../game/Container_Manager';
+
 
 const { ccclass, property } = _decorator;
 

idiom/assets/module_game/ui/UI_Fail/UI_Fail.ts

@@ -1,14 +1,13 @@
 import { _decorator, Component, find, Node } from 'cc';
 import { Layout_Fail } from './Layout_Fail';
-import { UI_Main } from '../UI_Main/UI_Main';
 import { UI_Hall } from '../UI_Hall/UI_Hall';
-import { UI_Idioms } from '../UI_Idioms/UI_Idioms';
 import { GameUILayers, gui } from '../../../core/ui/ui';
 import ui_base from '../../../core/ui/ui_base';
 import { ResUtil } from '../../../core/util/ResUtil';
-import { Container_Manager } from '../../../Scripts/Container_Manager';
+
 import { ModuleDef } from '../../../Scripts/ModuleDef';
 import { SceneDef } from '../../../Scripts/SceneDef';
+import { Container_Manager } from '../../game/Container_Manager';
 const { ccclass, property } = _decorator;
 
 @ccclass('UI_Fail')
@@ -34,7 +33,7 @@ export class UI_Fail extends ui_base {
             ResUtil.loadScene(SceneDef.Hall, ModuleDef.GAME, true);
         }, this);
 
-        layout.progressBar.progress = (layout.Container.index.length -layout.Container.idioms.length) / layout.Container.index.length;
+        layout.progressBar.progress = (layout.Container.count -layout.Container.idioms.length) / layout.Container.count;
         layout.Num.string = layout.progressBar.progress * 100 + '%';
     }
 }

idiom/assets/module_game/ui/UI_Idioms/Layout_Idioms.ts

@@ -1,6 +1,6 @@
 import { _decorator, Component, Node, Prefab, ScrollView } from 'cc';
-import { UI_Idiom } from './UI_Idiom';
-import { Container_Manager } from '../../../Scripts/Container_Manager';
+
+import { Container_Manager } from '../../game/Container_Manager';
 
 const { ccclass, property } = _decorator;
 

idiom/assets/module_game/ui/UI_Idioms/ScrollView.prefab

@@ -49,7 +49,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 545,
+      "y": 88,
       "z": 0
     },
     "_lrot": {

idiom/assets/module_game/ui/UI_Idioms/UI_Idioms.ts

@@ -3,9 +3,9 @@ import { UI_Idiom } from './UI_Idiom';
 import { Layout_Idioms } from './Layout_Idioms';
 import { GameUILayers } from '../../../core/ui/ui';
 import ui_base from '../../../core/ui/ui_base';
-import { Container_Manager } from '../../../Scripts/Container_Manager';
-import { Cube_Infor } from '../../../Scripts/Cube_Infor';
 import { ModuleDef } from '../../../Scripts/ModuleDef';
+import { Container_Manager } from '../../game/Container_Manager';
+import { Cube_Infor } from '../../game/Cube_Infor';
 
 const { ccclass, property } = _decorator;
 

idiom/assets/module_game/ui/UI_Main/Layout_Main.ts

@@ -1,5 +1,7 @@
-import { _decorator, Button, Component, Label, Node } from 'cc';
-import { Container_Manager } from 'db://assets/Scripts/Container_Manager';
+import { _decorator, Button, Component, find, Label, Node } from 'cc';
+import { Container_Manager } from '../../game/Container_Manager';
+
+
 const { ccclass, property } = _decorator;
 
 @ccclass('Layout_Main')
@@ -23,7 +25,11 @@ export class Layout_Main extends Component {
 
     time:number;
 
-    Container:Container_Manager
+    Container:Container_Manager;
+
+    protected start(): void {
+        this.Container = find('Container').getComponent(Container_Manager);
+    }
 }
 
 

idiom/assets/module_game/ui/UI_Main/UI_Main.ts

@@ -2,8 +2,7 @@ import { _decorator, find,Node } from "cc";
 import { ch } from "../../../ch/ch";
 import { GameUILayers, gui } from "../../../core/ui/ui";
 import ui_base from "../../../core/ui/ui_base";
-import { Container_Manager } from "../../../Scripts/Container_Manager";
-import { Hall } from "../../../Scripts/Hall";
+
 import { ModuleDef } from "../../../Scripts/ModuleDef";
 import { UI_Fail } from "../UI_Fail/UI_Fail";
 import { UI_GameRules } from "../UI_GameRules/UI_GameRules";
@@ -11,6 +10,8 @@ import { UI_Idioms } from "../UI_Idioms/UI_Idioms";
 import { UI_Settings } from "../UI_Settings/UI_Settings";
 import { UI_Win } from "../UI_Win/UI_Win";
 import { Layout_Main } from "./Layout_Main";
+import { Container_Manager } from "../../game/Container_Manager";
+import { Hall } from "../../hall/Hall";
 
 const { ccclass, property } = _decorator;
 
@@ -111,7 +112,7 @@ export class UI_Main extends ui_base {
     }
 }
 
-
 export function ani_ui(node: Node, end: number = 1.0): void {
     gui.scale_elasticOut_anim(node, 1.2, 0.5, end);
 }
+

idiom/assets/module_game/ui/UI_Rank/Layout_Rank.ts

@@ -1,6 +1,6 @@
 import { _decorator, Button, Component, Node, Toggle } from 'cc';
-import List from 'db://assets/core/util_comp/List';
 import { UI_Rank_Item } from './UI_Rank_Item';
+import List from '../../../core/util_comp/List';
 const { ccclass, property } = _decorator;
 
 @ccclass('Layout_Rank')

idiom/assets/module_game/ui/UI_Rank/UI_Rank.ts

@@ -1,13 +1,15 @@
 import { _decorator, Toggle,Node } from "cc";
-import { WECHAT } from "cc/env";
 import { GameUILayers, gui } from "../../../core/ui/ui";
 import ui_base from "../../../core/ui/ui_base";
 import { UIWaiting } from "../../../module_basic/ui_waiting/UIWaiting";
-import { Hall } from "../../../Scripts/Hall";
+
 import { ModuleDef } from "../../../Scripts/ModuleDef";
-import { ani_ui } from "../UI_Main/UI_Main";
 import { Layout_Rank } from "./Layout_Rank";
 import { UI_Rank_Item } from "./UI_Rank_Item";
+import { ani_ui } from "../UI_Main/UI_Main";
+import { Hall } from "../../hall/Hall";
+
+
 
 const { ccclass, property } = _decorator;
 
@@ -89,12 +91,6 @@ export class UI_Rank extends ui_base {
             gui.close(UIWaiting);
         }
     }
-
-    private _reportUserLevel(level: number, listener?: Function, target?: any) {
-        if (!WECHAT) {
-            return;
-        }
-    }
 }
 
 

idiom/assets/module_game/ui/UI_Rank/UI_Rank_Item.ts

@@ -1,6 +1,6 @@
 import { _decorator, Component, Label, Node, Sprite, SpriteFrame } from 'cc';
-import { ch } from 'db://assets/ch/ch';
 import { UI_Head_Icon } from '../UI/UI_Head_Icon';
+import { ch } from '../../../ch/ch';
 const { ccclass, property } = _decorator;
 
 @ccclass('UI_Rank_Item')

idiom/assets/module_game/ui/UI_Sign/Sign_Reward.ts

@@ -1,7 +1,9 @@
 import { _decorator, Component, Node } from 'cc';
-import ch_sign from 'db://assets/ch/sign/sign';
-import { UINotify } from 'db://assets/module_basic/ui_notify/UINotify';
-import { Hall } from 'db://assets/Scripts/Hall';
+import ch_sign from '../../../ch/sign/sign';
+import { UINotify } from '../../../module_basic/ui_notify/UINotify';
+import { Hall } from '../../hall/Hall';
+
+
 const { ccclass, property } = _decorator;
 
 @ccclass('Sign_Reward')

idiom/assets/module_game/ui/UI_Sign/UI_Sign.ts

@@ -3,10 +3,11 @@ import ch_sign from "../../../ch/sign/sign";
 import { GameUILayers, gui } from "../../../core/ui/ui";
 import ui_base from "../../../core/ui/ui_base";
 import { UINotify } from "../../../module_basic/ui_notify/UINotify";
-import { Hall } from "../../../Scripts/Hall";
+
 import { ModuleDef } from "../../../Scripts/ModuleDef";
 import { ani_ui } from "../UI_Main/UI_Main";
 import { Layout_Sign } from "./Layout_Sign";
+import { Hall } from "../../hall/Hall";
 
 const { ccclass, property } = _decorator;
 

idiom/assets/module_game/ui/UI_Win/Layout_Win.ts

@@ -1,5 +1,6 @@
 import { _decorator, Button, Component, Node } from 'cc';
-import { Container_Manager } from 'db://assets/Scripts/Container_Manager';
+import { Container_Manager } from '../../game/Container_Manager';
+
 const { ccclass, property } = _decorator;
 
 @ccclass('Layout_Win')

idiom/assets/module_game/ui/UI_Win/UI_Win.ts

@@ -2,12 +2,13 @@ import { _decorator, find } from "cc";
 import { GameUILayers, gui } from "../../../core/ui/ui";
 import ui_base from "../../../core/ui/ui_base";
 import { ResUtil } from "../../../core/util/ResUtil";
-import { Container_Manager } from "../../../Scripts/Container_Manager";
+
 import { ModuleDef } from "../../../Scripts/ModuleDef";
 import { SceneDef } from "../../../Scripts/SceneDef";
 import { UI_Hall } from "../UI_Hall/UI_Hall";
 import { UI_Main } from "../UI_Main/UI_Main";
 import { Layout_Win } from "./Layout_Win";
+import { Container_Manager } from "../../game/Container_Manager";
 
 const { ccclass, property } = _decorator;
 

idiom/assets/start/Start.ts

@@ -5,17 +5,17 @@ import { ch_start_pack } from '../ch/start/ch_start_pack';
 import { ResUtil } from '../core/util/ResUtil';
 import { ModuleDef } from '../Scripts/ModuleDef';
 import { SceneDef } from '../Scripts/SceneDef';
-import TableLoadUtil from '../core/util/TableLoadUtil';
-import { TableUtil } from '../module_extra/table_ts/TableUtil';
+// import TableLoadUtil from '../core/util/TableLoadUtil';
+// import { TableUtil } from '../module_extra/table_ts/TableUtil';
 const { ccclass, property } = _decorator;
 //预加载模块
-const _preloadBundles = [ModuleDef.EXTRA,ModuleDef.BASIC,ModuleDef.GAME ];
+const _preloadBundles = [ModuleDef.BASIC,ModuleDef.EXTRA,ModuleDef.GAME ];
 //预加载资源
 const _preloadRes = [
     // { bundle: ModuleDef.EXTRA, url: 'ui_loading/UI_Loading' },
-    { bundle: ModuleDef.BASIC, url: 'ui_alert/UI_Alert' },
-    { bundle: ModuleDef.BASIC, url: 'ui_waiting/UI_Waiting' },
-    { bundle: ModuleDef.BASIC, url: 'ui_notify/UI_Notify' },
+   { bundle: ModuleDef.BASIC, url: 'ui_alert/UI_Alert' },
+   { bundle: ModuleDef.BASIC, url: 'ui_waiting/UI_Waiting' },
+   { bundle: ModuleDef.BASIC, url: 'ui_notify/UI_Notify' },
     // { bundle: ModuleDef.Link, url: 'ui/main/UI_Main' },
 ];
 //
@@ -38,6 +38,7 @@ export class Start extends ch_start_pack {
         Start.packId = this.pid
     }
     async start() {
+        console.log('Start');
         gui.init(this.ui_prefab);
         game.frameRate = 61;
         if (this.pid == 1) {
@@ -56,7 +57,6 @@ export class Start extends ch_start_pack {
             await this.try_init(3);
             this.preloadBundle(0);
         }
-        this.loadTable();
     }
     onResLoaded() {
         this._numCurrentLoaded++;
@@ -105,12 +105,4 @@ export class Start extends ch_start_pack {
         //     this.txtLoading.string = _loadingText[idx];
         // }
     }
-
-    private loadTable(): void {
-            // ch.log.log_start("加载配置初始化");
-            TableLoadUtil.preloadAll(ModuleDef.EXTRA, "table_json", async () => {
-                // this.onPreloadingComplete();
-                console.log("加载配置初始化完成");
-            }, TableUtil.set);
-        }
 }

idiom/build/wechatgame/first-screen.js

@@ -96,7 +96,7 @@ let useDefaultLogo = true;
 let logoName = 'logo.png';
 let bgName = 'background.png';
 let fitWidth = true;
-let fitHeight = false;
+let fitHeight = true;
 
 function initShaders(vshader, fshader) {
     return createProgram(vshader, fshader);

idiom/build/wechatgame/game.json

@@ -14,6 +14,18 @@
         {
             "name": "main",
             "root": "subpackages/main/"
+        },
+        {
+            "name": "module_extra",
+            "root": "subpackages/module_extra/"
+        },
+        {
+            "name": "module_basic",
+            "root": "subpackages/module_basic/"
+        },
+        {
+            "name": "module_game",
+            "root": "subpackages/module_game/"
         }
     ]
 }

idiom/build/wechatgame/project.config.json

@@ -15,7 +15,7 @@
     }
   },
   "compileType": "game",
-  "libVersion": "3.7.4",
+  "libVersion": "3.7.5",
   "appid": "wxc0fb4a435b39ab92",
   "projectname": "成语消了消",
   "condition": {},