dzduole 1 hari lalu
induk
melakukan
27d04c24de
30 mengubah file dengan 448 tambahan dan 104 penghapusan
  1. 5 4
      art/fgui/assets/game/UIMain/UIMain.xml
  2. 2 2
      art/fgui/assets/game/UIMain/component/Component_dl_zc.xml
  3. 7 0
      art/fgui/assets/game/UISecretary/UIFuli/UIFuli1.xml
  4. 7 0
      art/fgui/assets/game/UISecretary/UIFuli/UIFuli2.xml
  5. TEMPAT SAMPAH
      art/fgui/assets/game/UISecretary/UIFuli/asset/bj1.png
  6. TEMPAT SAMPAH
      art/fgui/assets/game/UISecretary/UIFuli/asset/btn_h.png
  7. TEMPAT SAMPAH
      art/fgui/assets/game/UISecretary/UIFuli/asset/btn_lv.png
  8. 15 0
      art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_1.xml
  9. 15 0
      art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_2.xml
  10. 7 0
      art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_btn_h.xml
  11. 7 0
      art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_btn_lv.xml
  12. 1 1
      art/fgui/assets/game/UISecretary/UIShop/component/daoJuDisplay.xml
  13. 9 0
      art/fgui/assets/game/package.xml
  14. TEMPAT SAMPAH
      client/laya/bin/asset/fgui/game.obj
  15. TEMPAT SAMPAH
      client/laya/bin/asset/fgui/game_atlas0.png
  16. TEMPAT SAMPAH
      client/laya/bin/asset/fgui/game_atlas0_1.png
  17. TEMPAT SAMPAH
      client/laya/bin/asset/fgui/game_atlas0_2.png
  18. TEMPAT SAMPAH
      client/laya/bin/asset/fgui/game_atlas0_3.png
  19. 250 54
      client/laya/bin/js/bundle.js
  20. 0 0
      client/laya/bin/js/bundle.js.map
  21. 36 9
      client/laya/bin/js/cfgTable.js
  22. 9 2
      client/laya/libs/cfgTable.d.ts
  23. 2 8
      client/laya/src/core/mgrs/ConfigMgr.ts
  24. 9 0
      client/laya/src/core/mgrs/HttpMgr.ts
  25. 12 0
      client/laya/src/fgui/res/game/gameBinder.ts
  26. 2 0
      client/laya/src/fgui/res/game/ui_UIMain.ts
  27. 0 8
      client/laya/src/ui/UILogin.ts
  28. 6 8
      client/laya/src/ui/UIMain.ts
  29. 46 7
      client/laya/src/ui/UIShop.ts
  30. 1 1
      client/laya/src/ui/item/DaoJuDisplay.ts

+ 5 - 4
art/fgui/assets/game/UIMain/UIMain.xml

@@ -65,9 +65,10 @@
     <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="953,132" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
-    <component id="n90_p8p3" name="n_Logout" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="368,17" group="n94_p8p3" controller="c1,4"/>
-    <component id="n91_p8p3" name="n_zhuCe" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="372,15" size="200,70" group="n94_p8p3" controller="c1,1"/>
-    <component id="n92_p8p3" name="n_dengLu" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="372,13" size="200,70" group="n94_p8p3" controller="c1,0"/>
-    <group id="n94_p8p3" name="n94" xy="368,13" size="204,74"/>
+    <component id="n90_p8p3" name="n_Logout" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="368,17" size="152,70" group="n94_p8p3" controller="c1,4"/>
+    <component id="n91_p8p3" name="n_zhuCe" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="368,17" size="152,70" group="n94_p8p3" controller="c1,1"/>
+    <component id="n92_p8p3" name="n_dengLu" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="368,17" size="171,70" group="n94_p8p3" controller="c1,0"/>
+    <group id="n94_p8p3" name="n94" xy="368,17" size="171,70"/>
+    <text id="n95_im8n" name="btn_fuli" xy="624,94" size="99,51" fontSize="25" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="福利"/>
   </displayList>
 </component>

+ 2 - 2
art/fgui/assets/game/UIMain/component/Component_dl_zc.xml

@@ -2,8 +2,8 @@
 <component size="200,70" extention="Button">
   <controller name="c1" alias="切换" exported="true" pages="0,login,1,reg,4,exit" selected="2"/>
   <displayList>
-    <text id="n0_p8p3" name="n0" xy="64,14" size="71,42" fontSize="30" color="#ffffff" autoSize="none" text="退出">
-      <gearText controller="c1" pages="1,4" values="注册|退出" default="登录"/>
+    <text id="n0_p8p3" name="n0" xy="19,14" size="161,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Login out">
+      <gearText controller="c1" pages="0,1,4" values="Login|Sign up|Login out"/>
     </text>
   </displayList>
   <Button/>

+ 7 - 0
art/fgui/assets/game/UISecretary/UIFuli/UIFuli1.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1334,750">
+  <displayList>
+    <graph id="n1_im8n" name="n1" xy="0,0" size="1334,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
+    <component id="n2_im8n" name="n2" src="im8nv59h" fileName="UISecretary/UIFuli/component/Component_fl_1.xml" xy="66,9"/>
+  </displayList>
+</component>

+ 7 - 0
art/fgui/assets/game/UISecretary/UIFuli/UIFuli2.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1334,750">
+  <displayList>
+    <graph id="n1_im8n" name="n1" xy="0,0" size="1334,750" alpha="0.6" type="rect" fillColor="#ff000000"/>
+    <component id="n0_im8n" name="n0" src="im8nv59n" fileName="UISecretary/UIFuli/component/Component_fl_2.xml" xy="0,0"/>
+  </displayList>
+</component>

