1

art/fgui/assets/game/UILevelProp/component/Component85.xml

@@ -7,7 +7,7 @@
     <image id="n3_xs1r" name="n3" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="383,96">
       <relation target="" sidePair="left-left"/>
     </image>
-    <text id="n7_xs1r" name="levelTxt" xy="231,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Level  1"/>
+    <text id="n7_xs1r" name="levelTxt" xy="231,20" pivot="0.5,0.5" size="436,54" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Level  1"/>
     <text id="n10_xs1r" name="n10" xy="390,96" size="298,32" font="Arial" fontSize="22" color="#4480b6" vAlign="middle" leading="0" autoSize="none" bold="true" text="Level Rules">
       <relation target="n3_xs1r" sidePair="left-left"/>
     </text>

art/fgui/assets/game/UIMain/component/Component_denglu.xml

@@ -2,10 +2,10 @@
 <component size="96,96">
   <controller name="c1" pages="0,login,1,exit" selected="1"/>
   <displayList>
-    <image id="n102_ijwr" name="n102" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="0,0">
+    <image id="n102_ijwr" name="n102" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="15,6">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n103_wss0" name="n103" src="wss0v5a2" fileName="UIMain/asset/logout.png" xy="0,0">
+    <image id="n103_wss0" name="n103" src="wss0v5a2" fileName="UIMain/asset/logout.png" xy="15,6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
   </displayList>

art/fgui/assets/game/package.xml

@@ -1354,13 +1354,14 @@
     <image id="wss0v5a2" name="logout.png" path="/UIMain/asset/"/>
     <image id="wss0v5a3" name="qd_bg.jpg" path="/UIMain/asset/new2025/yasuoDir/"/>
     <image id="wss0v5a4" name="Login.png" path="/UIUser/asset/"/>
-    <image id="wss0v5a5" name="zhuxiao.png" path="/UIMain/asset/"/>
     <image id="wss0v5a6" name="signin.png" path="/UIUser/asset/"/>
     <font id="wss0v5a7" name="arial.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wss0v5a8" name="arialbd.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wss0v5a9" name="arialbi.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wss0v5aa" name="ariali.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wss0v5ab" name="ariblk.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="fyonv5ac" name="fuli1.png" path="/UISecretary/UIFuli/asset/"/>
+    <image id="fyonv5ad" name="fuli2.png" path="/UISecretary/UIFuli/asset/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

client/laya/bin/js/bundle.js

@@ -1477,6 +1477,15 @@
             }
             this.bridge.call("showToast2", msg);
         }
+        showConfirmationDialogForExit(title, msg) {
+            if (!Laya.Browser.onAndroid) {
+                return;
+            }
+            if (!this.initBridge()) {
+                return;
+            }
+            this.bridge.call("showConfirmationDialogForExit", title, msg);
+        }
         loginOutForApp() {
             if (!Laya.Browser.onAndroid) {
                 return;
@@ -8935,6 +8944,7 @@
             let times = DataMgr.getDailyVideoShareTimes();
             this.awardNum = times == 0 ? 2000 : 200;
             this.ui.myNode.awardNode.coinTxt.text = "x" + this.awardNum + "";
+            this.setGlobalFont(this.ui);
         }
         checkShareState() {
             if (PlatMgr.forceShare == 0) {
@@ -11409,10 +11419,8 @@
             xGame.common.wordsMgr = new WordsMgr();
             xGame.common.talkMgr = new TalkMgr();
             xGame.common.classicEmotionSpine = new SpineMgr("yxz_bqwz", () => {
-                console.log("加载经典模式表情文件chenggon !");
             });
             xGame.common.awardSpine = new SpineMgr("jinbi", () => {
-                console.log("挑战模式奖励模式spine加载成功!");
             });
             xGame.eventMgr.off(RESET_GAME, this, this.resetGame);
             xGame.eventMgr.on(RESET_GAME, this, this.resetGame);
@@ -11470,7 +11478,6 @@
         }
         show() {
             super.show();
-            console.log("zh:uigame show AADD");
             this.ui.alpha = 0;
             this.updateSelf();
             xGame.common.gameMgr.gamePause = false;
@@ -12545,6 +12552,7 @@
             this.updatePos();
             this.runFly(edPos, callback);
             this.runWorlds(stPos, num);
+            this.setGlobalFont(this.ui);
         }
         updateUI(type) {
             let temp;
@@ -18256,7 +18264,7 @@
                     console.log('zh:所有配置加载完成');
                 }
                 catch (error) {
-                    console.error('❌请求失败:', error);
+                    console.error('zh:❌请求失败:', error);
                     Laya.timer.once(5000, this, () => {
                         let retryCount = 0;
                         const maxRetries = 3;
@@ -18267,11 +18275,11 @@
                             catch (error) {
                                 if (retryCount < maxRetries) {
                                     retryCount++;
-                                    console.log(`🔄 第${retryCount}次重试获取配置...`);
+                                    console.log(`zh:🔄 第${retryCount}次重试获取配置...`);
                                     Laya.timer.once(5000, this, tryFetchConfig);
                                 }
                                 else {
-                                    console.error("❌ 达到最大重试次数，配置获取失败");
+                                    console.error("zh:❌ 达到最大重试次数，配置获取失败");
                                 }
                             }
                         };
@@ -18280,14 +18288,11 @@
                 }
                 finally {
                     if (this.httpReqCount > this.httpReqOkCount) {
-                        CustomAlert.show("Prompt", "Failed to load resources. Check your network and restart the game.", [
-                            {
+                        CustomAlert.show("Prompt", "Failed to load resources. Check your network and restart the game.", [{
                                 label: "Okay", handler: () => {
-                                    console.log("zh:好的知道了");
                                     JSBridgeUtils.instance.exitAndCloseGame();
                                 }
-                            }
-                        ]);
+                            }]);
                     }
                 }
             });
@@ -20426,10 +20431,8 @@
             xGame.common.wordsMgr = new WordsMgr();
             xGame.common.talkMgr = new TalkMgr();
             xGame.common.classicEmotionSpine = new SpineMgr("yxz_bqwz", () => {
-                console.log("加载经典模式表情文件chenggon !");
             });
             xGame.common.awardSpine = new SpineMgr("jinbi", () => {
-                console.log("挑战模式奖励模式spine加载成功!");
             });
             xGame.eventMgr.off(RESET_GAME, this, this.resetGame);
             xGame.eventMgr.on(RESET_GAME, this, this.resetGame);
@@ -20487,7 +20490,6 @@
         }
         show() {
             super.show();
-            console.log("zh:uigame show AADD");
             this.ui.alpha = 0;
             this.updateSelf();
             xGame.common.gameMgr.gamePause = false;

client/laya/src/core/mgrs/ConfigMgr.ts

@@ -61,7 +61,7 @@ export class ConfigMgr {
 
             console.log('zh:所有配置加载完成');
         } catch (error) {
-            console.error('❌请求失败:', error);
+            console.error('zh:❌请求失败:', error);
 
             Laya.timer.once(5000, this, () => {
                 let retryCount = 0;
@@ -72,27 +72,24 @@ export class ConfigMgr {
                     } catch (error) {
                         if (retryCount < maxRetries) {
                             retryCount++;
-                            console.log(`🔄 第${retryCount}次重试获取配置...`);
+                            console.log(`zh:🔄 第${retryCount}次重试获取配置...`);
                             Laya.timer.once(5000, this, tryFetchConfig);
                         } else {
-                            console.error("❌ 达到最大重试次数，配置获取失败");
+                            console.error("zh:❌ 达到最大重试次数，配置获取失败");
                         }
                     }
                 };
                 tryFetchConfig();
             });
-
-
         } finally {
             if (this.httpReqCount > this.httpReqOkCount) {
-                CustomAlert.show("Prompt", "Failed to load resources. Check your network and restart the game.", [
-                    {
+              //  JSBridgeUtils.instance.showToast2("Check your network and restart the game.");
+                CustomAlert.show("Prompt", "Failed to load resources. Check your network and restart the game.", [{
                         label: "Okay", handler: () => {
-                            console.log("zh:好的知道了")
                             JSBridgeUtils.instance.exitAndCloseGame()
                         }
-                    }
-                ]);
+                    }]);
+                // JSBridgeUtils.instance.showConfirmationDialogForExit("Prompt", "Failed to load resources. Check your network and restart the game.");
             }
         }
     }

