فهرست منبع

1道具购买相关

dzduole 3 روز پیش
والد
کامیت
efdd2bfb69

+ 1 - 7
art/fgui/.objs/metas/isxx5ak7/g1giv4el.info

@@ -1,7 +1 @@
-{
-  "objectStatus": {
-    "n44_s46i": {
-      "locked": true
-    }
-  }
-}
+{}

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

@@ -21,7 +21,7 @@
       <relation target="" sidePair="center-center"/>
       <relation target="n2_qlo0" sidePair="middle-middle"/>
     </component>
-    <component id="n23_qlo0" name="myNode" src="g1giv4el" fileName="UIShop/component/Component58_11.xml" xy="636,114">
+    <component id="n23_qlo0" name="myNode" src="g1giv4el" fileName="UISecretary/UIShop/component/Component58_11.xml" xy="637,114">
       <relation target="n1_qlo0" sidePair="left-left"/>
       <relation target="n0_qlo0" sidePair="bottom-bottom"/>
     </component>

+ 2 - 2
art/fgui/assets/game/UISecretary/UIShop/component/Component58_1.xml

@@ -5,7 +5,7 @@
     <image id="n41_9d32" name="n41" src="qlo041j" fileName="UISkill/asset/qq_dtd2.png" xy="560,0" size="56,636" alpha="0.4">
       <relation target="n23_qlo0" sidePair="left-left,top-top"/>
     </image>
-    <component id="n8_qlo0" name="n8" src="g1giv4eo" fileName="UIShop/component/Component98.xml" xy="560,0" controller="c1,0"/>
+    <component id="n8_qlo0" name="n8" pkg="isxx5ak7" src="g1giv4eo" fileName="UIShop/component/Component98.xml" xy="560,0"/>
     <list id="n37_qlo0" name="skillList" xy="9,9" size="541,615" overflow="scroll" lineGap="10" defaultItem="ui://isxx5ak7g1giv4ee" align="center" renderOrder="descent" autoClearItems="true">
       <item/>
       <item/>
@@ -14,7 +14,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n44_s46i" name="n44" src="s46iv4f0" fileName="UIShop/component/Component98_1.xml" xy="560,132" controller="c1,1"/>
+    <component id="n44_s46i" name="n44" src="s46iv4f0" fileName="UISecretary/UIShop/component/Component98_1.xml" xy="561,132" controller="c1,0"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n23_qlo0" tween="true" startValue="0" endValue="1" duration="12"/>

+ 3 - 4
art/fgui/assets/game/UISecretary/UIShop/component/Component58_11.xml

@@ -15,12 +15,11 @@
       <item/>
       <item/>
     </list>
-    <component id="n46_nmu9" name="djList" src="nmu9v57t" fileName="UISecretary/UIShop/component/Component_daoju.xml" xy="5,8">
+    <component id="n46_nmu9" name="djList" src="nmu9v57t" fileName="UISecretary/UIShop/component/Component_daoju_list.xml" xy="9,9">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c1" pages="" condition="0"/>
     </component>
-    <component id="n45_lp3l" name="n45" src="lp3lv4j2" fileName="UISecretary/UIShop/component/Component98_3.xml" xy="560,1"/>
-    <component id="n44_s46i" name="n_item" src="s46iv4f0" fileName="UISecretary/UIShop/component/Component98_1.xml" xy="560,132" controller="c1,1"/>
+    <component id="n45_lp3l" name="n_qiuGan" src="lp3lv4j2" fileName="UISecretary/UIShop/component/Component98_3.xml" xy="560,1" controller="c1,0"/>
+    <component id="n44_s46i" name="n_daoju" src="s46iv4f0" fileName="UISecretary/UIShop/component/Component98_1.xml" xy="560,132" controller="c1,1"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n23_qlo0" tween="true" startValue="0" endValue="1" duration="12"/>

+ 0 - 10
art/fgui/assets/game/UISecretary/UIShop/component/Component_daoju.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="541,615">
-  <displayList>
-    <list id="n0_d6k9" name="n0" xy="15,29" size="507,571" overflow="scroll">
-      <item title="1111" name="111"/>
-      <item title="2222" name="222"/>
-      <item title="333" name="333"/>
-    </list>
-  </displayList>
-</component>

