dzduole 1 hafta önce
ebeveyn
işleme
08061c7b57

BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb1/kuxiao.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb2/kanshouji.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb3/wunai.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb4/wenhao.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb5/weixiao.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb6/zhoumei.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb7/wa.png


BIN
art/UI/游戏界面/游戏中spine动画/对话表情spine/yxz_bqb8/xiaolian.png


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

@@ -5,14 +5,14 @@
       "locked": true,
       "hidden": true
     },
-    "n44_ixm4": {
-      "collapsed": true
+    "n77_vhzh": {
+      "locked": true,
+      "hidden": true
     },
     "n84_jpsz": {
       "hidden": true
     },
-    "n77_vhzh": {
-      "locked": true,
+    "n83_jpsz": {
       "hidden": true
     },
     "n48_hxtr": {
@@ -21,9 +21,6 @@
     },
     "n45_ixm4": {
       "collapsed": true
-    },
-    "n83_jpsz": {
-      "hidden": true
     }
   },
   "fitScreen": "FitSize",

+ 29 - 6
art/fgui/.objs/workspace.json

@@ -8,21 +8,44 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7avag46o",
-    "ui://isxx5ak7xs1r47l",
-    "ui://isxx5ak7xs1r482",
-    "ui://isxx5ak7hkrz3u3"
+    "ui://isxx5ak7uxuev4hs",
+    "ui://isxx5ak7p4tr42k",
+    "ui://isxx5ak7ehtov4gk",
+    "ui://isxx5ak7ehtov4gu",
+    "ui://isxx5ak7ehtov4gv"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7hkrz3u3",
+  "doc.activeDoc": "ui://isxx5ak7ehtov4gv",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIGameEnd/"
+    "/UIAddProp/",
+    "isxx5ak7",
+    "/UIAddProp/component/",
+    "isxx5ak7",
+    "/UILevelSelect/",
+    "isxx5ak7",
+    "/UIMain/",
+    "isxx5ak7",
+    "/UIMatching/",
+    "isxx5ak7",
+    "/UIModeSelection/",
+    "isxx5ak7",
+    "/UIRepentProp/",
+    "isxx5ak7",
+    "/UIRodMethod/",
+    "isxx5ak7",
+    "/UIRodMethod/component/",
+    "isxx5ak7",
+    "/UISecretary/",
+    "isxx5ak7",
+    "/UISkill/",
+    "isxx5ak7",
+    "/UISkill/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 2 - 2
art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -4,9 +4,9 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4fe" fileName="UIAddProp/asset/hb_bq_hs.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="2,50" pivot="0.5,0.5" size="221,104" fontSize="28" color="#522cce" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#ffffff" text="Watch a Video to Get&#xA; Random Diamonds">
+    <text id="n26_ehto" name="n26" xy="2,50" pivot="0.5,0.5" size="221,104" fontSize="28" color="#522cce" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#ffffff" text="Watch video, get random diamonds.">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearText controller="c1" pages="0,1" values="Share to &#xA;Earn Diamonds|Watch a Video to Get&#xA; Random Diamonds"/>
+      <gearText controller="c1" pages="0,1" values="Share to &#xA;Earn Diamonds|Watch video, get random diamonds."/>
     </text>
     <text id="n27_ehto" name="n27" xy="1,15" pivot="0.5,0.5" size="57,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Activity"/>
     <text id="n46_lgji" name="shareTxt" xy="2,174" pivot="0.5,0.5" size="221,39" fontSize="26" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="(0/3)"/>

+ 1 - 1
art/fgui/assets/game/UIAddProp/component/hb_zs2.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4ff" fileName="UIAddProp/asset/hb_bq_ls.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Get diamonds by &#xA;watching videos."/>
+    <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Watch videos to get diamonds."/>
     <text id="n27_ehto" name="n27" xy="-11,19" pivot="0.5,0.5" size="81,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" text="Timed limit"/>
     <component id="n32_ehto" name="n32" src="ehtov4gw" fileName="UIAddProp/component/dh_zs2.xml" xy="29,191"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392" pivot="0.5,0.5"/>

+ 1 - 1
art/fgui/assets/game/UIAddProp/component/hb_zs3.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4fg" fileName="UIAddProp/asset/hb_bq_zs.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Challenge the Cue Ball &#xA;Arrangement Master!"/>
+    <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Challenge Ball Master!"/>
     <text id="n27_ehto" name="n27" xy="-5,21" pivot="0.5,0.5" size="60,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Hotspot"/>
     <component id="n32_ehto" name="n32" src="ehtov4gy" fileName="UIAddProp/component/dh_zs3.xml" xy="29,195"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,391"/>

BIN
client/laya/bin/asset/fgui/game.obj


+ 29 - 9
client/laya/bin/js/bundle.js

@@ -1226,6 +1226,19 @@
             console.log("zh:logEventForAdHaveParams req = json=" + jsonStr);
             this.bridge.call("logEventForAdHaveParams", eventName, jsonStr);
         }