TEMPAT SAMPAH
art/fgui/assets/game/UISecretary/UIFuli/asset/bj1.png


TEMPAT SAMPAH
art/fgui/assets/game/UISecretary/UIFuli/asset/btn_h.png


TEMPAT SAMPAH
art/fgui/assets/game/UISecretary/UIFuli/asset/btn_lv.png


+ 15 - 0
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_1.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1220,720">
+  <displayList>
+    <image id="n0_im8n" name="n0" src="im8nv59i" fileName="UISecretary/UIFuli/asset/bj1.png" xy="10,-1"/>
+    <component id="n3_im8n" name="btn_no" src="im8nv59m" fileName="UISecretary/UIFuli/component/Component_fl_btn_h.xml" xy="324,439"/>
+    <component id="n4_im8n" name="btn_buy" src="im8nv59l" fileName="UISecretary/UIFuli/component/Component_fl_btn_lv.xml" xy="703,439"/>
+    <text id="n6_im8n" name="n6" xy="349,205" size="164,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Privilege 1:"/>
+    <text id="n7_im8n" name="n7" xy="349,290" size="164,42" fontSize="30" color="#ffffff" bold="true" text="Privilege 2:"/>
+    <text id="n8_im8n" name="n8" xy="349,347" size="164,42" fontSize="30" color="#ffffff" bold="true" text="Privilege 3:"/>
+    <text id="n5_im8n" name="n5" xy="572,192" size="366,92" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="Remove interstitial ads and banner ad" input="true"/>
+    <text id="n9_im8n" name="n9" xy="572,294" size="365,43" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="We&apos;ll give away a club" input="true"/>
+    <text id="n10_im8n" name="n10" xy="572,348" size="355,43" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="500 diamond" input="true"/>
+    <text id="n11_im8n" name="txt_price" xy="559,396" size="102,66" fontSize="50" color="#fefefe" bold="true" strokeColor="#d62c20" strokeSize="3" text="4.99"/>
+  </displayList>
+</component>

+ 15 - 0
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1334,750">
+  <displayList>
+    <image id="n0_im8n" name="n0" src="im8nv59i" fileName="UISecretary/UIFuli/asset/bj1.png" xy="67,15"/>
+    <component id="n1_im8n" name="btn_no" src="im8nv59m" fileName="UISecretary/UIFuli/component/Component_fl_btn_h.xml" xy="353,464"/>
+    <component id="n2_im8n" name="btn_buy" src="im8nv59l" fileName="UISecretary/UIFuli/component/Component_fl_btn_lv.xml" xy="784,464"/>
+    <text id="n3_im8n" name="txt_price" xy="602,401" size="130,66" fontSize="50" color="#fefefe" bold="true" strokeColor="#d62c20" strokeSize="3" text="14.99"/>
+    <text id="n4_im8n" name="n4" xy="417,203" size="164,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Privilege 1:"/>
+    <text id="n6_im8n" name="n6" xy="417,284" size="164,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Privilege 2:"/>
+    <text id="n7_im8n" name="n7" xy="417,355" size="164,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="Privilege 3:"/>
+    <text id="n5_im8n" name="n5" xy="632,206" size="366,49" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="Play all modes for free" input="true"/>
+    <text id="n8_im8n" name="n8" xy="632,282" size="366,49" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="3000 diamond" input="true"/>
+    <text id="n9_im8n" name="n9" xy="632,340" size="366,49" fontSize="30" color="#ffff00" autoSize="none" bold="true" strokeColor="#000000" text="No ads at all" input="true"/>
+  </displayList>
+</component>

+ 7 - 0
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_btn_h.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="218,86">
+  <displayList>
+    <image id="n0_im8n" name="n0" src="im8nv59j" fileName="UISecretary/UIFuli/asset/btn_h.png" xy="0,0"/>
+    <text id="n2_im8n" name="n2" xy="30,25" size="158,35" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="NO,think you"/>
+  </displayList>
+</component>

+ 7 - 0
art/fgui/assets/game/UISecretary/UIFuli/component/Component_fl_btn_lv.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="218,86">
+  <displayList>
+    <image id="n0_im8n" name="n0" src="im8nv59k" fileName="UISecretary/UIFuli/asset/btn_lv.png" xy="0,0"/>
+    <text id="n2_im8n" name="n2" xy="83,25" size="51,35" fontSize="25" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Buy"/>
+  </displayList>
+</component>

+ 1 - 1
art/fgui/assets/game/UISecretary/UIShop/component/daoJuDisplay.xml

@@ -5,7 +5,7 @@
     <text id="n7_so7l" name="n_jiaGe" xy="377,45" size="63,42" fontSize="30" color="#ffff00" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="0.99"/>
     <text id="n8_so7l" name="n_zuanShi" xy="175,88" size="58,42" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="X50"/>
     <component id="n10_so7l" name="btn_buy" src="so7lv596" fileName="UISecretary/UIShop/component/btn_buy.xml" xy="290,103"/>
-    <text id="n11_so7l" name="nameTxt" xy="4,-1" size="321,42" fontSize="30" color="#ffffff" autoSize="none" bold="true" text="DAOJU NAME"/>
+    <text id="n11_so7l" name="nameTxt" xy="12,2" size="321,33" fontSize="23" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="DAOJU NAME"/>
     <loader id="n12_so7l" name="zsImg" xy="13,51" size="137,125" url="ui://isxx5ak7q3vkv59d" align="center" vAlign="middle"/>
   </displayList>
 </component>

+ 9 - 0
art/fgui/assets/game/package.xml