+ 7 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component_daoju_item.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="543,200" bgColorEnabled="true">
+  <displayList>
+    <graph id="n1_uel8" name="n1" xy="6,5" size="530,188" type="rect" fillColor="#ff666666"/>
+    <text id="n0_uel8" name="n0" xy="26,15" size="60,42" fontSize="30" text="test "/>
+  </displayList>
+</component>

+ 11 - 0
art/fgui/assets/game/UISecretary/UIShop/component/Component_daoju_list.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="541,615">
+  <displayList>
+    <list id="n0_d6k9" name="myList_daoju" xy="0,2" size="540,610" overflow="scroll" lineGap="10" align="center">
+      <item url="ui://isxx5ak7uel8v58m" title="11" name="11" selectedTitle="22"/>
+      <item url="ui://isxx5ak7uel8v58m" title="222" name="222" selectedTitle="222"/>
+      <item url="ui://isxx5ak7uel8v58m" title="333" name="333" selectedTitle="333"/>
+      <item url="ui://isxx5ak7uel8v58m" title="444" name="444" selectedTitle="444"/>
+    </list>
+  </displayList>
+</component>

+ 2 - 1
art/fgui/assets/game/package.xml

@@ -1287,7 +1287,7 @@
     <image id="jobkv57q" name="ty_fh.png" path="/_exportasset/_shareasset/"/>
     <image id="jobkv57r" name="ty_tc1.png" path="/_exportasset/_shareasset/"/>
     <image id="jobkv57s" name="ty_tc1_1.png" path="/_exportasset/_shareasset/"/>
-    <component id="nmu9v57t" name="Component_daoju.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="nmu9v57t" name="Component_daoju_list.xml" path="/UISecretary/UIShop/component/"/>
     <component id="bobav57u" name="UILogin.xml" path="/UIUser/" exported="true"/>
     <component id="bobav57v" name="UIReg.xml" path="/UIUser/" exported="true"/>
     <component id="bobav57x" name="Component1304_login.xml" path="/UIUser/component/"/>
@@ -1311,6 +1311,7 @@
     <image id="p8p3v58j" name="主界面1.png" path="/__示意图/"/>
     <image id="p8p3v58k" name="结算界面1.png" path="/__示意图/"/>
     <image id="d6k9v58l" name="input.png" path="/UIMoyu/asset/" scale="9grid" scale9grid="11,16,22,32"/>
+    <component id="uel8v58m" name="Component_daoju_item.xml" path="/UISecretary/UIShop/component/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

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


+ 94 - 11
client/laya/bin/js/bundle.js

