图片和购买球杆

art/fgui/.objs/metas/isxx5ak7/kt443qh.info

@@ -1 +1,10 @@
-{}
+{
+  "objectStatus": {
+    "n2_hkrz": {
+      "hidden": true
+    },
+    "n12_hkrz": {
+      "hidden": true
+    }
+  }
+}

art/fgui/.objs/workspace.json

@@ -8,13 +8,12 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7hkrz3qu",
-    "ui://isxx5ak7i4k2438"
+    "ui://isxx5ak7kt443qh"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7i4k2438",
+  "doc.activeDoc": "ui://isxx5ak7kt443qh",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
@@ -24,13 +23,7 @@
     "isxx5ak7",
     "/UIGame/component/",
     "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISecretary/UIShop/",
-    "isxx5ak7",
-    "/UISecretary/UIShop/component/",
-    "isxx5ak7",
-    "/UISecretary/component/",
+    "/_exportasset/",
     "isxx5ak7",
     "/windows/"
   ],

art/fgui/assets/game/UIGame/component/powerNode.xml

@@ -2,8 +2,8 @@
 <component size="52,445" extention="ProgressBar" mask="n12_hkrz">
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3rm" fileName="UIGame/asset/yy_zs1.png" xy="0,0" pivot="1,0"/>
-    <image id="n3_hkrz" name="bar_v" src="hkrz3rz" fileName="UIGame/asset/yy_zs3.png" xy="0,0" size="52,443" alpha="0"/>
-    <image id="n10_hkrz" name="showImg" src="hkrz3sn" fileName="_exportasset/qg0.png" xy="17,14"/>
+    <image id="n3_hkrz" name="bar_v" src="hkrz3rz" fileName="UIGame/asset/yy_zs3.png" xy="0,0" pivot="0.5,0.5" size="52,443" alpha="0"/>
+    <loader id="n10_hkrz" name="showImg" xy="-7,-80" pivot="0.5,0.5" size="67,759" aspect="true" scale="0.7,0.7" url="ui://isxx5ak7hkrz3sn" align="center" vAlign="middle"/>
     <graph id="n12_hkrz" name="n12" xy="0,0" size="52,443" type="rect" fillColor="#ff000000"/>
   </displayList>
   <ProgressBar/>

art/fgui/assets/game/package.xml

@@ -1276,6 +1276,7 @@
     <image id="h498v579" name="234_2025.png" path="/UIRepentProp/asset/"/>
     <font id="d33kv57a" name="arial.ttf" path="/" renderMode="" samplePointSize="16"/>
     <component id="q5n8v57b" name="Component1303.xml" path="/UIGame/component/"/>
+    <image id="tpbsv57c" name="qg5 - 副本.png" path="/_exportasset/"/>
   </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