@@ -1332,6 +1332,15 @@
     <image id="q3vkv59d" name="sp_zs1.png" path="/_exportasset/daoju/" exported="true"/>
     <image id="q3vkv59e" name="sp_zs2.png" path="/_exportasset/daoju/" exported="true"/>
     <image id="q3vkv59f" name="sp_zs3.png" path="/_exportasset/daoju/" exported="true"/>
+    <component id="im8nv59g" name="UIFuli1.xml" path="/UISecretary/UIFuli/" exported="true"/>
+    <component id="im8nv59h" name="Component_fl_1.xml" path="/UISecretary/UIFuli/component/"/>
+    <image id="im8nv59i" name="bj1.png" path="/UISecretary/UIFuli/asset/"/>
+    <image id="im8nv59j" name="btn_h.png" path="/UISecretary/UIFuli/asset/"/>
+    <image id="im8nv59k" name="btn_lv.png" path="/UISecretary/UIFuli/asset/"/>
+    <component id="im8nv59l" name="Component_fl_btn_lv.xml" path="/UISecretary/UIFuli/component/"/>
+    <component id="im8nv59m" name="Component_fl_btn_h.xml" path="/UISecretary/UIFuli/component/"/>
+    <component id="im8nv59n" name="Component_fl_2.xml" path="/UISecretary/UIFuli/component/"/>
+    <component id="im8nv59o" name="UIFuli2.xml" path="/UISecretary/UIFuli/" exported="true"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

TEMPAT SAMPAH
client/laya/bin/asset/fgui/game.obj


TEMPAT SAMPAH
client/laya/bin/asset/fgui/game_atlas0.png


TEMPAT SAMPAH
client/laya/bin/asset/fgui/game_atlas0_1.png


TEMPAT SAMPAH
client/laya/bin/asset/fgui/game_atlas0_2.png


TEMPAT SAMPAH
client/laya/bin/asset/fgui/game_atlas0_3.png


+ 250 - 54
client/laya/bin/js/bundle.js

@@ -871,6 +871,13 @@
                 }
             }
         }
+        getReqData() {
+            let reqData = JSON.stringify({
+                gameName: "TQ",
+                gameUserName: "zhangSan"
+            });
+            return reqData;
+        }
         sendPost2025(reqUrl, data, call) {
             let isDev = true;
             let urlTop = "https://api.kessongame.site/";
@@ -4420,6 +4427,7 @@
             this.n_Logout = (this.getChild("n_Logout"));
             this.n_zhuCe = (this.getChild("n_zhuCe"));
             this.n_dengLu = (this.getChild("n_dengLu"));
+            this.btn_fuli = (this.getChild("btn_fuli"));
         }
     }
     ui_UIMain.URL = "ui://isxx5ak7kt443qc";
@@ -5837,7 +5845,7 @@
             console.log('zh:' + JSON.stringify(data));
             this.ui.nameTxt.text = data.spbt;
             this.ui.n_jiaGe.text = data.spjg + "";
-            this.ui.n_zuanShi.text = data.spjg + "";
+            this.ui.n_zuanShi.text = "X" + data.zssl + "";
             let baseUrl = "asset/sound/ogg/";
             this.ui.zsImg.url = xGame.common.getGameIconUrl(data.img);
         }
@@ -5850,6 +5858,38 @@
         }
     }
 
+    class ui_UIMsg extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "UIMsg"));
+        }
+        onConstruct() {
+            this.tipsNode = (this.getChild("tipsNode"));
+        }
+    }
+    ui_UIMsg.URL = "ui://isxx5ak7hkrz3qt";
+
+    class UIMsg extends UIBase {
+        constructor() {
+            super();
+        }
+        onConstructor() {
+            this.ui = ui_UIMsg.createInstance();
+            this.contentPane = this.ui;
+            this.isEject = false;
+            this.isMuti = true;
+        }
+        show(msg, callback) {
+            super.show();
+            this.ui.tipsNode.msgTxt.text = msg;
+            this.ui.alpha = 1;
+            Laya.Tween.to(this.ui, { alpha: 0 }, 500, null, Laya.Handler.create(this, () => {
+                this.hide();
+                callback && callback();
+            }), 1000);
+        }
+    }
+    UIMsg.uiName = "UIMsg";
+
     class UIShop extends UIBase {
         constructor() {
             super();
@@ -5870,12 +5910,43 @@
             this.ballRodArr = [];
             this.itemNums = Object.keys(cfgTable.ballrodData).length;
             this.ui.myNode.myList.numItems = this.itemNums;
+            this.loadDjdata_old();
+        }
+        loadDjdata_old() {
+            let fff = cfgTable.daoJuData;
             this.ui.myNode.djList.itemRenderer = Laya.Handler.create(this, this.renderDaoJu, null, false);
-            console.log('zh:obj=' + this.ui.myNode.djList);
             this.daoJuArr = [];
             this.itemNumsForDj = Object.keys(cfgTable.daoJuData).length;
             this.ui.myNode.djList.numItems = this.itemNumsForDj;
-            console.log('zh:999=' + this.itemNumsForDj);
+        }
+        getProductList() {
+            let reqData = xGame.httpMgr.getReqData();
+            let pd = JSON.parse(reqData);
+            pd.splx = "Consumable";
+            reqData = JSON.stringify(pd);
+            xGame.httpMgr.sendPost2025('getProductList', reqData, (res) => {
+                try {
+                    let code = res.code;
+                    let msg = res.msg;
+                    if (code == 200) {
+                        let data = res.data;
+                        for (let index = 0; index < data.length; index++) {
+                            let element = data[index];
+                            cfgTable.daoJuData[element.spid] = element;
+                        }
+                        console.log("fffddd=" + JSON.stringify(cfgTable.daoJuData));
+                    }
+                    else {
+                        xGame.uiMgr.Show(UIMsg, msg);
+                    }
+                }
+                catch (error) {
+                    console.log('error=' + error);
+                    alert(error);
+                }
+                finally {
+                }
+            });
         }
         show(type) {
             super.show();
@@ -5925,8 +5996,8 @@
             let ballRod = new BallRodDisplay(obj, index);
             this.ballRodArr.push(ballRod);
         }
-        renderDaoJu(sort, obj) {
-            let index = this.getIndexBySortForDj(sort + 1) - 1;
+        renderDaoJu(idx, obj) {
+            let index = this.getIndexBySortForDj(idx + 1) - 1;
             let b = new DaoJuDisplay(obj, index);
             this.daoJuArr.push(b);
         }
@@ -5938,10 +6009,10 @@
                 }
             }
         }