+        logEventForFirebase(eventName, jsonStr) {
+            console.log("zh:ts logEventForFirebase eventName1=" + eventName);
+            if (!Laya.Browser.onAndroid) {
+                console.log('zh:非android dev');
+                return;
+            }
+            if (!this.initBridge()) {
+                return;
+            }
+            console.log("zh:call logEventForFirebase eventName2=" + eventName);
+            console.log("zh:logEventForFirebase req = json=" + jsonStr);
+            this.bridge.call("logEventForFirebase", eventName, jsonStr);
+        }
         nativeCallJs(msg) {
             console.log("zh:nativeCallJs received data: 1111", msg);
             if (msg === 'Ad1') {
@@ -6239,8 +6252,8 @@
             let nameList = xGame.common.skillNameList;
             let iconList = xGame.common.skillIconList;
             let describeList = [
+                "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow! ",
                 "A break shot surging like a raging tide—powerful, explosive, and straight into the pocket!",
-                "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow!",
                 "The power of frost descends—freezing the flow and taking full control of the game!"
             ];
             console.log('zh:initSkillData  111111111');
@@ -6385,11 +6398,11 @@
             this.addUIClick(this.ui.myNode.type2, this.enterGame, [2]);
             this.addUIClick(this.ui.myNode.type3, this.enterGame, [3]);
             this.addUIClick(this.ui.closeBtn, this.hide);
-            this.peopleArr = [650, 6900, 3800];
-            this.peopleOffest = [50, 500, 200];
-            this.updateSelf();
+            this.peopleArr = [65, 990, 580];
+            this.peopleOffest = [5, 10, 10];
         }
         show(callback) {
+            this.updateSelf();
             super.show();
             this.ui.t0.play();
             this.callback = callback;
@@ -7212,6 +7225,7 @@
             if (count % 5 == 0) {
                 const reqStr = JSON.stringify(jsonStr);
                 JSBridgeUtils.instance.logEventForAdHaveParams('rod_complete_' + d2, reqStr);
+                JSBridgeUtils.instance.logEventForFirebase('rod_complete_' + d2, reqStr);
             }
         }
         logEventForRod_win() {
@@ -7306,6 +7320,7 @@
             if (jsonStr.count % 5 == 0) {
                 const reqStr = JSON.stringify(jsonStr);
                 JSBridgeUtils.instance.logEventForAdNoParams('classic_complete');
+                JSBridgeUtils.instance.logEventForFirebase('classic_complete', null);
             }
         }
         updatePlaceBallBtn() {
@@ -7704,6 +7719,8 @@
                     console.log('zh:每5关上报1次');
                     let sjmc = 'challenge_level_' + level;
                     JSBridgeUtils.instance.logEventForAdNoParams(sjmc);
+                    let sjmcForFirebase = 'challenge_level_' + level;
+                    JSBridgeUtils.instance.logEventForFirebase(sjmcForFirebase, null);
                 }
                 else {
                     console.log('zh:5 no 上报');
@@ -8788,7 +8805,6 @@
             xGame.common.d2World.rootBall.showSelf();
             this.clearIceSkill();
             if (this.selfTurn) {
-                console.log("zh:处理一杆结束后的逻辑  gameResult");
                 PlatMgr.gameInsert();
             }
             xGame.common.d3World.knifeRoot.destroyChildren();
@@ -19293,6 +19309,7 @@
             if (count % 5 == 0) {
                 const reqStr = JSON.stringify(jsonStr);
                 JSBridgeUtils.instance.logEventForAdHaveParams('rod_complete_' + d2, reqStr);
+                JSBridgeUtils.instance.logEventForFirebase('rod_complete_' + d2, reqStr);
             }
         }
         logEventForRod_win() {
@@ -19387,6 +19404,7 @@
             if (jsonStr.count % 5 == 0) {
                 const reqStr = JSON.stringify(jsonStr);
                 JSBridgeUtils.instance.logEventForAdNoParams('classic_complete');
+                JSBridgeUtils.instance.logEventForFirebase('classic_complete', null);
             }
         }
         updatePlaceBallBtn() {
@@ -19785,6 +19803,8 @@
                     console.log('zh:每5关上报1次');
                     let sjmc = 'challenge_level_' + level;
                     JSBridgeUtils.instance.logEventForAdNoParams(sjmc);
+                    let sjmcForFirebase = 'challenge_level_' + level;
+                    JSBridgeUtils.instance.logEventForFirebase(sjmcForFirebase, null);
                 }
                 else {
                     console.log('zh:5 no 上报');
@@ -20428,8 +20448,8 @@
             let nameList = xGame.common.skillNameList;
             let iconList = xGame.common.skillIconList;
             let describeList = [
+                "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow! ",
                 "A break shot surging like a raging tide—powerful, explosive, and straight into the pocket!",
-                "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow!",
                 "The power of frost descends—freezing the flow and taking full control of the game!"
             ];
             console.log('zh:initSkillData  111111111');
@@ -21714,11 +21734,11 @@
             this.addUIClick(this.ui.myNode.type2, this.enterGame, [2]);
             this.addUIClick(this.ui.myNode.type3, this.enterGame, [3]);
             this.addUIClick(this.ui.closeBtn, this.hide);
-            this.peopleArr = [650, 6900, 3800];
-            this.peopleOffest = [50, 500, 200];
-            this.updateSelf();
+            this.peopleArr = [65, 990, 580];
+            this.peopleOffest = [5, 10, 10];
         }
         show(callback) {
+            this.updateSelf();
             super.show();
             this.ui.t0.play();
             this.callback = callback;

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 8 - 0
client/laya/src/ui/UIGameEnd.ts

@@ -180,6 +180,8 @@ export default class UIGameEnd extends UIBase {
         if (count % 5 == 0) {
             const reqStr = JSON.stringify(jsonStr);
             JSBridgeUtils.instance.logEventForAdHaveParams('rod_complete_' + d2, reqStr);
+
+            JSBridgeUtils.instance.logEventForFirebase('rod_complete_' + d2, reqStr);
         }
 
 
@@ -338,6 +340,8 @@ export default class UIGameEnd extends UIBase {
         if ( jsonStr.count  % 5 == 0) {
             const reqStr = JSON.stringify(jsonStr);
             JSBridgeUtils.instance.logEventForAdNoParams('classic_complete');
+
+            JSBridgeUtils.instance.logEventForFirebase('classic_complete', null);
         }
 
 
@@ -838,6 +842,10 @@ export default class UIGameEnd extends UIBase {
                 console.log('zh:每5关上报1次')
                 let sjmc = 'challenge_level_' + level;
                 JSBridgeUtils.instance.logEventForAdNoParams(sjmc);
+                
+                let sjmcForFirebase = 'challenge_level_' + level;
+                JSBridgeUtils.instance.logEventForFirebase(sjmcForFirebase,null);
+
             } else {
                 console.log('zh:5 no 上报')
             }

+ 10 - 4
client/laya/src/ui/UIModeSelection.ts

@@ -26,12 +26,18 @@ export default class UIModeSelection extends UIBase {
         this.addUIClick(this.ui.myNode.type2, this.enterGame, [2]);
         this.addUIClick(this.ui.myNode.type3, this.enterGame, [3]);
         this.addUIClick(this.ui.closeBtn, this.hide);
-        //
-        this.peopleArr = [650, 6900, 3800];
-        this.peopleOffest = [50, 500, 200];
-        this.updateSelf();
+        //原始的
+        // this.peopleArr = [650, 6900, 3800];
+        // this.peopleOffest = [50, 500, 200];
+
+        this.peopleArr = [65, 990, 580];
+        this.peopleOffest = [5, 10, 10];
+        //原先的
+       // this.updateSelf();
     }
     public show(callback): void {
+        this.updateSelf();
+        
         super.show();
         this.ui.t0.play();
         this.callback = callback;

+ 1 - 1
client/laya/src/ui/UISkill.ts

@@ -89,8 +89,8 @@ export default class UISkill extends UIBase {
         let nameList = xGame.common.skillNameList;
         let iconList = xGame.common.skillIconList;
         let describeList = [
+            "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow! ",
             "A break shot surging like a raging tide—powerful, explosive, and straight into the pocket!",//击球后球高高跃起召唤神龙,利用神龙之力令额外1颗球移动起来产生撞击
-            "A strike from the sky, like a meteor tearing through the heavens—delivering a thunderous blow!",
             "The power of frost descends—freezing the flow and taking full control of the game!"
         ];
         console.log('zh:initSkillData  111111111')

+ 20 - 2
client/laya/src/utils/JSBridgeUtils.ts

@@ -166,12 +166,30 @@ export default class JSBridgeUtils {
             return;
         }
         console.log("zh:call logEventForAdHaveParams eventName2=" + eventName);
-        console.log("zh:logEventForAdHaveParams req = json="+ jsonStr);
+        console.log("zh:logEventForAdHaveParams req = json=" + jsonStr);
 
-        this.bridge.call("logEventForAdHaveParams",eventName,jsonStr);
+        this.bridge.call("logEventForAdHaveParams", eventName, jsonStr);
     }
 
+    /**
+     * firebase 事件埋点
+     * @param eventName 
+     * @param jsonStr 
+     */
 
+    public logEventForFirebase(eventName, jsonStr) {
+        console.log("zh:ts logEventForFirebase eventName1=" + eventName);
+        if (!Laya.Browser.onAndroid) {
+            console.log('zh:非android dev')
+            return;
+        }
+        if (!this.initBridge()) {
+            return;
+        }
+        console.log("zh:call logEventForFirebase eventName2=" + eventName);
+        console.log("zh:logEventForFirebase req = json=" + jsonStr);
+        this.bridge.call("logEventForFirebase", eventName, jsonStr);
+    }
 
     ///----------------事件埋点 end
 

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor