更新主界面公告

assets/script/game/component/tween/FlyNode.ts

@@ -80,14 +80,14 @@ export default class FlyNode extends cc.Component {
             node_item.parent = this.node_fly;
             node_item.setPosition(start_pos);
             // // 创建位置
-            node_item.angle = this.Range(-45, 45, true);
-            let new_scale = this.Range(item_scale[0], item_scale[1], false);
+            node_item.angle = this.range(-45, 45, true);
+            let new_scale = this.range(item_scale[0], item_scale[1], false);
             node_item.scale = new_scale;
             // 偏移位置计算-新
-            let dir = cc.v2(this.Range(-1, 1, false), this.Range(-1, 1, false));
+            let dir = cc.v2(this.range(-1, 1, false), this.range(-1, 1, false));
             dir = dir.normalize();
-            let deltaInit = cc.v2(this.Range(10, 80, false) * dir.x, this.Range(10, 80, false) * dir.y);
-            let initPos = start_pos.add(deltaInit); Range
+            let deltaInit = cc.v2(this.range(10, 80, false) * dir.x, this.range(10, 80, false) * dir.y);
+            let initPos = start_pos.add(deltaInit);
             // node_item.setPosition(initPos);
 
             // 纹理
@@ -104,7 +104,7 @@ export default class FlyNode extends cc.Component {
      * @param initPos 
      */
     private movePos(node_item, initPos) {
-        let new_start_move_time = this.Range(0.3, 1, false);
+        let new_start_move_time = this.range(0.3, 1, false);
         //this.start_move_time
         let start_pos = cc.tween().to(new_start_move_time, { position: new cc.Vec2(initPos) }, { easing: 'sineOut' });
         let dt1 = cc.tween().delay(this.start_move_time * 1.5);
@@ -130,7 +130,7 @@ export default class FlyNode extends cc.Component {
      * @param isInt 
      * @returns 
      */
-    private Range(min: number, max: number, isInt: boolean = true): number {
+    private range(min: number, max: number, isInt: boolean = true): number {
         //return min + Math.ceil(Math.random() * 1000) % (max - min);         //不包含最大值
         let del: number = max - min;
         if (del > 0) {

assets/script/game/module/module/turntable/Turnable.ts

@@ -20,7 +20,7 @@ export default class Turnable extends cc.Component {
     @property(cc.RichText)
     lbl_left: cc.RichText = null;
 
-    private audioId:number;
+    private audioId: number;
 
     onLoad() {
         this.initData();
@@ -43,7 +43,12 @@ export default class Turnable extends cc.Component {
     /** 点击抽奖 */
     clickDraw() {
         if (gData.turnable.leftTimes > 0) {
-            gData.adData.watchVideo(AdFun.turntable);
+            mk.ad.watchAd((success: boolean) => {
+                mk.console.log("watchAD:" + success);
+                if (success) {
+                    gData.adData.watchVideo(AdFun.turntable);
+                }
+            });
         }
     }
 

assets/script/mk/system/AdSystem.ts

@@ -19,7 +19,7 @@ export default class AdSystem {
     public adSdk: any = null;
 
     /** 是否显示广告 */
-    public ifShowAd: boolean = false;
+    public ifShowAd: boolean = true;
 
     /** 视频广告回调 */
     public videoAdcallBack: Function = null;

settings/builder.json

@@ -51,5 +51,8 @@
     "recordPath": ""
   },
   "appBundle": false,
-  "agreements": {}
+  "agreements": {
+    "20200904180755": false,
+    "20200904180716": false
+  }
 }

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1623138955833,
+  "last-module-event-record-time": 1623807966016,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

settings/services.json

@@ -1,6 +1,19 @@
 {
 	"game": {
-		"name": "未知游戏",
-		"appid": "UNKNOW"
-	}
+		"name": "mk_framework",
+		"appid": "638076156",
+		"cid": 0
+	},
+	"needExecNative": true,
+	"configs": [
+		{
+			"appid": "638076156",
+			"services": [
+				{
+					"service_id": "235",
+					"enable": false
+				}
+			]
+		}
+	]
 }