-        getIndexBySortForDj(sort) {
+        getIndexBySortForDj(idx) {
             let object = cfgTable.daoJuData;
             for (const key in object) {
-                if (object[key].sort == sort) {
+                if (object[key].idx == idx) {
                     return parseInt(key);
                 }
             }
@@ -6534,38 +6605,6 @@
     }
     UISkill.uiName = "UISkill";
 
-    class ui_UIMsg extends fgui.GComponent {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "UIMsg"));
-        }
-        onConstruct() {
-            this.tipsNode = (this.getChild("tipsNode"));
-        }
-    }
-    ui_UIMsg.URL = "ui://isxx5ak7hkrz3qt";
-
-    class UIMsg extends UIBase {
-        constructor() {
-            super();
-        }
-        onConstructor() {
-            this.ui = ui_UIMsg.createInstance();
-            this.contentPane = this.ui;
-            this.isEject = false;
-            this.isMuti = true;
-        }
-        show(msg, callback) {
-            super.show();
-            this.ui.tipsNode.msgTxt.text = msg;
-            this.ui.alpha = 1;
-            Laya.Tween.to(this.ui, { alpha: 0 }, 500, null, Laya.Handler.create(this, () => {
-                this.hide();
-                callback && callback();
-            }), 1000);
-        }
-    }
-    UIMsg.uiName = "UIMsg";
-
     class ui_UIModeSelection extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "UIModeSelection"));
@@ -6850,6 +6889,35 @@
     }
     UIReg.uiName = "UIReg";
 
+    class ui_UIFuli1 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "UIFuli1"));
+        }
+        onConstruct() {
+            this.n1 = (this.getChild("n1"));
+            this.n2 = (this.getChild("n2"));
+        }
+    }
+    ui_UIFuli1.URL = "ui://isxx5ak7im8nv59g";
+
+    class UIFuli1 extends UIBase {
+        constructor() {
+            super();
+        }
+        onConstructor() {
+            this.ui = ui_UIFuli1.createInstance();
+            this.contentPane = this.ui;
+            this.isEject = false;
+        }
+        show() {
+            super.show();
+        }
+        closeSelf() {
+            this.hide();
+        }
+    }
+    UIFuli1.uiName = "UIFuli1";
+
     class ui_UIGetAward extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "UIGetAward"));
@@ -7191,6 +7259,9 @@
         gotoRegUser() {
             xGame.uiMgr.Show(UIReg);
         }
+        showFuLi() {
+            xGame.uiMgr.Show(UIFuli1);
+        }
         c_btn_for_user() {
             this.ui.n_Logout.visible = false;
             this.ui.n_dengLu.visible = false;
@@ -7242,6 +7313,7 @@
             this.addUIClick(this.ui.n_Logout, this.Logout);
             this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
             this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
+            this.addUIClick(this.ui.btn_fuli, this.showFuLi);
         }
         show(showFailWords) {
             super.show();
@@ -13719,6 +13791,77 @@
     }
     ui_Component52.URL = "ui://isxx5ak7ihpy43t";
 
+    class ui_Component_fl_1 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_fl_1"));
+        }
+        onConstruct() {
+            this.n0 = (this.getChild("n0"));
+            this.btn_no = (this.getChild("btn_no"));
+            this.btn_buy = (this.getChild("btn_buy"));
+            this.n6 = (this.getChild("n6"));
+            this.n7 = (this.getChild("n7"));
+            this.n8 = (this.getChild("n8"));
+            this.n5 = (this.getChild("n5"));
+            this.n9 = (this.getChild("n9"));
+            this.n10 = (this.getChild("n10"));
+            this.txt_price = (this.getChild("txt_price"));
+        }
+    }
+    ui_Component_fl_1.URL = "ui://isxx5ak7im8nv59h";
+
+    class ui_Component_fl_btn_lv extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_fl_btn_lv"));
+        }
+        onConstruct() {
+            this.n0 = (this.getChild("n0"));
+            this.n2 = (this.getChild("n2"));
+        }
+    }
+    ui_Component_fl_btn_lv.URL = "ui://isxx5ak7im8nv59l";
+
+    class ui_Component_fl_btn_h extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_fl_btn_h"));
+        }
+        onConstruct() {
+            this.n0 = (this.getChild("n0"));
+            this.n2 = (this.getChild("n2"));
+        }
+    }
+    ui_Component_fl_btn_h.URL = "ui://isxx5ak7im8nv59m";
+
+    class ui_Component_fl_2 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_fl_2"));
+        }
+        onConstruct() {
+            this.n0 = (this.getChild("n0"));
+            this.btn_no = (this.getChild("btn_no"));
+            this.btn_buy = (this.getChild("btn_buy"));
+            this.txt_price = (this.getChild("txt_price"));
+            this.n4 = (this.getChild("n4"));
+            this.n6 = (this.getChild("n6"));
+            this.n7 = (this.getChild("n7"));
+            this.n5 = (this.getChild("n5"));
+            this.n8 = (this.getChild("n8"));
+            this.n9 = (this.getChild("n9"));
+        }
+    }
+    ui_Component_fl_2.URL = "ui://isxx5ak7im8nv59n";
+
+    class ui_UIFuli2 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "UIFuli2"));
+        }
+        onConstruct() {
+            this.n1 = (this.getChild("n1"));
+            this.n0 = (this.getChild("n0"));
+        }
+    }
+    ui_UIFuli2.URL = "ui://isxx5ak7im8nv59o";
+
     class ui_drawBtn extends fgui.GButton {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "drawBtn"));
