1

art/fgui/.objs/workspace.json

@@ -8,29 +8,29 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7wcn5v4ke",
-    "ui://isxx5ak7iqrhv4mt"
+    "ui://isxx5ak7xs1r47l",
+    "ui://isxx5ak7xs1r482"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7iqrhv4mt",
+  "doc.activeDoc": "ui://isxx5ak7xs1r482",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIDraw/",
-    "isxx5ak7",
     "/UILevelProp/",
     "isxx5ak7",
     "/UILevelProp/component/",
     "isxx5ak7",
     "/UILevelSelect/",
     "isxx5ak7",
-    "/windows/",
-    "37nctnhw",
-    "/"
+    "/UIRepentProp/",
+    "isxx5ak7",
+    "/UIRepentProp/asset/",
+    "isxx5ak7",
+    "/windows/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,37">
-  <controller name="c1" alias="规则" exported="true" pages="0,清台模式,1,挑战模式" selected="1"/>
+  <controller name="c1" alias="规则" exported="true" pages="0,清台模式,1,挑战模式" selected="0"/>
   <displayList>
-    <text id="n17_xs1r" name="n17" xy="47,0" size="246,36" font="Arial" fontSize="26" color="#ffffff" vars="true" autoSize="none" bold="true" text="Reward Mode">
+    <text id="n17_xs1r" name="n17" xy="47,0" size="246,36" font="Arial" fontSize="26" color="#ffffff" leading="0" vars="true" autoSize="none" bold="true" text="Clear-Table Mode">
       <gearText controller="c1" pages="0,1" values="Clear-Table Mode|Reward Mode"/>
     </text>
     <image id="n19_xs1r" name="n19" src="xs1r47y" fileName="UILevelProp/asset/tc_gk_tb1.png" xy="0,0" size="38,37" aspect="true">

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

@@ -8,22 +8,22 @@
       <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="n10_xs1r" name="n10" xy="390,96" size="298,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rules">
+    <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>
     <image id="n11_xs1r" name="n11" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="383,198"/>
-    <text id="n12_xs1r" name="n12" xy="390,198" size="297,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Clearance Conditions">
+    <text id="n12_xs1r" name="n12" xy="390,198" size="297,32" font="Arial" fontSize="22" color="#4480b6" vAlign="middle" leading="0" autoSize="none" bold="true" text="Clearance Conditions">
       <relation target="n11_xs1r" sidePair="left-left"/>
     </text>
     <image id="n13_xs1r" name="n13" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="384,300"/>
-    <text id="n14_xs1r" name="n14" xy="390,300" size="490,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rewards (for Three-Star Clearance)">
+    <text id="n14_xs1r" name="n14" xy="390,300" size="490,32" font="Arial" fontSize="22" color="#4480b6" vAlign="middle" leading="0" autoSize="none" bold="true" text="Level Rewards (for Three-Star Clearance)">
       <relation target="n13_xs1r" sidePair="left-left"/>
     </text>
     <component id="n17_xs1r" name="modeNode" src="xs1r47z" fileName="UILevelProp/component/Component83.xml" xy="393,140" controller="c1,1">
       <relation target="n3_xs1r" sidePair="left-left"/>
     </component>
     <component id="n18_xs1r" name="n18" src="xs1r47w" fileName="UILevelProp/component/Component71_1.xml" xy="845,98" size="28,28" aspect="true" scale="0.7,0.7"/>
-    <text id="n20_xs1r" name="conditionTxt" xy="393,238" size="486,34" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="test test test balls test test test test test test ">
+    <text id="n20_xs1r" name="conditionTxt" xy="390,238" size="486,47" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="test test test balls test test test ">
       <relation target="n11_xs1r" sidePair="left-left"/>
     </text>
     <component id="n4_xs1r" name="diamondNode" src="xs1r480" fileName="UILevelProp/component/Component84.xml" xy="385,348">

art/fgui/assets/game/UISkill/component/skillItem_1.xml

@@ -9,11 +9,11 @@
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <loader id="n33_tumi" name="skillImg" xy="8,43" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true" clearOnPublish="true"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="192,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
+    <text id="n24_qlo0" name="nameTxt" xy="4,3" size="192,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
     <text id="n25_qlo0" name="levelTxt" xy="211,3" size="95,32" font="Arial" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,46" size="374,81"/>
     <text id="n29_qlo0" name="describeTxt" xy="152,45" size="366,79" font="Arial" fontSize="19" color="#696b80" autoSize="none" text="跳杆击球后，球高高跃起，砸在桌面上，直接打进我方除黑八外需进的下一颗球。"/>