@@ -5421,6 +5421,7 @@
             this.nodeObj.cur = left;
         }
         updateData() {
+            console.log('zh:  updateData FFFFFFFFFF');
             let data = cfgTable.secretaryshopData;
             let children = this.ui.myNode._children;
             let temp;
@@ -5462,6 +5463,7 @@
                 }
             }
             else {
+                console.log('zh:点击购买了');
                 let need = needDiamond;
                 if (DataMgr.diamondEnough(need)) {
                     DataMgr.setDiamond(-need);
@@ -5521,10 +5523,12 @@
             }
         }
         updateSelf() {
+            console.log('zh:updateSelf -------------- ');
             let get = DataMgr.getBallRod(this.index);
             if (get == null)
                 get = 1;
             let curUse = DataMgr.getCurBallRod();
+            console.log('zh:updateSelf 选择的球杆 = ' + curUse);
             if (get) {
                 if (curUse == this.index) {
                     this.ui.purchaseBtn.c1.selectedIndex = 0;
@@ -5538,13 +5542,17 @@
             }
         }
         buyBallRod() {
+            console.log('zh:buyBallRod eeeeee');
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let selectedIndex = this.ui.purchaseBtn.c1.selectedIndex;
             switch (selectedIndex) {
                 case 0:
                     break;
                 case 1:
+                    console.log('zh:点击了 USE THIS');
                     DataMgr.setCurBallRod(this.index);
+                    let curUse = DataMgr.getCurBallRod();
+                    console.log('zh:updateSelf 选择的球杆 = ' + curUse);
                     let ui = xGame.uiMgr.getUI(UIShop);
                     ui.updateBallRod();
                     break;
@@ -9742,6 +9750,14 @@
             this.addUIClick(this.ui.placeChallengeNode.helpLineBtn, this.clickHelpLineBtn);
             this.addUIClick(this.ui.placeNormalNode.helpLineBtn, this.clickHelpLineBtn);
         }
+        getGanZiImg() {
+            let index = DataMgr.getCurBallRod();
+            let data = cfgTable.ballrodData[index + 1];
+            let gan_url = xGame.common.getGameIconUrl(data.img);
+            console.log('zh:getGanZiImg gan_url==' + gan_url);
+            this.ui.powerNode.showImg.url = gan_url;
+            console.log('zh:修改杆子图标O  K');
+        }
         returnHome() {
             let tips = "Are you sure to exit the game?";
             let woman = "Boss, why don't you play for a while longer?";
@@ -9796,6 +9812,9 @@
             this.ui.powerEft.visible = false;
             this.ui.colorNode.visible = false;
             this.updateHead();
+            let curUse = DataMgr.getCurBallRod();
+            console.log('zh:UIGame 选择的球杆234 = ' + curUse);
+            this.getGanZiImg();
         }
         updateSelf() {
             if (xGame.common.gameMode == GameMode.classic) {
@@ -16512,7 +16531,7 @@
             else
                 return false;
         }
-        static saveUserData(time = 1000, event, arg) {
+        static saveUserData(time = 500, event, arg) {
             if (this.userSaving)
                 return;
             this.userSaving = true;
@@ -17912,6 +17931,14 @@
             this.addUIClick(this.ui.placeChallengeNode.helpLineBtn, this.clickHelpLineBtn);
             this.addUIClick(this.ui.placeNormalNode.helpLineBtn, this.clickHelpLineBtn);
         }
+        getGanZiImg() {
+            let index = DataMgr.getCurBallRod();
+            let data = cfgTable.ballrodData[index + 1];
+            let gan_url = xGame.common.getGameIconUrl(data.img);
+            console.log('zh:getGanZiImg gan_url==' + gan_url);
+            this.ui.powerNode.showImg.url = gan_url;
+            console.log('zh:修改杆子图标O  K');
+        }
         returnHome() {
             let tips = "Are you sure to exit the game?";
             let woman = "Boss, why don't you play for a while longer?";
@@ -17966,6 +17993,9 @@
             this.ui.powerEft.visible = false;
             this.ui.colorNode.visible = false;
             this.updateHead();
+            let curUse = DataMgr.getCurBallRod();
+            console.log('zh:UIGame 选择的球杆234 = ' + curUse);
+            this.getGanZiImg();
         }
         updateSelf() {
             if (xGame.common.gameMode == GameMode.classic) {
@@ -20363,6 +20393,7 @@
             this.nodeObj.cur = left;
         }
         updateData() {
+            console.log('zh:  updateData FFFFFFFFFF');
             let data = cfgTable.secretaryshopData;
             let children = this.ui.myNode._children;
             let temp;
@@ -20404,6 +20435,7 @@
                 }
             }
             else {
+                console.log('zh:点击购买了');
                 let need = needDiamond;
                 if (DataMgr.diamondEnough(need)) {
                     DataMgr.setDiamond(-need);
@@ -20447,10 +20479,12 @@
             }
         }
         updateSelf() {
+            console.log('zh:updateSelf -------------- ');
             let get = DataMgr.getBallRod(this.index);
             if (get == null)
                 get = 1;
             let curUse = DataMgr.getCurBallRod();
+            console.log('zh:updateSelf 选择的球杆 = ' + curUse);
             if (get) {
                 if (curUse == this.index) {
                     this.ui.purchaseBtn.c1.selectedIndex = 0;
@@ -20464,13 +20498,17 @@
             }
         }
         buyBallRod() {
+            console.log('zh:buyBallRod eeeeee');
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let selectedIndex = this.ui.purchaseBtn.c1.selectedIndex;
             switch (selectedIndex) {
                 case 0:
                     break;
                 case 1:
+                    console.log('zh:点击了 USE THIS');
                     DataMgr.setCurBallRod(this.index);
+                    let curUse = DataMgr.getCurBallRod();
+                    console.log('zh:updateSelf 选择的球杆 = ' + curUse);
                     let ui = xGame.uiMgr.getUI(UIShop$1);
                     ui.updateBallRod();
                     break;

client/laya/src/data/Data.ts

@@ -85,7 +85,9 @@ export class UserData {
         for (let k in this) {
             data[k.toString()] = this[k];
         }
+       // console.log('zh:savedata start ');
         Laya.LocalStorage.setItem(dataName + "userdata", JSON.stringify(data));
+      //  console.log('zh:savedata end ');
     }
     public getData() {
         let ld = Laya.LocalStorage.getItem(dataName + "userdata");

client/laya/src/data/DataMgr.ts

@@ -207,7 +207,7 @@ export default class DataMgr {
             return false;
     }
     static userSaving = false;
-    public static saveUserData(time: number = 1000, event?, arg?): void {
+    public static saveUserData(time: number = 500, event?, arg?): void {
         if (this.userSaving)
             return;
         this.userSaving = true;

client/laya/src/fgui/res/game/ui_powerNode.ts

@@ -4,7 +4,7 @@ export default class ui_powerNode extends fgui.GProgressBar {
 
 	public n2:fgui.GImage;
 	public bar_v:fgui.GImage;
-	public showImg:fgui.GImage;
+	public showImg:fgui.GLoader;
 	public n12:fgui.GGraph;
 	public static URL:string = "ui://isxx5ak7kt443qh";
 
@@ -15,7 +15,7 @@ export default class ui_powerNode extends fgui.GProgressBar {
 	protected onConstruct():void {
 		this.n2 = <fgui.GImage>(this.getChild("n2"));
 		this.bar_v = <fgui.GImage>(this.getChild("bar_v"));
-		this.showImg = <fgui.GImage>(this.getChild("showImg"));
+		this.showImg = <fgui.GLoader>(this.getChild("showImg"));
 		this.n12 = <fgui.GGraph>(this.getChild("n12"));
 	}
 }

client/laya/src/ui/UIGame.ts

@@ -58,6 +58,11 @@ export class UIGame extends UIBase {
         let topUI = this.ui.topNode;
         topUI.selfBallList.itemRenderer = Laya.Handler.create(this, this.renderSelfDisplayBalls, null, false);
         topUI.aiBallList.itemRenderer = Laya.Handler.create(this, this.renderAIDisplayBalls, null, false);
+
+
+        //this.getGanZiImg();
+
+
         //
         this.barInfo = {};
         this.barInfo.curY = 0;
@@ -93,7 +98,24 @@ export class UIGame extends UIBase {
         this.addUIClick(this.ui.placeChallengeNode.helpLineBtn, this.clickHelpLineBtn);
         this.addUIClick(this.ui.placeNormalNode.helpLineBtn, this.clickHelpLineBtn);
         // this.addUIClick(this.ui.guideNode.guideBtn, this.clickHelpLineBtn, [true]);
+
+
+    }
+
+
+    getGanZiImg() {
+        // console.log('zh:组件有效性111:', this.ui.powerNode.showImg);
+        // console.log('zh:getGanZiImg getGanZiImg getGanZiImg getGanZiImg')
+        let index = DataMgr.getCurBallRod();
+        let data = cfgTable.ballrodData[index + 1];
+        let gan_url = xGame.common.getGameIconUrl(data.img);
+        console.log('zh:getGanZiImg gan_url==' + gan_url);
+        this.ui.powerNode.showImg.url = gan_url;
+        console.log('zh:修改杆子图标O  K');
     }
+
+
+
     returnHome() {
         let tips = "Are you sure to exit the game?"
         let woman = "Boss, why don't you play for a while longer?"
@@ -155,6 +177,12 @@ export class UIGame extends UIBase {
         this.ui.colorNode.visible = false;
         //
         this.updateHead();
+
+
+
+        let curUse = DataMgr.getCurBallRod();
+        console.log('zh:UIGame 选择的球杆234 = ' + curUse);
+        this.getGanZiImg();
     }
     public updateSelf() {
         //如果是大招模式随机一个关卡
@@ -292,7 +320,7 @@ export class UIGame extends UIBase {
             //this.ui.topNode.aiHeadLoader.url = baseHeadUrl + aiData.icon;
             //这里随机生成1-10以内的头像.png,因为只有10个本地头像
             let randNo = Math.floor(Math.random() * 10) + 1;
-            this.ui.topNode.aiHeadLoader.url = 'res/playersImg/'+randNo+'.png';
+            this.ui.topNode.aiHeadLoader.url = 'res/playersImg/' + randNo + '.png';
         }
     }
     initD2world() {
@@ -486,6 +514,9 @@ export class UIGame extends UIBase {
         }
         switch (this.pressTarget) {
             case PressType.powerNode:
+                // console.log('zh:  powerNode  抬起')
+                //  this.getGanZiImg();
+
                 this.ui.powerNode.value = 0;
                 this.ui.powerNode.showImg.y = this.barInfo.showStarY;
                 this.ui.powerTxt.text = "";

client/laya/src/ui/UISecretary.ts

@@ -114,6 +114,7 @@ export default class UISecretary extends UIBase {
         this.nodeObj.cur = left;
     }
     updateData() {
+        console.log('zh:  updateData FFFFFFFFFF')
         let data = cfgTable.secretaryshopData;
         let children = this.ui.myNode._children;
         let temp: ui_SecretaryDisplay;
@@ -174,6 +175,7 @@ export default class UISecretary extends UIBase {
             }
         }
         else {
+            console.log('zh:点击购买了')
             //点击购买
             let need = needDiamond;
             if (DataMgr.diamondEnough(need)) {

client/laya/src/ui/item/BallRodDisplay.ts

@@ -19,7 +19,7 @@ export default class BallRodDisplay {
     }
     public initData() {
         this.ui.purchaseBtn.onClick(this, this.buyBallRod);
-        let data = cfgTable.ballrodData[this.index+1];
+        let data = cfgTable.ballrodData[this.index + 1];
         this.ui.nameTxt.text = data.name;
         this.ui.rodImg.url = xGame.common.getGameIconUrl(data.img);
         this.ui.levelNode.c1.selectedIndex = data.quality;
@@ -34,9 +34,11 @@ export default class BallRodDisplay {
         }
     }
     updateSelf() {
+        console.log('zh:updateSelf -------------- ')
         let get = DataMgr.getBallRod(this.index);
         if (get == null) get = 1;
         let curUse = DataMgr.getCurBallRod();
+        console.log('zh:updateSelf 选择的球杆 = ' + curUse);
         if (get) {
             //已获得
             if (curUse == this.index) {
@@ -52,18 +54,27 @@ export default class BallRodDisplay {
         }
     }
     buyBallRod() {
+        console.log('zh:buyBallRod eeeeee');
         xGame.soundMgr.playSound(xGame.common.btnClickStr);
         let selectedIndex = this.ui.purchaseBtn.c1.selectedIndex;
         switch (selectedIndex) {
             case 0:
-
+              //  console.log('zh:点击了 000000000000000');
                 break;
             case 1:
+                console.log('zh:点击了 USE THIS');
                 DataMgr.setCurBallRod(this.index);
+
+               // DataMgr.setDiamond(99999);
+                //zh:测试专用，上线需要注销!!!!!!!!!!!!!!!
+
+                let curUse = DataMgr.getCurBallRod();
+                console.log('zh:updateSelf 选择的球杆 = ' + curUse);
                 let ui = <UIShop>xGame.uiMgr.getUI(UIShop);
                 ui.updateBallRod();
                 break;
             case 2:
+               // console.log('zh:点击了 2222222222222');
                 let data = cfgTable.ballrodData[this.index + 1];
                 let need = data.price;
                 if (DataMgr.diamondEnough(need)) {