@@ -872,7 +872,7 @@
             }
         }
         sendPost2025(reqUrl, data, call) {
-            let isDev = true;
+            let isDev = false;
             let urlTop = "https://api.kessongame.site/";
             let urlMid = urlTop + "prod-api/api/game/";
             if (isDev) {
@@ -5776,6 +5776,7 @@
         constructor() {
             super();
             this.itemNums = 0;
+            this.curType = "";
         }
         onConstructor() {
             this.ui = ui_UIShop.createInstance();
@@ -5783,19 +5784,53 @@
             this.isEject = false;
             this.moneyNode = new MoneyNode(this.ui.moneyNode);
             this.addUIClick(this.ui.closeNode.closeBtn, this.closeSelf);
+            this.addUIClick(this.ui.myNode.n_qiuGan, () => this.switchBtn("qiugan"));
+            this.addUIClick(this.ui.myNode.n_daoju, () => this.switchBtn("daoju"));
             this.addUIClick(this.ui, this.interuptSecretary);
             this.ui.myNode.myList.itemRenderer = Laya.Handler.create(this, this.renderBallRod, null, false);
             this.ballRodArr = [];
             this.itemNums = Object.keys(cfgTable.ballrodData).length;
             this.ui.myNode.myList.numItems = this.itemNums;
-            if (Moyu.isKs)
-                this.ui.closeNode.closeBtn.x += 100;
         }
-        show() {
+        show(type) {
             super.show();
+            console.log('zh:show type = ' + type);
+            this.curType = type == 0 ? "qiugan" : "daoju";
+            this.switchBtn("qiugan");
             this.playSecretaryIdle();
             this.updateBallRod();
         }
+        test123() {
+            console.log('zh:test123   ');
+        }
+        switchBtn(type) {
+            console.log('zh:1111切換   sel type=' + type);
+            if (type == "") {
+                type = this.curType;
+            }
+            else {
+                if (this.curType == type) {
+                    return;
+                }
+                else {
+                    this.curType = type;
+                }
+            }
+            if (type == "qiugan") {
+                console.log('zh:qg  sel');
+                this.ui.myNode.n_qiuGan.c1.selectedIndex = 0;
+                this.ui.myNode.n_daoju.c1.selectedIndex = 1;
+                this.ui.myNode.myList.visible = true;
+                this.ui.myNode.djList.visible = false;
+            }
+            else {
+                console.log('zh:dj   sel');
+                this.ui.myNode.n_qiuGan.c1.selectedIndex = 1;
+                this.ui.myNode.n_daoju.c1.selectedIndex = 0;
+                this.ui.myNode.myList.visible = false;
+                this.ui.myNode.djList.visible = true;
+            }
+        }
         updateBallRod() {
             for (let index = 0; index < this.ballRodArr.length; index++) {
                 this.ballRodArr[index].updateSelf();
@@ -7356,7 +7391,7 @@
             Moyu.sendDataEvent("secretary");
         }
         openShopView() {
-            xGame.uiMgr.Show(UIShop);
+            xGame.uiMgr.Show(UIShop, 0);
         }
         openSignView() {
             xGame.uiMgr.Show(UISign);
@@ -13123,8 +13158,8 @@
             this.n41 = (this.getChild("n41"));
             this.myList = (this.getChild("myList"));
             this.djList = (this.getChild("djList"));
-            this.n45 = (this.getChild("n45"));
-            this.n_item = (this.getChild("n_item"));
+            this.n_qiuGan = (this.getChild("n_qiuGan"));
+            this.n_daoju = (this.getChild("n_daoju"));
             this.t0 = this.getTransition("t0");
         }
     }
@@ -14473,6 +14508,7 @@
             return (fgui.UIPackage.createObject("game", "Component_daoju"));
         }
         onConstruct() {
+            this.n0 = (this.getChild("n0"));
         }
     }
     ui_Component_daoju.URL = "ui://isxx5ak7nmu9v57t";
@@ -15109,6 +15145,17 @@
     }
     ui_Component119.URL = "ui://isxx5ak7u8eiv4i3";
 
+    class ui_Component_daoju_item extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_daoju_item"));
+        }
+        onConstruct() {
+            this.n1 = (this.getChild("n1"));
+            this.n0 = (this.getChild("n0"));
+        }
+    }
+    ui_Component_daoju_item.URL = "ui://isxx5ak7uel8v58m";
+
     class ui_Component132_1 extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "Component132_1"));
@@ -16041,6 +16088,7 @@
             fgui.UIObjectFactory.setExtension(ui_againBtn.URL, ui_againBtn);
             fgui.UIObjectFactory.setExtension(ui_Component118.URL, ui_Component118);
             fgui.UIObjectFactory.setExtension(ui_Component119.URL, ui_Component119);
+            fgui.UIObjectFactory.setExtension(ui_Component_daoju_item.URL, ui_Component_daoju_item);
             fgui.UIObjectFactory.setExtension(ui_Component132_1.URL, ui_Component132_1);
             fgui.UIObjectFactory.setExtension(ui_SecretaryDisplay.URL, ui_SecretaryDisplay);
             fgui.UIObjectFactory.setExtension(ui_BallRodDisplay.URL, ui_BallRodDisplay);
@@ -22106,6 +22154,7 @@
         constructor() {
             super();
             this.itemNums = 0;
+            this.curType = "";
         }
         onConstructor() {
             this.ui = ui_UIShop.createInstance();
@@ -22113,19 +22162,53 @@
             this.isEject = false;
             this.moneyNode = new MoneyNode$1(this.ui.moneyNode);
             this.addUIClick(this.ui.closeNode.closeBtn, this.closeSelf);
+            this.addUIClick(this.ui.myNode.n_qiuGan, () => this.switchBtn("qiugan"));
+            this.addUIClick(this.ui.myNode.n_daoju, () => this.switchBtn("daoju"));
             this.addUIClick(this.ui, this.interuptSecretary);
             this.ui.myNode.myList.itemRenderer = Laya.Handler.create(this, this.renderBallRod, null, false);
             this.ballRodArr = [];
             this.itemNums = Object.keys(cfgTable.ballrodData).length;
             this.ui.myNode.myList.numItems = this.itemNums;
-            if (Moyu.isKs)
-                this.ui.closeNode.closeBtn.x += 100;
         }