-    <text id="n32_qlo0" name="n32" xy="160,190" size="362,22" font="Arial" fontSize="14" color="#ffffff" autoSize="none" bold="true" text="You get one additional ball with each level-up."/>
+    <text id="n32_qlo0" name="n32" xy="149,186" size="362,23" font="Arial" fontSize="15" color="#ffffff" autoSize="none" bold="true" text="You get one additional ball with each level-up."/>
     <text id="n38_lp3l" name="maxTxt" xy="311,150" size="46,22" fontSize="14" color="#696b80" text="已满级"/>
     <component id="n12_qlo0" name="mutiBtn" src="qlo041t" fileName="UISkill/component/Component28.xml" xy="268,138" group="n34_wji1" visible="false"/>
     <component id="n11_qlo0" name="normalBtn" src="qlo041r" fileName="UISkill/component/Component26.xml" xy="268,138" group="n34_wji1"/>

art/fgui/assets/game/_sharecomponent/drawBtn.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="9,免费抽奖,10,看视频抽奖" selected="1"/>
+  <controller name="c1" alias="按钮" exported="true" pages="9,免费抽奖,10,看视频抽奖" selected="0"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10"/>
     </image>
-    <text id="n1_hkrz" name="n1" xy="63,14" size="164,44" font="Arial" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" text="Prize draw">
+    <text id="n1_hkrz" name="n1" xy="37,14" size="164,44" font="Arial" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" text="Prize draw">
       <gearDisplay controller="c1" pages="9,10"/>
       <gearXY controller="c1" pages="9,10" values="37,14|63,14"/>
     </text>

art/fgui/assets/game/_sharecomponent/shareBtn2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="7"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="1"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10,11,21,22,23,24"/>
@@ -15,17 +15,17 @@
     </text>
     <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="下一关">
       <gearDisplay controller="c1" pages="2,5,6"/>
-      <gearText controller="c1" pages="0,2,5,6" values="next level|next level|Start|" default="下一关"/>
+      <gearText controller="c1" pages="0,2,5,6" values="next level|Next level|Start|" default="下一关"/>
     </text>
-    <text id="n23_lp3l" name="n23" xy="2,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Receive">
+    <text id="n23_lp3l" name="n23" xy="3,4" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="知道了">
       <gearDisplay controller="c1" pages="6,7,8"/>
       <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|Receive|Receive" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="39,14" size="196,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="下一关">
+    <text id="n4_p4tr" name="n4" xy="39,14" size="190,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Next level">
       <gearDisplay controller="c1" pages="1,9,11,22,23,24"/>
-      <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
+      <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|Next level|Next Level|Next Level|Prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="46,22" size="42,30" aspect="true">
+    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="3,22" size="42,30" aspect="true">
       <gearDisplay controller="c1" pages="1,9,22,24"/>
       <gearXY controller="c1" pages="1,9,22,24" values="3,22|4,21|7,21|6,21" default="46,22"/>
     </image>

art/fgui/assets/game/package.xml

@@ -1273,6 +1273,7 @@
     <image id="r4l5v576" name="zjm_db6-old.png" path="/UIMain/asset/"/>
     <component id="r4l5v577" name="Component1302.xml" path="/UIMain/component/"/>
     <movieclip id="qj9yv578" name="aaaaa.jta" path="/__示意图/"/>
+    <image id="h498v579" name="234_2025.png" path="/UIRepentProp/asset/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

art/fgui/settings/Common.json

@@ -1,5 +1,5 @@
 {
-  "font": "Microsoft YaHei",
+  "font": "Arial",
   "fontSize": 30,
   "textColor": "#000000",
   "fontAdjustment": false,
@@ -10,7 +10,8 @@
     "自定义字体大小 30"
   ],
   "fontScheme": [
-    "微软雅黑 微软雅黑"
+    "微软雅黑 微软雅黑",
+    "arial"
   ],
   "scrollBars": {
     "horizontal": "",
@@ -20,5 +21,6 @@
   "tipsRes": "",
   "buttonClickSound": "",
   "pivot": "default",
+  "listClearOnPublish": false,
   "fileName": "Common"
 }

client/laya/bin/js/bundle.js

@@ -4757,6 +4757,15 @@
             this.secondPos = 467;
             this.showItemArr = [];
         }
