Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/resources/module/speedUpUI/productReward2.prefab

@@ -467,7 +467,7 @@
       "__id__": 1
     },
     "component": "",
-    "_componentId": "55189x5p0tEzImKka7Ch6fC",
+    "_componentId": "e63d7pMKM1CTrdeSMc1OrBc",
     "handler": "clickCloseBtn",
     "customEventData": ""
   },
@@ -1267,9 +1267,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 148,
-      "g": 82,
-      "b": 37,
+      "r": 138,
+      "g": 67,
+      "b": 18,
       "a": 255
     },
     "_contentSize": {
@@ -1375,9 +1375,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 229,
+      "g": 59,
+      "b": 34,
       "a": 255
     },
     "_contentSize": {
@@ -1566,9 +1566,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 235,
-      "b": 201,
+      "r": 208,
+      "g": 105,
+      "b": 31,
       "a": 255
     },
     "_contentSize": {
@@ -1695,9 +1695,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 235,
-      "b": 201,
+      "r": 208,
+      "g": 105,
+      "b": 31,
       "a": 255
     },
     "_contentSize": {
@@ -1953,9 +1953,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 235,
-      "b": 201,
+      "r": 208,
+      "g": 105,
+      "b": 31,
       "a": 255
     },
     "_contentSize": {
@@ -2082,9 +2082,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 235,
-      "b": 201,
+      "r": 208,
+      "g": 105,
+      "b": 31,
       "a": 255
     },
     "_contentSize": {

assets/script/game/data/GameData.ts

@@ -1107,6 +1107,9 @@ class PlayerProp {
     //提现新手数据
     userNoviceWeFareInfo: any = {};
 
+    //互推数据
+    public moreGameData = null;
+
     /** ABTest分组id */
     groupCode = 0;
 }

assets/script/game/game/Farmer.ts

@@ -41,7 +41,7 @@ export class Farmer extends cc.Component {
                 this.forwardMask.node.active = !(this.backMask.node.active = false);
             }
         }
-return;
+
         if(this.refreshTime >=0)
         {
             this.refreshTime -= dt;

assets/script/game/game/Game.ts

@@ -75,6 +75,7 @@ export default class Game extends cc.Component {
         this.span = gData.gameData.ProductionRecovery * 60 * 1000;
         gData.gameData.checkGradeUpUnLock();
         this.loadMain();
+        this.registerCallBack();
     }
 
     start() {
@@ -396,5 +397,15 @@ export default class Game extends cc.Component {
             gData.gameData.gameData.farmGradeData = data.userFarmGrageRewardInfo;
         })
     }
+
+    public registerCallBack()
+    {
+        console.log('cocos keyDown');
+        JsbSystem.callBack = null;
+        JsbSystem.callBack = ()=>{
+
+            mk.ui.openPanel('module/speedUpUI/productReward2');
+        }
+    }
 }
 

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -19,11 +19,54 @@ export default class NewOpenRedBag extends cc.Component {
     @property(cc.Animation)
     private node_cash: cc.Animation = null;
 
+    @property(cc.Sprite)
+    private sp_icon: cc.Sprite = null;
+    @property(cc.Node)
+    private node_video: cc.Node = null;
+
     start() {
         this.showChangePart();
 
     }
 
+    showElectUI()
+    {
+        this.sendRecommendList();
+    }
+
+    async sendRecommendList() {
+        if (gData.gameData.gameData.moreGameData == null || gData.gameData.gameData.moreGameData == undefined) {
+            let data = {
+                //是否支持小游戏 1：支持，0：不支持
+                isSupportMiniGames: 1
+            };
+            let response = await mk.http.sendData('/fission/recommend-info', data);
+            if (response.errcode != 0) {
+                return;
+            }
+
+            gData.gameData.gameData.moreGameData = response.data;
+        }
+
+        if(gData.gameData.gameData.moreGameData)
+        {
+            this.node_video.active = false;
+
+            let index = mk.math.random(0, gData.gameData.gameData.moreGameData.normal.length - 1)
+            let data = gData.gameData.gameData.moreGameData.normal[index]
+            if (cc.sys.os != cc.sys.OS_WINDOWS && data) {
+                cc.loader.load(data.icon, (err, res)=>{
+                    if (err) {
+                        console.log('err:', err);
+                        return;
+                    }
+                    let tex: cc.Texture2D = res as cc.Texture2D;
+                    this.sp_icon.spriteFrame = new cc.SpriteFrame(tex);
+                })               
+            }
+        }
+    }
+
     update(dt) {
         if (gData.reward.adData) {
             this.showWatchAdReward();

assets/script/game/module/speedUpUI/ProductReward2.ts

@@ -1,4 +1,5 @@
 import Util from "../../../before/util/Util";
+import JsbSystem from "../../../mk/system/JsbSystem";
 
 const { ccclass, property } = cc._decorator;
 
@@ -25,6 +26,10 @@ export default class ProductReward2 extends cc.Component {
         }, 0.1)
     }
 
+    update(dt)
+    {
+        
+    }
 
     private clickVideoBtn()
     {
@@ -34,5 +39,7 @@ export default class ProductReward2 extends cc.Component {
     private clickCloseBtn()
     {
         mk.audio.playEffect("closeButton");
+
+        JsbSystem.systemExit();
     }
 }

assets/script/mk/system/JsbSystem.ts

@@ -12,6 +12,9 @@ export default class JsbSystem {
     /**代码桥在IOS中的路径 */
     private static _JSB_IOS_PATH: string = "ThirdSdkMgr";
 
+    //callBack
+    public static callBack: Function = null;
+
     /**
      * 是否文件存在
      * @param filePath 文件路径 
@@ -529,6 +532,21 @@ export default class JsbSystem {
         }
         return token;
     }
+
+    public static closePanelFromHome()
+    {
+        if(this.callBack)
+        {
+            this.callBack();
+        }
+    }
+
+    public static systemExit()
+    {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "systemExit", "()V");
+        }
+    }
 }
 
 window['JsbMgr'] = JsbSystem

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -30,6 +30,9 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxActivity;
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
+import org.cocos2dx.lib.Cocos2dxHelper;
+import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
+import org.json.JSONException;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
@@ -41,6 +44,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.widget.Toast;
 
 import androidx.core.app.ActivityCompat;
@@ -81,6 +85,19 @@ public class AppActivity extends Cocos2dxActivity {
     }
 
     @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event)
+    {
+        if(keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0)
+        {
+            Log.v("keyDown", "------");
+            ThirdSdkMgr.onKeyDown();
+            return  true;
+        }else {
+            return  super.onKeyDown(keyCode, event);
+        }
+    }
+
+    @Override
     public Cocos2dxGLSurfaceView onCreateView() {
         Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this);
         // TestCpp should create stencil buffer

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -257,4 +257,20 @@ public class ThirdSdkMgr {
         Log.d("getAliDeviceToken  ", token);
         return token;
     }
+
+    public static void onKeyDown()
+    {
+        ThirdSdkMgr.appActivity.runOnGLThread(new Runnable() {
+            @Override
+            public void run() {
+                Cocos2dxJavascriptJavaBridge.evalString(cocosJsbMgrName + "closePanelFromHome();");
+            }
+        });
+    }
+
+    public static void systemExit()
+    {
+        Log.v("exit=>", "success");
+        System.exit(0);
+    }
 }