dzduole 1 月之前
父节点
当前提交
35d381c3b1

+ 4 - 6
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,20 +5,18 @@
       "locked": true,
       "hidden": true
     },
-    "n84_jpsz": {
+    "n83_jpsz": {
       "hidden": true
     },
-    "n44_ixm4": {
-      "collapsed": true
+    "n84_jpsz": {
+      "hidden": true
     },
     "n48_hxtr": {
       "locked": true,
       "hidden": true
     },
     "n77_vhzh": {
-      "collapsed": true,
-      "locked": true,
-      "hidden": true
+      "locked": true
     }
   },
   "fitScreen": "FitSize",

+ 39 - 7
art/fgui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 311,
+  "libview.firstColumnWidth": 314,
   "expanded_nodes": [
     "isxx5ak7",
     "/",
@@ -8,27 +8,59 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7xs1r47l",
-    "ui://isxx5ak7xs1r482"
+    "ui://isxx5ak7kt443qc",
+    "ui://isxx5ak7vhzhv4ho"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7xs1r482",
+  "doc.activeDoc": "ui://isxx5ak7vhzhv4ho",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UILevelProp/",
+    "/UIAddProp/",
     "isxx5ak7",
-    "/UILevelProp/component/",
+    "/UIAddProp/component/",
+    "isxx5ak7",
+    "/UIBox/",
+    "isxx5ak7",
+    "/UIBox/asset/",
+    "isxx5ak7",
+    "/UIBox/component/",
+    "isxx5ak7",
+    "/UIGame/",
+    "isxx5ak7",
+    "/UIGetAward/",
+    "isxx5ak7",
+    "/UIGetAward/component/",
+    "isxx5ak7",
+    "/UILevelDisplay/",
     "isxx5ak7",
     "/UILevelSelect/",
     "isxx5ak7",
+    "/UIMain/",
+    "isxx5ak7",
+    "/UIMain/asset/",
+    "isxx5ak7",
+    "/UIModeSelection/",
+    "isxx5ak7",
+    "/UIMoney/",
+    "isxx5ak7",
+    "/UIMsg/",
+    "isxx5ak7",
     "/UIRepentProp/",
     "isxx5ak7",
-    "/UIRepentProp/asset/",
+    "/UIRepentProp/component/",
+    "isxx5ak7",
+    "/UITips/",
+    "isxx5ak7",
+    "/UITips/component/",
+    "isxx5ak7",
+    "/UIWordsList/",
+    "isxx5ak7",
+    "/_sharecomponent/",
     "isxx5ak7",
     "/windows/"
   ],

+ 2 - 2
art/fgui/assets/game/UIMain/asset/Component112.xml

@@ -4,10 +4,10 @@
     <graph id="n68_vhzh" name="n68" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n70_vhzh" name="n70" xy="267,372" size="381,366">
+    <loader id="n70_vhzh" name="n70" xy="276,372" size="381,366">
       <relation target="" sidePair="left-left%"/>
     </loader>
-    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="272,465" size="320,150">
+    <image id="n69_vhzh" name="myMask" src="vhzhv4hm" fileName="UISkill/asset/zhezhao.png" xy="281,478" size="320,131">
       <relation target="n70_vhzh" sidePair="left-left,top-top"/>
     </image>
   </displayList>

二进制
client/laya/bin/asset/fgui/game.obj


+ 22 - 40
client/laya/bin/js/bundle.js

@@ -10372,6 +10372,7 @@
             if (data >= xGame.common.maxShareDiamondTimes) {
                 this.ui.myNode.node1.shareTxt.text = "Available Tomorrow";
                 this.ui.myNode.node1.touchable = false;
+                xGame.uiMgr.Show(UIMsg, "Come back tomorrow");
             }
             else {
                 this.ui.myNode.node1.shareTxt.text = `(${data}/${xGame.common.maxShareDiamondTimes})`;
@@ -10449,35 +10450,25 @@
         shareGetDiamond() {
             let times = DataMgr.getShareDiamondTimes();
             if (times >= xGame.common.maxShareDiamondTimes) {
+                console.log('zh: 233333333333 maxShareDiamondTimes');
                 xGame.uiMgr.Show(UIMsg, "Come back tomorrow");
             }
             else {
-                if (Moyu.isTT) {
-                    let num = cfgTable.moneyData[1].num;
-                    Moyu.shareVideo = '';
-                    Moyu.shareGame((success) => {
-                        if (success) {
-                            xGame.uiMgr.Show(UIMsg, "分享成功!");
-                            xGame.common.playObjFlyAnim(num, Prop.diamond);
-                            DataMgr.setShareDiamondTimes(1);
-                            this.updateDiamondShare();
-                        }
-                        else {
-                            xGame.uiMgr.Show(UIMsg, "分享失败!");
-                        }
-                    });
+                console.log('zh:33333333333333ad');
+                console.log('zh:qjff_AD_for_uiAddProp_shareGetDiamond');
+                if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uiAddProp_shareGetDiamond')) {
                 }
                 else {
-                    Moyu.showVideoAd(() => {
-                        let diamond = xGame.common.randomNum(50, 100);
-                        xGame.common.playObjFlyAnim(diamond, Prop.diamond);
-                        DataMgr.setShareDiamondTimes(1);
-                        this.updateDiamondShare();
-                    }, EAdType.randomDiamond);
+                    console.log('zh:AD 失败,直接发放奖励');
+                    this.qjff_AD_for_uiAddProp_shareGetDiamond();
                 }
             }
         }
         qjff_AD_for_uiAddProp_shareGetDiamond() {
+            let diamond = xGame.common.randomNum(50, 100);
+            xGame.common.playObjFlyAnim(diamond, Prop.diamond);
+            DataMgr.setShareDiamondTimes(1);
+            this.updateDiamondShare();
         }
         openPutBallView() {
             let end = xGame.uiMgr.getUI(UIGameEnd);
@@ -19724,6 +19715,7 @@
             if (data >= xGame.common.maxShareDiamondTimes) {
                 this.ui.myNode.node1.shareTxt.text = "Available Tomorrow";
                 this.ui.myNode.node1.touchable = false;
+                xGame.uiMgr.Show(UIMsg$1, "Come back tomorrow");
             }
             else {
                 this.ui.myNode.node1.shareTxt.text = `(${data}/${xGame.common.maxShareDiamondTimes})`;
@@ -19801,35 +19793,25 @@
         shareGetDiamond() {
             let times = DataMgr.getShareDiamondTimes();
             if (times >= xGame.common.maxShareDiamondTimes) {
+                console.log('zh: 233333333333 maxShareDiamondTimes');
                 xGame.uiMgr.Show(UIMsg$1, "Come back tomorrow");
             }
             else {
-                if (Moyu.isTT) {
-                    let num = cfgTable.moneyData[1].num;
-                    Moyu.shareVideo = '';
-                    Moyu.shareGame((success) => {
-                        if (success) {
-                            xGame.uiMgr.Show(UIMsg$1, "分享成功!");
-                            xGame.common.playObjFlyAnim(num, Prop.diamond);
-                            DataMgr.setShareDiamondTimes(1);
-                            this.updateDiamondShare();
-                        }
-                        else {
-                            xGame.uiMgr.Show(UIMsg$1, "分享失败!");
-                        }
-                    });
+                console.log('zh:33333333333333ad');
+                console.log('zh:qjff_AD_for_uiAddProp_shareGetDiamond');
+                if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uiAddProp_shareGetDiamond')) {
                 }
                 else {
-                    Moyu.showVideoAd(() => {
-                        let diamond = xGame.common.randomNum(50, 100);
-                        xGame.common.playObjFlyAnim(diamond, Prop.diamond);
-                        DataMgr.setShareDiamondTimes(1);
-                        this.updateDiamondShare();
-                    }, EAdType.randomDiamond);
+                    console.log('zh:AD 失败,直接发放奖励');
+                    this.qjff_AD_for_uiAddProp_shareGetDiamond();
                 }
             }
         }
         qjff_AD_for_uiAddProp_shareGetDiamond() {
+            let diamond = xGame.common.randomNum(50, 100);
+            xGame.common.playObjFlyAnim(diamond, Prop.diamond);
+            DataMgr.setShareDiamondTimes(1);
+            this.updateDiamondShare();
         }
         openPutBallView() {
             let end = xGame.uiMgr.getUI(UIGameEnd$1);

文件差异内容过多而无法显示
+ 0 - 0
client/laya/bin/js/bundle.js.map


部分文件因为文件数量过多而无法显示