+        onFontLoaded() {
+            try {
+                this.ui.myNode.conditionTxt.font = "arial";
+                console.log("zh: onFontLoaded 设置arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载arial字体失败");
+            }
+        }
         onConstructor() {
             this.ui = ui_UILevelProp.createInstance();
             this.contentPane = this.ui;
@@ -4801,7 +4810,7 @@
                 this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
             }
             else {
-                this.ui.myNode.conditionTxt.text = "Reward";
+                this.ui.myNode.conditionTxt.text = `Successfully pocketed ${this.data.ball} balls in total`;
             }
             let localData = DataMgr.getPlaceBallLevel(this.level);
             let getAward = localData.getAward;
@@ -19029,6 +19038,15 @@
             this.secondPos = 467;
             this.showItemArr = [];
         }
+        onFontLoaded() {
+            try {
+                this.ui.myNode.conditionTxt.font = "arial";
+                console.log("zh: onFontLoaded 设置arial字体成功");
+            }
+            catch (error) {
+                console.log("zh: constructor onFontLoaded加载arial字体失败");
+            }
+        }
         onConstructor() {
             this.ui = ui_UILevelProp.createInstance();
             this.contentPane = this.ui;
@@ -19073,7 +19091,7 @@
                 this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
             }
             else {
-                this.ui.myNode.conditionTxt.text = "Reward";
+                this.ui.myNode.conditionTxt.text = `Successfully pocketed ${this.data.ball} balls in total`;
             }
             let localData = DataMgr.getPlaceBallLevel(this.level);
             let getAward = localData.getAward;

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

@@ -60,6 +60,7 @@ class CFontMgr {
      * 加载字体成功回调
      */
     private onLoadFontSucc() {
+        console.log('zh:开始加载字体成功');
         this.fontNum--;
         if (this.fontNum > 0) {
             return;
@@ -70,7 +71,7 @@ class CFontMgr {
                 let bmFont = this.bmFonts[key];
                 bmFont.autoScaleSize = true;
                 Laya.Text.registerBitmapFont(fontName, bmFont);
-                console.log('加载字体成功:', fontName);
+                console.log('zh:加载字体成功:', fontName);
             }
         }
         if (this._loadCallBack) {
@@ -86,7 +87,7 @@ class CFontMgr {
             if (FONT_NAME.hasOwnProperty(key)) {
                 let fontName = FONT_NAME[key];
                 Laya.Text.unregisterBitmapFont(fontName, true);
-                console.log('释放字体成功:', fontName);
+                console.log('zh:释放字体成功:', fontName);
             }
         }
     }

client/laya/src/ui/UILevelProp.ts

@@ -24,7 +24,25 @@ export default class UILevelProp extends UIBase {
     public showItemArr: Array<ShowItem> = [];
     public constructor() {
         super();
+        
+        // try {
+        //     Laya.loader.load("res/font/arial.fnt", Laya.Handler.create(this, this.onFontLoaded)); 
+        //     console.log("zh: constructor加载arial字体成功");
+        // } catch (error) {
+        //     console.log("zh: constructor加载arial字体失败");
+        // }
+       
 
+    }
+    private onFontLoaded(): void {
+        try {
+             this.ui.myNode.conditionTxt.font = "arial";
+             console.log("zh: onFontLoaded 设置arial字体成功");
+        } catch (error) {
+            console.log("zh: constructor onFontLoaded加载arial字体失败");
+            
+        }
+       
     }
     public onConstructor(): void {
         this.ui = ui_UILevelProp.createInstance();
@@ -65,16 +83,34 @@ export default class UILevelProp extends UIBase {
             this.showItemArr.push(item);
         }
     }
+    
     updateSelf() {
         this.ui.myNode.levelTxt.text = `Level ${this.level}`
         this.ui.myNode.modeNode.c1.selectedIndex = this.data.type;
+
+        // try {
+        //      this.ui.myNode.conditionTxt.font = "arial";
+        //      console.log('zh: set arial  字体OK')
+        // } catch (error) {
+        //     console.log('zh: 加载arial字体失败')
+        // }
+       
         if (this.data.ball == -1) {
             //打进场上所有球
             this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
         }
         else {
-            this.ui.myNode.conditionTxt.text = "Reward"//`累计打进${this.data.ball}个球`;
+            this.ui.myNode.conditionTxt.text = `Successfully pocketed ${this.data.ball} balls in total` //`累计打进${this.data.ball}个球`;
         }
+
+        // 或者动态加载字体后设置
+       // Laya.loader.load("res/font/arial", laya.utils.Handler.create(this, onFontLoaded));
+      //  function onFontLoaded() {
+      //     // txt.font = "fontName"; // 替换为实际的字体名
+      //  }
+       
+
+
         let localData = DataMgr.getPlaceBallLevel(this.level);
         let getAward = localData.getAward;
         let cfg = cfgTable.placeballData[this.level];