Browse Source

花仙子添加字段OVER

zh 7 months ago
parent
commit
20d3059b9c

+ 62 - 36
assets/Script/ATAndroidJS2.ts

@@ -1,26 +1,21 @@
 declare const jsb: any;
+// const classJavaName = "org/cocos2dx/javascript/cocosjs/ATJSBridge";
+// const classJavaParamName = "com/cocos/service/SDKWrapper";
+// const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
+
 
 const classJavaName = "org/cocos2dx/javascript/cocosjs/ATJSBridge";
 const classJavaParamName = "org/cocos2dx/javascript/AppActivity";
 const Cocos2dxHelper = "org/cocos2dx/lib/Cocos2dxHelper";
 
-/**
- * 正式的 HXZ  reward Placement: n1g1eu3bk8frq9	
- */
+//正式的 HXZ  reward Placement: n1g1eu3bk8frq9	
 const placementID="n1g1eu3bk8frq9";
 
-/**
- * 测试专用n6729e95f588aa    n66f7c61b71d4c   
- */
-const testPlacementID="n6729e95f588aa"; 
-
-
+//测试专用n6729e95f588aa    n66f7c61b71d4c   
+const testPlacementID="n66f7c61b71d4c"; 
 
-
-/**
- * 打砖块的
- */
-const testPlacementIDForDzk="n67122e8932a3d";
+//打砖块的
+const testPlacementIdForDzk="n67122e8932a3d";
 
 interface ATAndroidJS {
     getDeviceModel(): string;
@@ -36,7 +31,6 @@ interface ATAndroidJS {
     getPackageName(): string;
     getAppInstall(): string;
     getAppInstandId(): string;
-
     printJsLog(msg: string): void;
     initSDK(appid: string, appkey: string): void;
     initCustomMap(customMap: string): void;
@@ -52,21 +46,27 @@ interface ATAndroidJS {
     getLanguage():string;
     getInstanceId():string;
     getInfomation():string;
-    getAdvertisingId(): string;
     getAdId(): string;
     getDeviceUserId():string;
-
     getPlacementID():string;
-   
+    getUserAgent():string;
+    getBuildId():string;
+    getDeviceHardWare():string;
+    getScreenResolution():string;
+    getScreenDenstiy():string;
+    getNetworkType():string;
+    getSdkApi():string;
+    getDeviceBRAND():string;
 }
 
 
+
 const ATAndroidJS: ATAndroidJS = {
     getDeviceModel: function () {
-        return jsb.reflection.callStaticMethod(Cocos2dxHelper, "getDeviceModel", "()Ljava/lang/String;");
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceModel", "()Ljava/lang/String;");
     },
     getSystemVersion: function () {
-        return jsb.reflection.callStaticMethod(Cocos2dxHelper, "getSystemVersion", "()Ljava/lang/String;");
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getOSVersion", "()Ljava/lang/String;");
     },
     getDeviceManufacturer: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceManufacturer", "()Ljava/lang/String;");
@@ -93,7 +93,7 @@ const ATAndroidJS: ATAndroidJS = {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getVersionName", "()Ljava/lang/String;");
     },
     getPackageName: function () {
-        return jsb.reflection.callStaticMethod(Cocos2dxHelper, "getPackageName", "()Ljava/lang/String;");
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getPackageName", "()Ljava/lang/String;");
     },
     getAppInstall: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getAppInstall", "()Ljava/lang/String;");
@@ -102,8 +102,26 @@ const ATAndroidJS: ATAndroidJS = {
        // return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceId", "()Ljava/lang/String;");
        return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceIds", "()Ljava/lang/String;");
     },
-    getAdvertisingId: function () {
-        return jsb.reflection.callStaticMethod(classJavaParamName, "getAdvertisingId", "()Ljava/lang/String;");
+    getUserAgent: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getUserAgent", "()Ljava/lang/String;");
+    },
+    getScreenResolution: function (){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getScreenResolution", "()Ljava/lang/String;");
+    },
+    getScreenDenstiy: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getScreenDenstiy", "()Ljava/lang/String;");
+    },
+    getNetworkType: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getNetworkType", "()Ljava/lang/String;");
+    },
+    getDeviceHardWare: function (){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceHardware", "()Ljava/lang/String;");
+    },
+    getDeviceBRAND: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getDeviceBRAND", "()Ljava/lang/String;");
+    },
+    getSdkApi: function(){
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getSdkApi", "()Ljava/lang/String;");
     },
     printJsLog: function (msg: string) {
         if (msg !== undefined && msg !== null) {
@@ -141,24 +159,29 @@ const ATAndroidJS: ATAndroidJS = {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getLanguage", "()Ljava/lang/String;");
     },
     getInstanceId: function () {
-        return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceId", "()Ljava/lang/String;");
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getInstanceIds", "()Ljava/lang/String;");
     },
     getInfomation: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getInfos", "()Ljava/lang/String;");
     },
-
+    getBuildId: function () {
+        return jsb.reflection.callStaticMethod(classJavaParamName, "getBuildId", "()Ljava/lang/String;");
+    },
     getAdId: function () {
         return jsb.reflection.callStaticMethod(classJavaParamName, "getAdId", "()Ljava/lang/String;");
     },
-   
+    getPlacementID: function(){
+          return placementID;
+       //  return testPlacementID;
+        //  return testPlacementIdForDzk;
+    },
+    
     
     /**
      * 本类封装了获取设备所有信息的方法,返回一个json字符串
      * @returns json string
      */
     allInfo:function() {
-       //let t1 = this.getAdvertisingId();
-       //console.log("zh:t1="+t1);
         const info = {
             systemVersion: this.getSystemVersion(),
             deviceModel: this.getDeviceModel(),
@@ -176,19 +199,24 @@ const ATAndroidJS: ATAndroidJS = {
             appInstantsId: this.getAppInstandId(),
             mediaType: this.getMediaType(),
             userIp: '',
-            gameId: 20
+            gameId: '20',
+            userAgent: this.getUserAgent(),
+            buildId: this.getBuildId(),
+            deviceHardware: this.getDeviceHardWare(),
+            screenResolution: this.getScreenResolution(),
+            screenDenstiy: this.getScreenDenstiy(),
+            networkType: this.getNetworkType(),
+            sdkApi: this.getSdkApi(),
+            deviceBrand: this.getDeviceBRAND()
         };
 
         return JSON.stringify(info);
     },
-    getPlacementID:function(){
-        return placementID;
-    // return testPlacementID;
-      // return testPlacementIDForDzk;
-    },
     getDeviceUserId: function(){
         return this.getDeviceId()
     },
+  
+
     /**
      * 发送HTTP数据到服务器
      * @param data 
@@ -218,6 +246,4 @@ const ATAndroidJS: ATAndroidJS = {
     
 };
 
-
-
 export default ATAndroidJS;

+ 4 - 4
assets/Script/game.js

@@ -211,10 +211,10 @@ cc.Class({
     }
     // 初始化SDK
 
-    //ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用,可以显示广告 ???      
-    //ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是cccc线上的
+     //ATSDK.initSDK("h66f7c5f8028cf", "ab133deec743a4bb58930891fd75d3f83");//测试专用,可以显示广告 ???      
+     ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
+    //ATSDK.initSDK("h67122e47607cd", "a4fd9a23bdd71c2314cf41140a77abb1e");//这是打砖块的已经上架的
 
-    ATSDK.initSDK("h672d7ac280581", "a899a1cd61dd62b83793d38c70486c750");//hxz
 
     ATSDK.setLogDebug(false);//ZH:DIY
     var GDPRLevel = ATSDK.getGDPRLevel();
@@ -245,7 +245,7 @@ cc.Class({
         AAJS2.makePostRequestWithXhr(JSON.stringify(data));
       }, 300);
     }
-    console.log('zh:AD   init end1')
+    console.log('zh:AD   init end11111')
   },
 
 

+ 113 - 0
assets/gameData-BACK.json

@@ -0,0 +1,113 @@
+{
+  "动画分数配置": "",
+  "levelData": [
+    {
+    "name": "萌心悦",
+    "score": 10000,
+    "giftStep":1,
+    "step": 5
+  }, {
+    "name": "甜梓萱",
+    "score": 20000,
+    "giftStep":2,
+    "step": 6
+  }, {
+    "name": "梦琪儿",
+    "score": 25000,
+    "giftStep":3,
+    "step": 7
+  }, {
+    "name": "可心怡",
+    "score": 30000,
+    "giftStep":4,
+    "step": 8
+  }, {
+    "name": "秋水仙",
+    "score": 35000,
+    "giftStep":5,
+    "step": 9
+  }, {
+    "name": "月清歌",
+    "score": 45000,
+    "giftStep":6,
+    "step": 10
+  }, {
+    "name": "萌小桃",
+    "score": 55000,
+    "giftStep":7,
+    "step": 10
+  }, {
+    "name": "芷若馨",
+    "score": 60000,
+    "giftStep":8,
+    "step": 10
+  }, {
+    "name": "心悦诗",
+    "score": 70000,
+    "giftStep":9,
+    "step": 10
+  }, {
+    "name": "甜蕊儿",
+    "score": 90000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "萧玉笛",
+    "score": 100000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "瑶梦露",
+    "score": 150000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "苏梦蝶",
+    "score": 200000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "墨玉轩",
+    "score": 250000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "烟雨梦",
+    "score": 300000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "花满楼",
+    "score": 350000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "梅映雪",
+    "score": 400000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "云初霁",
+    "score": 450000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "琴心韵",
+    "score": 500000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "紫凝香",
+    "score": 550000,
+    "giftStep":10,
+    "step": 10
+  }, {
+    "name": "芷兰心",
+    "score": 600000,
+    "giftStep":10,
+    "step": 10
+  }],
+  "buildingData":[{
+    "name":"通天塔"
+  }]
+}

+ 6 - 0
assets/gameData-BACK.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "e0468d01-e5a0-4b5f-8bdd-a8fabc20f960",
+  "importer": "json",
+  "subMetas": {}
+}

+ 1 - 1
settings/project.json

@@ -48,7 +48,7 @@
   "group-list": [
     "default"
   ],
-  "last-module-event-record-time": 1731392719587,
+  "last-module-event-record-time": 1732005930668,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,