kaka пре 4 година
родитељ
комит
3473b95b0e
26 измењених фајлова са 35 додато и 34 уклоњено
  1. 0 0
      assets/resources/module/login/hot/project.manifest
  2. 1 1
      assets/resources/module/login/hot/version.manifest
  3. 1 1
      assets/script/game/data/HttpData.ts
  4. 1 1
      build/jsb-link/.cocos-project.json
  5. BIN
      build/jsb-link/assets/main/index.jsc
  6. 0 0
      build/jsb-link/assets/resources/config.json
  7. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  8. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  9. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  10. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  11. 7 7
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  12. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/jsb/wxapi/WXEntryActivity.java
  13. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
  14. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  15. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java
  16. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java
  17. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/res/values/strings.xml
  18. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
  19. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
  20. 1 1
      build/jsb-link/js backups (useful for debugging)/main.index.js
  21. 5 4
      packages-hot-update/cfg.json
  22. 0 0
      packages-hot-update/manifest/project.manifest
  23. 1 1
      packages-hot-update/manifest/version.manifest
  24. BIN
      packages-hot-update/versions/ver_1_0.0.zip
  25. 1 1
      settings/builder.json
  26. 1 1
      settings/project.json

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/version.manifest"}

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

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

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

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


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 1
build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/version.manifest"}

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aries.qsllx.lvse"
+    package="com.aries.qsllx.jsb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -48,11 +48,11 @@
         </activity>
 
         <activity
-            android:name="com.aries.qsllx.lvse.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.jsb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.lvse"
+            android:taskAffinity="com.aries.qsllx.jsb"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -1,16 +1,16 @@
-TF_CHANNEL="1";        //1 巨量 2 快手 3 广点通 5应用宝
+TF_CHANNEL="22";        //1 巨量 2 快手 3 广点通 5应用宝
 JL_AID="194376";       //巨量appid
 JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid
 KS_ANAME="EasyEliminate";      //快手appname
 KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="60c17c51e044530ff09f30a3"; //友盟appid
-UM_CHANNEL="ttaxx_juliang"; //友盟渠道
+UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wx6438b2697e818b24"; //微信appidUM_CHANNEL
-MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
-PACKAGE_NAME=com.aries.qsllx.qxb
-VERSION_NAME=16.1.1
+WX_APP_ID="wx567b90447250bb4b"; //微信appidUM_CHANNEL
+MY_APP_NAME=\u8f7b\u677e\u8fde\u8fde\u6d88\u6781\u901f\u7248
+PACKAGE_NAME=com.aries.qsllx.jsb
+VERSION_NAME=15.1.1
 VERSION_CODE=2
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner
-APP_CONFIG_CODE="16.1.1"
+APP_CONFIG_CODE="15.1.1"

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

@@ -1,4 +1,4 @@
-package com.aries.qsllx.lvse.wxapi;
+package com.aries.qsllx.jsb.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.lvse.BuildConfig;
-import com.aries.qsllx.lvse.R;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;

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

@@ -48,7 +48,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
 
-import com.aries.qsllx.lvse.BuildConfig;
+import com.aries.qsllx.jsb.BuildConfig;
 
 import java.io.File;
 

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

@@ -17,8 +17,8 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
-import com.aries.qsllx.lvse.BuildConfig;
-import com.aries.qsllx.lvse.wxapi.WXEntryActivity;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.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

@@ -19,8 +19,8 @@ import com.anythink.core.api.ATMediationRequestInfo;
 import com.anythink.core.api.AdError;
 import com.anythink.splashad.api.ATSplashAd;
 import com.anythink.splashad.api.ATSplashAdListener;
-import com.aries.qsllx.lvse.BuildConfig;
-import com.aries.qsllx.lvse.R;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.R;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 

+ 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.lvse.BuildConfig;
+import com.aries.qsllx.jsb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name" translatable="false">轻松连连消绿色版</string>
+    <string name="app_name" translatable="false">轻松连连消急速版</string>
 </resources>

+ 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.lvse</string>
+    <string>com.aries.qsllx.jsb</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.lvse</string>
+	<string>com.aries.qsllx.jsb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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

@@ -10590,7 +10590,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, i = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {

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

@@ -1,6 +1,6 @@
 {
     "version": "1.0.0",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/",
     "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -14,9 +14,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/"
     ],
-    "buildTime": 1628823586907,
-    "genTime": 1628823586907,
+    "buildTime": 1629083443930,
+    "genTime": 1629083443930,
     "genVersion": null
 }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 1
packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/version.manifest"}

BIN
packages-hot-update/versions/ver_1_0.0.zip


+ 1 - 1
settings/builder.json

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

+ 1 - 1
settings/project.json

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

Неке датотеке нису приказане због велике количине промена