-        show() {
+        show(type) {
             super.show();
+            console.log('zh:show type = ' + type);
+            this.curType = type == 0 ? "qiugan" : "daoju";
+            this.switchBtn("qiugan");
             this.playSecretaryIdle();
             this.updateBallRod();
         }
+        test123() {
+            console.log('zh:test123   ');
+        }
+        switchBtn(type) {
+            console.log('zh:1111切換   sel type=' + type);
+            if (type == "") {
+                type = this.curType;
+            }
+            else {
+                if (this.curType == type) {
+                    return;
+                }
+                else {
+                    this.curType = type;
+                }
+            }
+            if (type == "qiugan") {
+                console.log('zh:qg  sel');
+                this.ui.myNode.n_qiuGan.c1.selectedIndex = 0;
+                this.ui.myNode.n_daoju.c1.selectedIndex = 1;
+                this.ui.myNode.myList.visible = true;
+                this.ui.myNode.djList.visible = false;
+            }
+            else {
+                console.log('zh:dj   sel');
+                this.ui.myNode.n_qiuGan.c1.selectedIndex = 1;
+                this.ui.myNode.n_daoju.c1.selectedIndex = 0;
+                this.ui.myNode.myList.visible = false;
+                this.ui.myNode.djList.visible = true;
+            }
+        }
         updateBallRod() {
             for (let index = 0; index < this.ballRodArr.length; index++) {
                 this.ballRodArr[index].updateSelf();
@@ -23363,7 +23446,7 @@
             Moyu.sendDataEvent("secretary");
         }
         openShopView() {
-            xGame.uiMgr.Show(UIShop$1);
+            xGame.uiMgr.Show(UIShop$1, 0);
         }
         openSignView() {
             xGame.uiMgr.Show(UISign$1);

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 73 - 0
client/laya/bin/js/cfgTable.js

@@ -1045,4 +1045,77 @@ cfgTable.paiHangBangData = {
 		"type": "total",
 		"rankId": "12000"
 	
+}
+
+
+
+
+//道具新增购买
+cfgTable.daoJuData = {
+    [1]: {
+        id: 1,
+        name: 'Crimson Edge',
+        price: 0,
+        describe: 'rookie',
+        quality: 0,
+        img: 'qg0',
+        spine: '',
+        skillLevel: 0,
+        sort: 1,
+    },
+    [2]: {
+        id: 2,
+        name: 'Violet Glaze',
+        price: 1000,
+        describe: 'master',
+        quality: 1,
+        img: 'qg1',
+        spine: 'qiugan1',
+        skillLevel: 0,
+        sort: 3,
+    },
+    [3]: {
+        id: 3,
+        name: 'Vine Pact',
+        price: 1500,
+        describe: 'master',
+        quality: 1,
+        img: 'qg2',
+        spine: 'qiugan2',
+        skillLevel: 0,
+        sort: 4,
+    },
+    [4]: {
+        id: 4,
+        name: 'Blaze Chain',
+        price: 2000,
+        describe: 'master',
+        quality: 1,
+        img: 'qg3',
+        spine: 'qiugan3',
+        skillLevel: 0,
+        sort: 5,
+    },
+    [5]: {
+        id: 5,
+        name: 'Dragon Rainbow',
+        price: 3000,
+        describe: 'legend',
+        quality: 2,
+        img: 'qg4',
+        spine: 'qiugan4',
+        skillLevel: 0,
+        sort: 6,
+    },
+    [6]: {
+        id: 6,
+        name: 'Brown Ease',
+        price: 0,
+        describe: 'rookie',
+        quality: 0,
+        img: 'qg5',
+        spine: '',
+        skillLevel: 0,
+        sort: 2,
+    },
 }

+ 32 - 0
client/laya/libs/cfgTable.d.ts

@@ -41,8 +41,40 @@ declare namespace cfgTable {
         //排列顺序
         readonly sort: number;
     }
+
+
+
+
     //ballrod表数据
     export const ballrodData: { [key: number]: ballrod };
+
+
+
+    //道具表的数据结构体
+    export class daoJu {
+        //序号
+        readonly id: number;
+        //球杆名称
+        readonly name: string;
+        //价格
+        readonly price: number;
+        //品级描述
+        readonly describe: string;
+        //品级
+        readonly quality: number;
+        //图标名称
+        readonly img: string;
+        //spine名称
+        readonly spine: string;
+        //增加所有技能等级
+        readonly skillLevel: number;
+        //排列顺序
+        readonly sort: number;
+    }
+    //道具购买
+    export const daoJuData: { [key: number]: daoJu };
+
+
     //bigmove表的数据结构体
     export class bigmove {
         //关卡

+ 1 - 1
client/laya/src/core/mgrs/HttpMgr.ts

@@ -52,7 +52,7 @@ export class HttpMgr {
      * post请求,参数待扩展
      */
     public sendPost2025(reqUrl, data, call) {
-        let isDev = true;//是否是开发环境
+        let isDev = false;//是否是开发环境
         // let urlStr ="https://api.kessongame.site/prod-api/api/game/";
         //////////////https://api.kessongame.site/prod-api/api/game/getClassicCfg
         let urlTop = "https://api.kessongame.site/";

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

@@ -219,6 +219,7 @@ import ui_Component41_1 from "./ui_Component41_1";
 import ui_againBtn from "./ui_againBtn";
 import ui_Component118 from "./ui_Component118";
 import ui_Component119 from "./ui_Component119";
+import ui_Component_daoju_item from "./ui_Component_daoju_item";
 import ui_Component132_1 from "./ui_Component132_1";
 import ui_SecretaryDisplay from "./ui_SecretaryDisplay";
 import ui_BallRodDisplay from "./ui_BallRodDisplay";
@@ -490,6 +491,7 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_againBtn.URL, ui_againBtn);
 		fgui.UIObjectFactory.setExtension(ui_Component118.URL, ui_Component118);
 		fgui.UIObjectFactory.setExtension(ui_Component119.URL, ui_Component119);
+		fgui.UIObjectFactory.setExtension(ui_Component_daoju_item.URL, ui_Component_daoju_item);
 		fgui.UIObjectFactory.setExtension(ui_Component132_1.URL, ui_Component132_1);
 		fgui.UIObjectFactory.setExtension(ui_SecretaryDisplay.URL, ui_SecretaryDisplay);
 		fgui.UIObjectFactory.setExtension(ui_BallRodDisplay.URL, ui_BallRodDisplay);

+ 4 - 4
client/laya/src/fgui/res/game/ui_Component58_11.ts

@@ -11,8 +11,8 @@ export default class ui_Component58_11 extends fgui.GComponent {
 	public n41:fgui.GImage;
 	public myList:fgui.GList;
 	public djList:ui_Component_daoju;
-	public n45:ui_Component98_3;
-	public n_item:ui_Component98_1;
+	public n_qiuGan:ui_Component98_3;
+	public n_daoju:ui_Component98_1;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7g1giv4el";
 
@@ -26,8 +26,8 @@ export default class ui_Component58_11 extends fgui.GComponent {
 		this.n41 = <fgui.GImage>(this.getChild("n41"));
 		this.myList = <fgui.GList>(this.getChild("myList"));
 		this.djList = <ui_Component_daoju>(this.getChild("djList"));
-		this.n45 = <ui_Component98_3>(this.getChild("n45"));
-		this.n_item = <ui_Component98_1>(this.getChild("n_item"));
+		this.n_qiuGan = <ui_Component98_3>(this.getChild("n_qiuGan"));
+		this.n_daoju = <ui_Component98_1>(this.getChild("n_daoju"));
 		this.t0 = this.getTransition("t0");
 	}
 }

+ 17 - 0
client/laya/src/fgui/res/game/ui_Component_daoju_item.ts

@@ -0,0 +1,17 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+export default class ui_Component_daoju_item extends fgui.GComponent {
+
+	public n1:fgui.GGraph;
+	public n0:fgui.GTextField;
+	public static URL:string = "ui://isxx5ak7uel8v58m";
+
+	public static createInstance():ui_Component_daoju_item {
+		return <ui_Component_daoju_item>(fgui.UIPackage.createObject("game", "Component_daoju_item"));
+	}
+
+	protected onConstruct():void {
+		this.n1 = <fgui.GGraph>(this.getChild("n1"));
+		this.n0 = <fgui.GTextField>(this.getChild("n0"));
+	}
+}

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

@@ -612,7 +612,7 @@ export default class UIMain extends UIBase {
         Moyu.sendDataEvent("secretary");
     }
     openShopView() {
-        xGame.uiMgr.Show(UIShop);
+        xGame.uiMgr.Show(UIShop,0);
     }
     openSignView() {
         xGame.uiMgr.Show(UISign);

+ 56 - 5
client/laya/src/ui/UIShop.ts

@@ -9,6 +9,7 @@ export default class UIShop extends UIBase {
     public moneyNode: MoneyNode;
     public ballRodArr: Array<BallRodDisplay>;
     public itemNums: number = 0;
+    public curType: string = "";
     public constructor() {
         super();
 
@@ -20,26 +21,76 @@ export default class UIShop extends UIBase {
         this.moneyNode = new MoneyNode(this.ui.moneyNode);
         //
         this.addUIClick(this.ui.closeNode.closeBtn, this.closeSelf);
+        this.addUIClick(this.ui.myNode.n_qiuGan, () => this.switchBtn("qiugan"));
+        this.addUIClick(this.ui.myNode.n_daoju, () => this.switchBtn("daoju"));
+        // this.addUIClick(this.ui.btn_qiugan, this.test123);
+        // this.addUIClick(this.ui.btn_daoju, this.test123);
         this.addUIClick(this.ui, this.interuptSecretary);
+
         this.ui.myNode.myList.itemRenderer = Laya.Handler.create(this, this.renderBallRod, null, false);
         this.ballRodArr = [];
         this.itemNums = Object.keys(cfgTable.ballrodData).length;
         this.ui.myNode.myList.numItems = this.itemNums;
-        if (Moyu.isKs)
-            this.ui.closeNode.closeBtn.x += 100;
+        // if (Moyu.isKs)
+        //     this.ui.closeNode.closeBtn.x += 100;
+        //道具数据todo。。。。。。
+
+        
+
+
     }
-    public show(): void {
+    public show(type): void {
         super.show();
+
+        console.log('zh:show type = ' + type)
+        //type,0-球杆,1-道具
+        this.curType = type == 0 ? "qiugan" : "daoju";
+        this.switchBtn("qiugan");
         this.playSecretaryIdle();
         this.updateBallRod();
     }
+    test123() {
+        console.log('zh:test123   ')
+    }
+
+    switchBtn(type: string) {
+        console.log('zh:1111切換   sel type=' + type)
+        if (type == "") {
+            type = this.curType;
+        }
+        else {
+            if (this.curType == type) {
+                return;
+            }
+            else {
+                this.curType = type;
+            }
+        }
+        if (type == "qiugan") {
+            console.log('zh:qg  sel')
+            this.ui.myNode.n_qiuGan.c1.selectedIndex = 0;
+            this.ui.myNode.n_daoju.c1.selectedIndex = 1;
+            this.ui.myNode.myList.visible = true;
+            this.ui.myNode.djList.visible = false;
+
+        }
+        else {
+            console.log('zh:dj   sel')
+            this.ui.myNode.n_qiuGan.c1.selectedIndex = 1;
+            this.ui.myNode.n_daoju.c1.selectedIndex = 0;
+            this.ui.myNode.myList.visible = false;
+            this.ui.myNode.djList.visible = true;
+        }
+    }
+
+
     updateBallRod() {
         for (let index = 0; index < this.ballRodArr.length; index++) {
             this.ballRodArr[index].updateSelf();
         }
     }
     renderBallRod(sort, obj: ui_BallRodDisplay) {
-        let index = this.getIndexBySort(sort + 1)-1;
+        let index = this.getIndexBySort(sort + 1) - 1;
         let ballRod = new BallRodDisplay(obj, index);
         this.ballRodArr.push(ballRod);
     }
@@ -58,7 +109,7 @@ export default class UIShop extends UIBase {
         let yy = this.ui.secretary.height;
         let scale = xGame.common.getSecretaryScale();
         let data = { x: xx, y: yy, scaleX: scale, scaleY: scale };
-       // xGame.common.secretary.play(data, 1, true, parent);
+        // xGame.common.secretary.play(data, 1, true, parent);
         xGame.common.secretary.play(data, 0, true, parent);
     }
     interuptSecretary() {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است