1

.idea/workspace.xml

@@ -3,13 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="6d7f36c9-7613-4f12-9933-91b1cd2225cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/enum/NetName.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tw/manager/NetManager.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/preload.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/preload.tmproject" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/resource/default.thm.json" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/default.thm.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/resource/skins/StartSceneSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/StartSceneSkin.exml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/src/Panels/NoPrizePanel/NoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/NoPrizePanel/NoPrizePanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/src/Panels/PhonePanel/PhonePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/PhonePanel/PhonePanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/egret/src/Panels/PrizePanel/PrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/PrizePanel/PrizePanel.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/egret/src/Scene/StartScene/StartScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scene/StartScene/StartScene.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mock/json/getCarousel.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/json/getCarousel.json" afterDir="false" />
     </list>
@@ -125,7 +120,7 @@
       <workItem from="1570757810220" duration="3204000" />
       <workItem from="1570863953654" duration="5729000" />
       <workItem from="1571019462141" duration="698000" />
-      <workItem from="1571025699917" duration="15017000" />
+      <workItem from="1571025699917" duration="16352000" />
     </task>
     <servers />
   </component>

egret/libs/tw/enum/NetName.ts

@@ -112,5 +112,6 @@ export enum NetName {
 
     GET_PHONE,
     SUBMIT_PHONE,
+    GET_CAROUSEL,
 
 }
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -1610,7 +1610,7 @@ export class NetManager extends ABNetManager {
      */
     public getCarousel(callback: Function): void {
         const net: INetData = {
-            name: NetName.SUBMIT_PHONE,
+            name: NetName.GET_CAROUSEL,
             uri: '/customActivity/fuzhouBank/bigWheel/getCarousel',
             type: 'get',
             dataType: 'json',

egret/src/Scene/StartScene/StartScene.ts

@@ -24,6 +24,10 @@ export default class StartScene extends Scene {
     public myPrize_btn: eui.Button;
     public tips_label: eui.Label;
 
+    private timer: egret.Timer;
+
+    private count: number;
+
 
     public get skinKey() {
         return 'StartScene'
@@ -241,9 +245,19 @@ export default class StartScene extends Scene {
     }
 
     private initUI(): void {
+        NetManager.ins.getCarousel((success, res) => {
+            if(!success) {
+                return;
+            }
+            this.count = res.data.length - 1;
+            this.easyScroller(this.label1, this.label2, 1000);
+        });
         this.getPhone();
+        this.timer = new egret.Timer(5000, 0);
+        this.timer.addEventListener(egret.TimerEvent.TIMER, this.getCarousel, this);
+        this.timer.start();
+
         this.infoGroup.mask = this.infoMask;
-        this.easyScroller(this.label1, this.label2, 1000);
         this.getPrizeInfo();
 
         NetManager.ins.showLog(getlogItem(1));
@@ -258,8 +272,8 @@ export default class StartScene extends Scene {
         this.panelEffect();
     }
 
-    private panelEffect(){
-        egret.Tween.get(this.panel).to({rotation: 360}, 8000).call(()=>{
+    private panelEffect() {
+        egret.Tween.get(this.panel).to({rotation: 360}, 8000).call(() => {
             this.panelEffect();
         });
     }
@@ -279,7 +293,7 @@ export default class StartScene extends Scene {
         });
     }
 
-    private easyScroller(obj1: any, obj2: any, duration: number) {
+    private getCarousel() {
         NetManager.ins.getCarousel((success, res) => {
             if(!success) {
                 return;
@@ -289,18 +303,36 @@ export default class StartScene extends Scene {
                 this.infoGroup.visible = false;
                 return;
             }
+            this.count = res.data.length - 1;
             this.infoImg.visible = true;
             this.infoGroup.visible = true;
-            obj1.y = 48;
-            obj2.y = 48;
-            obj1.text = `恭喜手机尾号${res.data[Utils.RandomInt(0, res.data.length)]}的客户中奖`;
-            obj2.text = `恭喜手机尾号${res.data[Utils.RandomInt(0, res.data.length)]}的客户中奖`;
-            egret.Tween.get(obj1).to({y: 0}, duration).wait(1500).call(() => {
-                egret.Tween.get(obj1).to({y: -48}, duration).call(() => {
-                    egret.Tween.get(obj2).to({y: 0}, duration).wait(1500).call(() => {
-                        egret.Tween.get(obj2).to({y: -48}, duration).call(() => {
-                            this.easyScroller(obj1, obj2, duration);
-                        });
+        })
+    }
+
+    private easyScroller(obj1: any, obj2: any, duration: number) {
+        let data = DataManager.ins.getData(NetName.GET_CAROUSEL).data;
+        this.infoImg.visible = true;
+        this.infoGroup.visible = true;
+        obj1.y = 48;
+        obj2.y = 48;
+        if(this.count < 0) {
+            this.count = data.length - 1;
+        }
+        obj1.text = `恭喜手机尾号${data[this.count]}的客户中奖`;
+        this.count--;
+        if(this.count < 0) {
+            this.count = data.length - 1;
+        }
+        obj2.text = `恭喜手机尾号${data[this.count]}的客户中奖`;
+        this.count--;
+        if(this.count < 0) {
+            this.count = data.length - 1;
+        }
+        egret.Tween.get(obj1).to({y: 0}, duration).wait(1500).call(() => {
+            egret.Tween.get(obj1).to({y: -48}, duration).call(() => {
+                egret.Tween.get(obj2).to({y: 0}, duration).wait(1500).call(() => {
+                    egret.Tween.get(obj2).to({y: -48}, duration).call(() => {
+                        this.easyScroller(obj1, obj2, duration);
                     });
                 });
             });

mock/json/getCarousel.json

@@ -6,12 +6,6 @@
     "data": [
         "1111",
         "2222",
-        "3333",
-        "4444",
-        "5555",
-        "6666",
-        "7777",
-        "8888",
-        "9999"
+        "3333"
     ]
 }
\ No newline at end of file