@@ -16122,6 +16265,12 @@
             fgui.UIObjectFactory.setExtension(ui_Component124.URL, ui_Component124);
             fgui.UIObjectFactory.setExtension(ui_Component125.URL, ui_Component125);
             fgui.UIObjectFactory.setExtension(ui_Component52.URL, ui_Component52);
+            fgui.UIObjectFactory.setExtension(ui_UIFuli1.URL, ui_UIFuli1);
+            fgui.UIObjectFactory.setExtension(ui_Component_fl_1.URL, ui_Component_fl_1);
+            fgui.UIObjectFactory.setExtension(ui_Component_fl_btn_lv.URL, ui_Component_fl_btn_lv);
+            fgui.UIObjectFactory.setExtension(ui_Component_fl_btn_h.URL, ui_Component_fl_btn_h);
+            fgui.UIObjectFactory.setExtension(ui_Component_fl_2.URL, ui_Component_fl_2);
+            fgui.UIObjectFactory.setExtension(ui_UIFuli2.URL, ui_UIFuli2);
             fgui.UIObjectFactory.setExtension(ui_drawBtn.URL, ui_drawBtn);
             fgui.UIObjectFactory.setExtension(ui_Component43.URL, ui_Component43);
             fgui.UIObjectFactory.setExtension(ui_wordsDisplay.URL, ui_wordsDisplay);
@@ -17450,10 +17599,7 @@
             this.getConfigFromServer = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     this.httpReqOkCount = 0;
-                    let reqData = JSON.stringify({
-                        gameName: "TQ",
-                        gameUserName: "zhangSan"
-                    });
+                    let reqData = xGame.httpMgr.getReqData();
                     console.log('zh:第1个请求getClassicCfg');
                     const classicCfg = yield this.sendPostAsync('getClassicCfg', reqData);
                     this.classicCfg = classicCfg;
@@ -17528,10 +17674,7 @@
             this.getConfigFromServer();
         }
         test() {
-            let reqData = JSON.stringify({
-                gameName: "TQ",
-                gameUserName: "zhangSan"
-            });
+            let reqData = xGame.httpMgr.getReqData();
             xGame.httpMgr.sendPost2025('getClassicCfg', reqData, (res) => {
                 console.log('zh:1s');
                 try {
@@ -22385,7 +22528,7 @@
             console.log('zh:' + JSON.stringify(data));
             this.ui.nameTxt.text = data.spbt;
             this.ui.n_jiaGe.text = data.spjg + "";
-            this.ui.n_zuanShi.text = data.spjg + "";
+            this.ui.n_zuanShi.text = "X" + data.zssl + "";
             let baseUrl = "asset/sound/ogg/";
             this.ui.zsImg.url = xGame.common.getGameIconUrl(data.img);
         }
@@ -22418,12 +22561,43 @@
             this.ballRodArr = [];
             this.itemNums = Object.keys(cfgTable.ballrodData).length;
             this.ui.myNode.myList.numItems = this.itemNums;
+            this.loadDjdata_old();
+        }
+        loadDjdata_old() {
+            let fff = cfgTable.daoJuData;
             this.ui.myNode.djList.itemRenderer = Laya.Handler.create(this, this.renderDaoJu, null, false);
-            console.log('zh:obj=' + this.ui.myNode.djList);
             this.daoJuArr = [];
             this.itemNumsForDj = Object.keys(cfgTable.daoJuData).length;
             this.ui.myNode.djList.numItems = this.itemNumsForDj;
-            console.log('zh:999=' + this.itemNumsForDj);
+        }
+        getProductList() {
+            let reqData = xGame.httpMgr.getReqData();
+            let pd = JSON.parse(reqData);
+            pd.splx = "Consumable";
+            reqData = JSON.stringify(pd);
+            xGame.httpMgr.sendPost2025('getProductList', reqData, (res) => {
+                try {
+                    let code = res.code;
+                    let msg = res.msg;
+                    if (code == 200) {
+                        let data = res.data;
+                        for (let index = 0; index < data.length; index++) {
+                            let element = data[index];
+                            cfgTable.daoJuData[element.spid] = element;
+                        }
+                        console.log("fffddd=" + JSON.stringify(cfgTable.daoJuData));
+                    }
+                    else {
+                        xGame.uiMgr.Show(UIMsg, msg);
+                    }
+                }
+                catch (error) {
+                    console.log('error=' + error);
+                    alert(error);
+                }
+                finally {
+                }
+            });
         }
         show(type) {
             super.show();
@@ -22473,8 +22647,8 @@
             let ballRod = new BallRodDisplay$1(obj, index);
             this.ballRodArr.push(ballRod);
         }
-        renderDaoJu(sort, obj) {
-            let index = this.getIndexBySortForDj(sort + 1) - 1;
+        renderDaoJu(idx, obj) {
+            let index = this.getIndexBySortForDj(idx + 1) - 1;
             let b = new DaoJuDisplay$1(obj, index);
             this.daoJuArr.push(b);
         }
@@ -22486,10 +22660,10 @@
                 }
             }
         }
