游戏 nike & jordan 区分

mock/miniTb/mine/getAppData.json

@@ -10,7 +10,8 @@
         "openId": "string",
         "firstLoginToday": true,
         "newUser": false,
-        "shop": "FUSION"
+        "shop": "FUSION",
+        "shopId": 10004
     }
 }
 

module/RES.ts

@@ -162,7 +162,7 @@ export namespace RES {
                 } else {
                     reject();
                 }
-            }, arr/*, resPath + name*/)
+            }, arr/*, resPath + name*/, name)
         })
         groupsPromiseHash[name] = p;
         return p;
@@ -173,7 +173,7 @@ export namespace RES {
      * @param comFun 加载回调
      * @param thisObj this指向
      */
-    export function getResAsync(str: string, comFun?: (res: any, str: string) => void, thisObj?: any): Promise<any> {
+    export function getResAsync(str: string, comFun?: (res: any, str: string) => void, thisObj?: any, groupname?: string): Promise<any> {
         // var arr = str.split(".");
         var type = str.substring(str.lastIndexOf(".") + 1, str.length);
         //如果是图片
@@ -194,7 +194,7 @@ export namespace RES {
             }
             else {
                 //判断是否在资源里，判断是否要加载图集，注意已排除jpg
-                var groupName = hasRes(str);
+                var groupName = groupname || hasRes(str);
                 if (groupName && type != "jpg") {
                     var group = getGroupByName(groupName);
                     if (group && group.atlas) {
@@ -433,7 +433,7 @@ export namespace RES {
      * @param callback 
      * @param arr 
      */
-    function loadResList(callback: (allLoaded: boolean) => void, arr: string[]) {
+    function loadResList(callback: (allLoaded: boolean) => void, arr: string[], groupName:string) {
         let count = 0;
         let countAll = arr.length;
         if (!countAll) callback(true);
@@ -444,7 +444,7 @@ export namespace RES {
                 //标记失败，如果有一项资源加载失败，标记下
                 if (!res) mark = false
                 if (++count == countAll) callback(mark);
-            }, this)
+            }, this, groupName)
         }
     }
 

resource/res.json

@@ -13,7 +13,7 @@
 			"name": "GameOverPanel"
 		},
 		{
-			"keys": "balance_guidance.png,guidance-t1.png,num0.png,num1.png,num2.png,num3.png,num4.png,num5.png,num6.png,num7.png,num8.png,num9.png,numb0.png,numb1.png,numb2.png,numb3.png,numb4.png,numb5.png,numb6.png,numb7.png,numb8.png,numb9.png,numbp.png,nump.png,p1-b.png,p1.png,p10-b.png,p10.png,p11-b.png,p11.png,p12-b.png,p12.png,p13-b.png,p13.png,p14-b.png,p14.png,p15-b.png,p15.png,p16-b.png,p16.png,p17-b.png,p17.png,p18-b.png,p18.png,p19-b.png,p19.png,p2-b.png,p2.png,p20-b.png,p20.png,p3-b.png,p3.png,p4-b.png,p4.png,p5-b.png,p5.png,p6-b.png,p6.png,p7-b.png,p7.png,p8-b.png,p8.png,p9-b.png,p9.png",
+			"keys": "balance_guidance.png,guidance-t1.png,num0.png,num1.png,num2.png,num3.png,num4.png,num5.png,num6.png,num7.png,num8.png,num9.png,numb0.png,numb1.png,numb2.png,numb3.png,numb4.png,numb5.png,numb6.png,numb7.png,numb8.png,numb9.png,numbp.png,nump.png,p1-b.png,p10-b.png,p11-b.png,p12-b.png,p13-b.png,p14-b.png,p15-b.png,p16-b.png,p17-b.png,p18-b.png,p19-b.png,p2-b.png,p20-b.png,p3-b.png,p4-b.png,p5-b.png,p6-b.png,p7-b.png,p8-b.png,p9-b.png",
 			"name": "GameScene"
 		},
 		{
@@ -25,8 +25,16 @@
 			"name": "balance_guidance"
 		},
 		{
-			"keys": "back.png,comCloseBtn.png,com_light.png,toastBg.png,waitingBg.png,waitingRot.png,跳过按钮.png",
+			"keys": "back.png,back_jordan.png,comCloseBtn.png,com_light.png,toastBg.png,waitingBg.png,waitingRot.png,跳过按钮.png",
 			"name": "common"
+		},
+		{
+			"keys": "p1.png,p10.png,p11.png,p12.png,p13.png,p14.png,p15.png,p16.png,p17.png,p18.png,p19.png,p2.png,p20.png,p3.png,p4.png,p5.png,p6.png,p7.png,p8.png,p9.png",
+			"name": "jordan_eles"
+		},
+		{
+			"keys": "p1.png,p10.png,p11.png,p12.png,p13.png,p14.png,p15.png,p16.png,p17.png,p18.png,p19.png,p2.png,p20.png,p3.png,p4.png,p5.png,p6.png,p7.png,p8.png,p9.png",
+			"name": "nike_eles"
 		}
 	],
 	"path": "./resource/"

src/Main.ts

@@ -189,8 +189,9 @@ export class Main {
 
         // MusicBtn.changeMusicStatus(true);   // TODO 进游戏打开音乐先
         // (function() {
-        //     changeScene(GameOverScene, {
-        //         score: '1'
+        //     showPanel(GameOverPanel, {
+        //         score: '1',
+        //         level: 3
         //     })
         // })()
     }

src/Tools.ts

@@ -57,7 +57,8 @@ export class Tools {
         firstLoginToday: boolean
         shop: string,
         startId: string,
-        completed: boolean
+        completed: boolean,
+        shopId: number | string
     }
 
     public static async getGlobalData() {

src/panels/GameOverPanel.ts

@@ -37,7 +37,9 @@ export class GameOverPanel extends Panel {
     icon.anchorTexture.set(0.5, 0.5)
     icon.addEventListener(FYGE.MouseEvent.CLICK, async function() {
       this.btnDelay(this)
-      const {data, success} = await sendTbNet(TbNetName.drawLotteryPrize)
+      const {data, success} = await sendTbNet(TbNetName.drawLotteryPrize, {
+        id: Tools.globalData.startId
+      })
       if (success) {
         if (data.type != 5) {
           // 中奖了

src/scenes/GameScene/GameScene.ts

@@ -90,6 +90,7 @@ export class GameScene extends MotionInitScene {
   _score: number
   gameEle: GameEle
   _gIndex: number = 1 // 游戏元素索引
+  isJordan: boolean
 
   constructor(){
     super()
@@ -97,8 +98,8 @@ export class GameScene extends MotionInitScene {
 
   set gIndex(n: number) {
     this._gIndex = n % 20 || 20
-    this.gameEle && this.gameEle.resetInit(`p${n}.png`)
-    this.centerp && (this.centerp.texture = RES.getRes(`p${n}-b.png`))
+    this.gameEle && this.gameEle.resetInit(`p${this._gIndex}.png`)
+    this.centerp && (this.centerp.texture = RES.getRes(`p${this._gIndex}-b.png`))
   }
 
   get gIndex(): number {
@@ -106,7 +107,9 @@ export class GameScene extends MotionInitScene {
   }
 
   get groupNames(): string[] {
-    return ['GameScene']
+    this.isJordan = Tools.globalData.shopId == 10003
+    var eles = this.isJordan ? 'jordan_eles' : 'nike_eles'
+    return ['GameScene', 'balance_guidance', eles]
   }
 
   set score(n: number) {
@@ -119,7 +122,7 @@ export class GameScene extends MotionInitScene {
   }
 
   async initUi() {
-    UI.Sp(this, 'back.png')
+    UI.Sp(this, this.isJordan ? 'back_jordan.png' : 'back.png')
     
     this.score = 0
 
@@ -156,21 +159,11 @@ export class GameScene extends MotionInitScene {
   async onSubmit(params) {
     const {data, success, message} = await sendTbNet(TbNetName.submitGame, params)
     if (success) {
-      const {score, isNewRecord, productLink, isWinPrize} = data
+      const {score, isNewRecord, productLink, isWinPrize,} = data
       if (isWinPrize) {
-        showPanel(GameOverPanel, {
-          score,
-          isNewRecord,
-          productLink,
-          isWinPrize
-        })
+        showPanel(GameOverPanel, data)
       } else {
-        changeScene(GameOverScene, {
-          score,
-          isNewRecord,
-          productLink,
-          isWinPrize
-        })
+        changeScene(GameOverScene, data)
       }
     } else {
       //@ts-ignore

src/scenes/GameScene/MotionInit.ts

@@ -216,6 +216,7 @@ export class MotionInitScene extends Scene {
       this.unshoot()
       FYGE.Tween.removeTweens(this.focusProgress)
       this.focusProgress.visible = false
+      this.focusProgress.value = 0
       this.bitmapTextCount.visible = false
     }
 

src/scenes/NewGuyScene/NewGuyScene.ts

+import { Tools } from './../../Tools';
 import { changeScene } from './../../../module/ctrls/index';
 import { layers } from "../../../module/views/layers"
 import { GameEle, GameScene } from "../GameScene/GameScene"
@@ -17,9 +18,11 @@ export function setCenterPos(cont: FYGE.Sprite) {
 }
 
 export class NewGuyScene extends MotionInitScene {
-
+  isJordan: boolean
   get groupNames(): string[] {
-    return ['GameScene', 'balance_guidance']
+    this.isJordan = Tools.globalData.shopId == 10003
+    var eles = this.isJordan ? 'jordan_eles' : 'nike_eles'
+    return ['GameScene', 'balance_guidance', eles]
   }
 
   constructor() {
@@ -27,7 +30,7 @@ export class NewGuyScene extends MotionInitScene {
   }
 
   async initUi() {
-    UI.Sp(this, 'back.png')
+    UI.Sp(this, this.isJordan ? 'back_jordan.png' : 'back.png')
 
     super.initUi()