client/laya/src/ui/UIFireworks.ts

@@ -2,25 +2,25 @@ import UIBase from "../fgui/core/UIBase";
 //import ui_UIFireworks from "../fgui/res/game/ui_UIFireworks";
 export default class UIFireworks extends UIBase {
   //  protected ui: ui_UIFireworks;
-    public constructor() {
-        super();
-    }
-    protected onConstructor(): void {
-      //  this.ui = ui_UIFireworks.createInstance();
-       // this.contentPane = this.ui;
-        this.isEject = false;
-        //
-    }
-    public show(callback): void {
-        super.show();
-        // this.ui.t0.play(Laya.Handler.create(this, () => {
-        //     //
-        //     callback && callback();
-        //     this.hide();
-        //     //
-        // }))
+  public constructor() {
+    super();
+  }
+  protected onConstructor(): void {
+    //  this.ui = ui_UIFireworks.createInstance();
+    // this.contentPane = this.ui;
+    this.isEject = false;
+    //
+  }
+  public show(callback): void {
+    super.show();
+    // this.ui.t0.play(Laya.Handler.create(this, () => {
+    //     //
+    //     callback && callback();
+    //     this.hide();
+    //     //
+    // }))
 
-         this.setGlobalFont(this.ui)
-    }
+    // this.setGlobalFont(this.ui)
+  }
 }
 UIFireworks.uiName = "UIFireworks";

client/laya/src/ui/UIGame.ts

@@ -86,10 +86,10 @@ export class UIGame extends UIBase {
         xGame.common.talkMgr = new TalkMgr();
         //
         xGame.common.classicEmotionSpine = new SpineMgr("yxz_bqwz", () => {
-            console.log("加载经典模式表情文件chenggon !");
+           // console.log("加载经典模式表情文件chenggon !");
         });
         xGame.common.awardSpine = new SpineMgr("jinbi", () => {
-            console.log("挑战模式奖励模式spine加载成功!");
+           // console.log("挑战模式奖励模式spine加载成功!");
 
         })
         //
@@ -173,7 +173,7 @@ export class UIGame extends UIBase {
     }
     public show(): void {
         super.show();
-        console.log("zh:uigame show AADD");
+       // console.log("zh:uigame show AADD");
         this.ui.alpha = 0;
         this.updateSelf();
         //

client/laya/src/utils/JSBridgeUtils.ts

@@ -296,6 +296,21 @@ export default class JSBridgeUtils {
         }
         this.bridge.call("showToast2", msg);
     }
+    /**
+     *  点击OK之后会自动退出游戏
+     * @param title 
+     * @param msg 
+     * @returns 
+     */
+    showConfirmationDialogForExit(title:string,msg:string):void{
+         if (!Laya.Browser.onAndroid) {
+            return;
+        }
+        if (!this.initBridge()) {
+            return;
+        }
+        this.bridge.call("showConfirmationDialogForExit", title,msg);
+    }
     //------------------网络判断 end