-        getIndexBySortForDj(sort) {
+        getIndexBySortForDj(idx) {
             let object = cfgTable.daoJuData;
             for (const key in object) {
-                if (object[key].sort == sort) {
+                if (object[key].idx == idx) {
                     return parseInt(key);
                 }
             }
@@ -22996,6 +23170,24 @@
     }
     UIReg$1.uiName = "UIReg";
 
+    class UIFuli1$1 extends UIBase {
+        constructor() {
+            super();
+        }
+        onConstructor() {
+            this.ui = ui_UIFuli1.createInstance();
+            this.contentPane = this.ui;
+            this.isEject = false;
+        }
+        show() {
+            super.show();
+        }
+        closeSelf() {
+            this.hide();
+        }
+    }
+    UIFuli1$1.uiName = "UIFuli1";
+
     class UITry$1 extends UIBase {
         constructor() {
             super();
@@ -23423,6 +23615,9 @@
         gotoRegUser() {
             xGame.uiMgr.Show(UIReg$1);
         }
+        showFuLi() {
+            xGame.uiMgr.Show(UIFuli1$1);
+        }
         c_btn_for_user() {
             this.ui.n_Logout.visible = false;
             this.ui.n_dengLu.visible = false;
@@ -23474,6 +23669,7 @@
             this.addUIClick(this.ui.n_Logout, this.Logout);
             this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
             this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
+            this.addUIClick(this.ui.btn_fuli, this.showFuLi);
         }
         show(showFailWords) {
             super.show();

File diff ditekan karena terlalu besar
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 36 - 9
client/laya/bin/js/cfgTable.js

@@ -1053,27 +1053,54 @@ cfgTable.paiHangBangData = {
 //道具新增购买
 cfgTable.daoJuData = {
     [1]: {
-        id: 1,
+        spid: 2,
+        ggSpid: 'com.vadltq.strike.ball.cue.gem50',
         spbt: 'Gem50',
         spjg: 0.99,
+        zssl: 50,
         spms: 'Gem50',
         img: 'sp_zs1',
-        sort: 1
+        idx: 1
     },
     [2]: {
-        id: 1,
+        spid: 3,
+        ggSpid: 'com.vadltq.strike.ball.cue.gem100',
         spbt: 'Gem100',
         spjg: 1.99,
+        zssl: 100,
         spms: 'Gem100',
         img: 'sp_zs2',
-        sort: 2
+        idx: 2
     },
     [3]: {
-        id: 1,
-        spbt: 'Gem150',
-        spjg: 3.99,
-        spms: 'Gem150',
+        spid: 4,
+        ggSpid: 'com.vadltq.strike.ball.cue.gem100',
+        spbt: 'Gem500',
+        spjg: 4.99,
+        zssl: 500,
+        spms: 'Gem500',
+        img: 'sp_zs3',
+        idx: 3
+    },
+    [4]: {
+        spid: 5,
+        ggSpid: 'com.vadltq.strike.ball.cue.gem2000',
+        spbt: 'Gem2000',
+        spjg: 9.99,
+        zssl: 2000,
+        spms: 'Gem2000',
         img: 'sp_zs3',
-        sort: 3
+        idx: 4
     },
+    [5]: {
+        spid: 6,
+        ggSpid: 'com.vadltq.strike.ball.cue.gem5000',
+        spbt: 'Gem5000',
+        spjg: 19.99,
+        zssl: 5000,
+        spms: 'Gem5000',
+        img: 'sp_zs3',
+        idx: 5
+    }
+
 }

+ 9 - 2
client/laya/libs/cfgTable.d.ts

@@ -53,11 +53,14 @@ declare namespace cfgTable {
     //道具表的数据结构体
     export class daoJu {
         //序号
-        readonly id: number;
+        readonly spid: number;
         //商品标题
         readonly spbt: string;
         //价格
         readonly spjg: number;
+
+        //获得钻石数量
+        readonly zssl:number;
         //商品描述
         readonly spms: string;
        
@@ -65,7 +68,11 @@ declare namespace cfgTable {
         readonly img: string;
      
         //排列顺序
-        readonly sort: number;
+        readonly idx: number;
+        
+        //谷歌商品ID
+        readonly ggSpid:string;
+        
 
 
     }

+ 2 - 8
client/laya/src/core/mgrs/ConfigMgr.ts

@@ -38,10 +38,7 @@ export class ConfigMgr {
     public getConfigFromServer = async (): Promise<void> => {
         try {
             this.httpReqOkCount = 0;
-            let reqData = JSON.stringify({
-                gameName: "TQ",
-                gameUserName: "zhangSan"
-            });
+            let reqData = xGame.httpMgr.getReqData();
             console.log('zh:第1个请求getClassicCfg');
             const classicCfg = await this.sendPostAsync('getClassicCfg', reqData);
             this.classicCfg = classicCfg;
@@ -91,10 +88,7 @@ export class ConfigMgr {
 
 
     private test() {
-        let reqData = JSON.stringify({
-            gameName: "TQ",
-            gameUserName: "zhangSan"
-        });
+        let reqData = xGame.httpMgr.getReqData();
         xGame.httpMgr.sendPost2025('getClassicCfg', reqData, (res) => {
             console.log('zh:1s')
             try {

+ 9 - 0
client/laya/src/core/mgrs/HttpMgr.ts

@@ -48,6 +48,15 @@ export class HttpMgr {
     }
 
 
+    public getReqData() {
+        let reqData = JSON.stringify({
+            gameName: "TQ",
+            gameUserName: "zhangSan"
+        });
+        return reqData;
+    }
+
+
     /**
      * post请求,参数待扩展
      */

+ 12 - 0
client/laya/src/fgui/res/game/gameBinder.ts

@@ -92,6 +92,12 @@ import ui_Button5 from "./ui_Button5";
 import ui_Component124 from "./ui_Component124";
 import ui_Component125 from "./ui_Component125";
 import ui_Component52 from "./ui_Component52";
+import ui_UIFuli1 from "./ui_UIFuli1";
+import ui_Component_fl_1 from "./ui_Component_fl_1";
+import ui_Component_fl_btn_lv from "./ui_Component_fl_btn_lv";
+import ui_Component_fl_btn_h from "./ui_Component_fl_btn_h";
+import ui_Component_fl_2 from "./ui_Component_fl_2";
+import ui_UIFuli2 from "./ui_UIFuli2";
 import ui_drawBtn from "./ui_drawBtn";
 import ui_Component43 from "./ui_Component43";
 import ui_wordsDisplay from "./ui_wordsDisplay";
@@ -363,6 +369,12 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_Component124.URL, ui_Component124);
 		fgui.UIObjectFactory.setExtension(ui_Component125.URL, ui_Component125);
 		fgui.UIObjectFactory.setExtension(ui_Component52.URL, ui_Component52);
+		fgui.UIObjectFactory.setExtension(ui_UIFuli1.URL, ui_UIFuli1);
+		fgui.UIObjectFactory.setExtension(ui_Component_fl_1.URL, ui_Component_fl_1);
+		fgui.UIObjectFactory.setExtension(ui_Component_fl_btn_lv.URL, ui_Component_fl_btn_lv);
+		fgui.UIObjectFactory.setExtension(ui_Component_fl_btn_h.URL, ui_Component_fl_btn_h);
+		fgui.UIObjectFactory.setExtension(ui_Component_fl_2.URL, ui_Component_fl_2);
+		fgui.UIObjectFactory.setExtension(ui_UIFuli2.URL, ui_UIFuli2);
 		fgui.UIObjectFactory.setExtension(ui_drawBtn.URL, ui_drawBtn);
 		fgui.UIObjectFactory.setExtension(ui_Component43.URL, ui_Component43);
 		fgui.UIObjectFactory.setExtension(ui_wordsDisplay.URL, ui_wordsDisplay);

+ 2 - 0
client/laya/src/fgui/res/game/ui_UIMain.ts

@@ -58,6 +58,7 @@ export default class ui_UIMain extends fgui.GComponent {
 	public n_Logout:ui_Component_dl_zc;
 	public n_zhuCe:ui_Component_dl_zc;
 	public n_dengLu:ui_Component_dl_zc;
+	public btn_fuli:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7kt443qc";
 
 	public static createInstance():ui_UIMain {
@@ -99,5 +100,6 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.n_Logout = <ui_Component_dl_zc>(this.getChild("n_Logout"));
 		this.n_zhuCe = <ui_Component_dl_zc>(this.getChild("n_zhuCe"));
 		this.n_dengLu = <ui_Component_dl_zc>(this.getChild("n_dengLu"));
+		this.btn_fuli = <fgui.GTextField>(this.getChild("btn_fuli"));
 	}
 }

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

@@ -1,11 +1,6 @@
-import { HttpMgr } from "../core/mgrs/HttpMgr";
 import UIBase from "../fgui/core/UIBase";
 import ui_UILogin from "../fgui/res/game/ui_UILogin";
-
 import { LocalStorageManager } from "../utils/LocalStorageManager";
-
-
-import ui_UIReg from "../fgui/res/game/ui_UIReg";
 import { xGame } from "../xGame";
 import UIMsg from "./UIMsg";
 import UIReg from "./UIReg";
@@ -15,7 +10,6 @@ export default class UILogin extends UIBase {
 
     public constructor() {
         super();
-
     }
     protected onConstructor(): void {
         this.ui = ui_UILogin.createInstance();
@@ -83,7 +77,5 @@ export default class UILogin extends UIBase {
         xGame.uiMgr.Show(UIReg);
 
     }
-
-
 }
 UILogin.uiName = "UILogin";

+ 6 - 8
client/laya/src/ui/UIMain.ts

@@ -26,7 +26,8 @@ import JSBridgeUtils from "../utils/JSBridgeUtils";
 import SkillDisplay from "./item/SkillDisplay";
 import UIReg from "./UIReg";
 import UILogin from "./UILogin";
-
+import UIFuli1 from "./UIFuli1";
+import UIFuli2 from "./UIFuli2";
 import UITry from "./UITry";
 import UIPower from "./UIPower";
 import UIGetAward from "./UIGetAward";
@@ -35,15 +36,12 @@ import UIBox from "./UIBox";
 import UIAddCoin from "./UIAddCoin";
 import { NoInternetDialog } from "./NoInternetDialog";
 //import NetCheckTool from "../utils/NetCheckTool";
-
-
 import { LocalStorageManager } from "../utils/LocalStorageManager";
 
 
 
 export default class UIMain extends UIBase {
     public ui: ui_UIMain;
-    //
     public settingNode: SettingNode;
     public moneyNode: MoneyNode;
     public firstEnter = true;
@@ -200,14 +198,14 @@ export default class UIMain extends UIBase {
         }
     }
     gotoLogin() {
-
         xGame.uiMgr.Show(UILogin);
-
     }
-
     gotoRegUser() {
         xGame.uiMgr.Show(UIReg);
     }
+    showFuLi() {
+        xGame.uiMgr.Show(UIFuli1);
+    }
 
     /**
      * 登录注册退出
@@ -273,7 +271,7 @@ export default class UIMain extends UIBase {
         this.addUIClick(this.ui.n_Logout, this.Logout);
         this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
         this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
-
+        this.addUIClick(this.ui.btn_fuli, this.showFuLi);
 
 
     }

+ 46 - 7
client/laya/src/ui/UIShop.ts

@@ -6,6 +6,7 @@ import { xGame } from "../xGame";
 import BallRodDisplay from "./item/BallRodDisplay";
 import DaoJuDisplay from "./item/DaoJuDisplay";
 import MoneyNode from "./item/MoneyNode";
+import UIMsg from "../ui/UIMsg";
 export default class UIShop extends UIBase {
     protected ui: ui_UIShop;
     public moneyNode: MoneyNode;
@@ -37,16 +38,55 @@ export default class UIShop extends UIBase {
         // if (Moyu.isKs)
         //     this.ui.closeNode.closeBtn.x += 100;
 
+        this.loadDjdata_old();
+
+        
+        //this.getProductList();
+
+    }
+    private loadDjdata_old() {
         //道具数据----------------start
+        let fff = cfgTable.daoJuData;
+      //  console.log('zh:fff=' + JSON.stringify(fff));
+        //{"1":{"id":1,"spbt":"Gem50","spjg":0.99,"spms":"Gem50","img":"sp_zs1","sort":1},"2":{"id":1,"spbt":"Gem100","spjg":1.99,"spms":"Gem100","img":"sp_zs2","sort":2},"3":{"id":1,"spbt":"Gem150","spjg":3.99,"spms":"Gem150","img":"sp_zs3","sort":3}}
         this.ui.myNode.djList.itemRenderer = Laya.Handler.create(this, this.renderDaoJu, null, false);
-        console.log('zh:obj=' + this.ui.myNode.djList);
         this.daoJuArr = [];
         this.itemNumsForDj = Object.keys(cfgTable.daoJuData).length;
         this.ui.myNode.djList.numItems = this.itemNumsForDj;
-        console.log('zh:999=' + this.itemNumsForDj);
         //道具数据----------------end
+    }
+
+    public getProductList() {
+        let reqData = xGame.httpMgr.getReqData();
+        // 解析JSON字符串为JavaScript对象
+        let pd: any = JSON.parse(reqData);
+        pd.splx = "Consumable";//商城商品类型
+        reqData = JSON.stringify(pd);
+        xGame.httpMgr.sendPost2025('getProductList', reqData, (res) => {
+            try {
+              //  console.log('zh:res = ' + JSON.stringify(res))
+                let code = res.code;
+                let msg = res.msg;
+                if (code == 200) {
+                    let data = res.data;
+                    for (let index = 0; index < data.length; index++) {
+                        let element = data[index];
+                        cfgTable.daoJuData[element.spid] = element;
+                    }
+                    console.log("fffddd="+JSON.stringify(cfgTable.daoJuData))
+                } else {
+                    xGame.uiMgr.Show(UIMsg, msg)
+                }
+            } catch (error) {
+                console.log('error=' + error);
+                alert(error);
+            } finally {
 
+            }
+        });
     }
+
+
     public show(type): void {
         super.show();
         //type,0-球杆,1-道具
@@ -77,7 +117,6 @@ export default class UIShop extends UIBase {
 
             this.ui.myNode.n_qiuGan.c1.selectedIndex = 0;
             this.ui.myNode.n_daoju.c1.selectedIndex = 1;
-
             this.ui.myNode.c1.selectedIndex = 0;
             this.ui.myNode.myList.visible = true;
             this.ui.myNode.djList.visible = false;
@@ -103,8 +142,8 @@ export default class UIShop extends UIBase {
         let ballRod = new BallRodDisplay(obj, index);
         this.ballRodArr.push(ballRod);
     }
-    renderDaoJu(sort, obj: ui_daoJuDisplay) {
-        let index = this.getIndexBySortForDj(sort + 1) - 1;
+    renderDaoJu(idx, obj: ui_daoJuDisplay) {
+        let index = this.getIndexBySortForDj(idx + 1) - 1;
         let b = new DaoJuDisplay(obj, index);
         this.daoJuArr.push(b);
     }
@@ -116,10 +155,10 @@ export default class UIShop extends UIBase {
             }
         }
     }
-    getIndexBySortForDj(sort) {
+    getIndexBySortForDj(idx) {
         let object = cfgTable.daoJuData;
         for (const key in object) {
-            if (object[key].sort == sort) {
+            if (object[key].idx == idx) {
                 return parseInt(key);
             }
         }

+ 1 - 1
client/laya/src/ui/item/DaoJuDisplay.ts

@@ -25,7 +25,7 @@ export default class DaoJuDisplay {
         console.log('zh:' + JSON.stringify(data))
         this.ui.nameTxt.text = data.spbt;
         this.ui.n_jiaGe.text = data.spjg + "";
-        this.ui.n_zuanShi.text = data.spjg + "";
+        this.ui.n_zuanShi.text ="X"+ data.zssl + "";
 
         let baseUrl = "asset/sound/ogg/";
         this.ui.zsImg.url = xGame.common.getGameIconUrl(data.img);

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini