Browse Source

[FC][V2.0.0]蓝光版

fengcong 4 years ago
parent
commit
8176acc42f
20 changed files with 26 additions and 26 deletions
  1. 1 0
      assets/script/game/data/AdData.ts
  2. 1 1
      build/jsb-link/.cocos-project.json
  3. BIN
      build/jsb-link/assets/main/index.jsc
  4. 0 0
      build/jsb-link/assets/resources/config.json
  5. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  6. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  7. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk
  8. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/lgb/wxapi/WXEntryActivity.java
  9. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
  10. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  11. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java
  12. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/shuzilm/ShuzilmMgr.java
  13. 0 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java
  14. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java
  15. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr.java
  16. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
  17. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
  18. 1 0
      build/jsb-link/js backups (useful for debugging)/main.index.js
  19. 4 4
      packages-hot-update/cfg.json
  20. 1 1
      settings/builder.json

+ 1 - 0
assets/script/game/data/AdData.ts

@@ -196,6 +196,7 @@ export class AdData {
                 "publisher_revenue": data.publisher_revenue,
                 "precision": data.precision,
                 "ecpm_level": data.ecpm_level,  
+                "platformRisk":1,
                 "request_id": request_id
             }
         }

+ 1 - 1
build/jsb-link/.cocos-project.json

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "EasyEliminate",
-  "packageName": "com.aries.qsllx.qxb"
+  "packageName": "com.aries.qsllx.lgb"
 }

BIN
build/jsb-link/assets/main/index.jsc


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.aries.qsllx.qxb"
+    package="com.aries.qsllx.lgb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -61,11 +61,11 @@
         <!-- TODO GAME SDK接入YSDK初始化配置 END -->
 
         <activity
-            android:name="com.aries.qsllx.qxb.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.lgb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.qxb"
+            android:taskAffinity="com.aries.qsllx.lgb"
             android:launchMode="singleTask">
         </activity>
 

+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -7,9 +7,9 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="61147683bc78af7b67551ff7"; //友盟appid
 UM_CHANNEL="qsllx_zhubao_juliang"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wx6438b2697e818b24"; //微信appidUM_CHANNEL
+WX_APP_ID="wxe11c09c495c296ff"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
-PACKAGE_NAME=com.aries.qsllx.qxb
+PACKAGE_NAME=com.aries.qsllx.lgb
 VERSION_NAME=2.0.0
 VERSION_CODE=1000
 TOPON="a611477661e9de,66b742dd0e502b64d783d9c66a9d30c4,b6114779ae072d,b611477b50279c,b6114784ac56bd,b611477f437ccc,b6114781e4401e,b611477d1bce8e"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/lgb/wxapi/WXEntryActivity.java

@@ -1,4 +1,4 @@
-package com.aries.qsllx.qxb.wxapi;
+package com.aries.qsllx.lgb.wxapi;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -14,8 +14,8 @@ import android.widget.Toast;
 
 //import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
 
-import com.aries.qsllx.qxb.BuildConfig;
-import com.aries.qsllx.qxb.R;
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;

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

@@ -46,7 +46,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
-import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import com.tencent.ysdk.api.YSDKApi;
 
 import java.io.File;

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

@@ -19,8 +19,8 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
-import com.aries.qsllx.qxb.BuildConfig;
-import com.aries.qsllx.qxb.wxapi.WXEntryActivity;
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 

+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -16,8 +16,8 @@ import com.anythink.core.api.AdError;
 import com.anythink.splashad.api.ATSplashAd;
 import com.anythink.splashad.api.ATSplashAdListener;
 import com.anythink.splashad.api.IATSplashEyeAd;
-import com.aries.qsllx.qxb.BuildConfig;
-import com.aries.qsllx.qxb.R;
+import com.aries.qsllx.lgb.BuildConfig;
+import com.aries.qsllx.lgb.R;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/shuzilm/ShuzilmMgr.java

@@ -3,7 +3,7 @@ package org.cocos2dx.javascript.thirdSdk.shuzilm;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 import org.json.JSONObject;
 

+ 0 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -2,8 +2,6 @@ package org.cocos2dx.javascript.thirdSdk.thinkingdata;
 
 import android.util.Log;
 
-import com.aries.qsllx.qxb.BuildConfig;
-
 import org.cocos2dx.javascript.AppActivity;
 import org.json.JSONException;
 import org.json.JSONObject;

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.lgb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr.java

@@ -12,7 +12,7 @@ import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.PopupWindow;
 
-import com.aries.qsllx.qxb.R;
+import com.aries.qsllx.lgb.R;
 import com.tencent.ysdk.api.YSDKApi;
 import com.tencent.ysdk.framework.common.ePlatform;
 import com.tencent.ysdk.module.antiaddiction.listener.AntiAddictListener;

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist

@@ -11,7 +11,7 @@
     <key>CFBundleIcons~ipad</key>
     <dict/>
     <key>CFBundleIdentifier</key>
-    <string>com.aries.qsllx.qxb</string>
+    <string>com.aries.qsllx.lgb</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.aries.qsllx.qxb</string>
+	<string>com.aries.qsllx.lgb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

+ 1 - 0
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2070,6 +2070,7 @@ adsource_isheaderbidding: n.adsource_isheaderbidding,
 publisher_revenue: n.publisher_revenue,
 precision: n.precision,
 ecpm_level: n.ecpm_level,
+platformRisk: 1,
 request_id: o
 } : {
 imei: gData.appData.machineInfo.imei,

+ 4 - 4
packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
-    "version": "1.0.8",
+    "version": "1.0.9",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/",
-    "resourceRootDir": "D:\\copy\\mk_framework\\build\\jsb-link",
+    "resourceRootDir": "D:\\App\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/"
     ],
-    "buildTime": 1638276307585,
-    "genTime": 1638276307585,
+    "buildTime": 1638348636520,
+    "genTime": 1638348636520,
     "genVersion": null
 }

+ 1 - 1
settings/builder.json

@@ -22,7 +22,7 @@
   "zipCompressJs": true,
   "fb-instant-games": {},
   "android": {
-    "packageName": "com.aries.qsllx.qxb",
+    "packageName": "com.aries.qsllx.lgb",
     "REMOTE_SERVER_ROOT": ""
   },
   "ios": {

Some files were not shown because too many files changed in this diff