9 Commit-ok be6c164d5b ... 437b225236

Szerző SHA1 Üzenet Dátum
  mojunshou 437b225236 【正式版】修改框架更新引起的报错问题 6 hónapja
  mojunshou 8ea0beeb3f 【正式包1.0.2】正式apk提交 6 hónapja
  mojunshou 2b72dcc248 【正式服1.0.2】修改服务器指向不正确问题 6 hónapja
  mojunshou e7e23f2c52 Merge branch 'dev' 6 hónapja
  mojunshou 13ab902a04 修改游戏名错误问题,修改版本号 6 hónapja
  mojunshou e430d4a492 暂存忽略文件 6 hónapja
  mojunshou 1303b90b62 删除远端build文件夹 6 hónapja
  mojunshou e29bf4d714 【正式版】1.0.1正式包APK提交 6 hónapja
  mojunshou a335488228 【正式版】1.0.1 6 hónapja

+ 3 - 2
.gitignore

@@ -14,7 +14,7 @@ build/
 extensions/
 settings/
 preview-template/
-native/
+# native/
 #//////////////////////////
 # NPM
 #//////////////////////////
@@ -28,4 +28,5 @@ native/
 #//////////////////////////
 # WebStorm
 #//////////////////////////
-.idea/
+.idea/
+/build

+ 0 - 79
Jenkinsfile

@@ -1,79 +0,0 @@
-pipeline {
-    agent any
-
-    parameters {
-        choice(name: 'BUILD_TYPE', choices: ['debug', 'release'], description: '选择构建类型')
-    }
-
-    environment {
-        COCOS_CREATOR_PATH = "C:/ProgramData/cocos/editors/Creator/3.8.6/CocosCreator/CocosCreator.exe"
-        WORKSPACE = "${env.WORKSPACE}"
-        SIGN_KEYSTORE = "${WORKSPACE}/key_store/lzfk.jks"
-        SIGN_ALIAS = "lzfk"
-        SIGN_PASS = "lzfk888"
-        KEY_PASS = "lzfk888"
-        JIAGU_PATH = "${WORKSPACE}/tools/jiagu/jiagu.jar"
-        CHANNEL_FILE = "${WORKSPACE}/channel.txt"
-    }
-
-    stages {
-        stage('选择分支') {
-            steps {
-                script {
-                    if (params.BUILD_TYPE == 'debug') {
-                        env.GIT_BRANCH = 'dev'
-                        env.BUILD_MODE = 'debug'
-                    } else {
-                        env.GIT_BRANCH = 'master'
-                        env.BUILD_MODE = 'release'
-                    }
-                }
-            }
-        }
-
-        stage('拉取代码') {
-            steps {
-                checkout([$class: 'GitSCM',
-                          branches: [[name: "*/${env.GIT_BRANCH}"]],
-                          userRemoteConfigs: [[url: 'git@your.git.repo/project.git']]])
-            }
-        }
-
-        stage('使用 Cocos Creator 构建') {
-            steps {
-                sh """
-                ${COCOS_CREATOR_PATH} --project ${WORKSPACE} \\
-                    --build "platform=android;debug=${params.BUILD_TYPE == 'debug' ? 'true' : 'false'};md5Cache=true"
-                """
-            }
-        }
-
-        stage('使用 Gradle 打包') {
-            steps {
-                dir('build/android') {
-                    sh "./gradlew assemble${params.BUILD_TYPE.capitalize()}"
-                }
-            }
-        }
-
-        stage('加固并多渠道') {
-            when {
-                expression { return params.BUILD_TYPE == 'release' }
-            }
-            steps {
-                sh """
-                java -jar ${JIAGU_PATH} -login your_account your_password
-                java -jar ${JIAGU_PATH} -importsign ${SIGN_KEYSTORE} ${SIGN_PASS} ${SIGN_ALIAS} ${KEY_PASS}
-                java -jar ${JIAGU_PATH} -jiagu build/android/proj/gradle/build/outputs/apk/release/app-release.apk \\
-                    ${WORKSPACE}/jiagu_output/ -autosign -automulpkg -pkgparam ${CHANNEL_FILE}
-                """
-            }
-        }
-
-        stage('归档 APK') {
-            steps {
-                archiveArtifacts artifacts: "**/build/**/*.apk", fingerprint: true
-            }
-        }
-    }
-}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
assets/bundle/common/prefab/KindTips.prefab


+ 3 - 3
assets/script/game/common/config/GameUIConfig.ts

@@ -1,10 +1,10 @@
 /*
  * @Date: 2021-08-12 09:33:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-05-14 14:23:26
+ * @LastEditTime: 2025-05-15 17:10:33
  */
-import { LayerType, UIConfig } from "../../../../../extensions/oops-plugin-framework/assets/core/gui/layer/LayerManager";
-
+import { LayerType } from "db://oops-framework/core/gui/layer/LayerEnum";
+import { UIConfig } from "db://oops-framework/core/gui/layer/UIConfig";
 /** 界面唯一标识(方便服务器通过编号数据触发界面打开) */
 export enum UIID {
     /** 资源加载界面 */

+ 1 - 2
assets/script/game/common/manager/ADHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:14:44
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-05-06 15:20:55
+ * @LastEditTime: 2025-05-15 14:56:57
  * @Description: 
  */
 // ADHandler.ts
@@ -35,7 +35,6 @@ export class ADHandler {
     };
 
     private buildAdParam(id: string): { method: string, param: any } {
-        console.log("播放的广告ID>>>>>>>>>>>>>", id)
         const param: any = {
             funcId: id,
             callback: {

+ 1 - 1
assets/script/game/common/manager/LoginHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:15:45
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-05-08 16:24:14
+ * @LastEditTime: 2025-05-15 15:11:34
  * @Description: 登录管理
  */
 // LoginHandler.ts

+ 6 - 6
assets/script/game/common/manager/ServerHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:16:41
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-05-08 16:24:45
+ * @LastEditTime: 2025-05-15 15:11:26
  * @Description: 
  */
 // ServerHandler.ts
@@ -30,17 +30,17 @@ export class ServerHandler {
     }
 
     private initServerUrl() {
-        let isRelease = smc.game.GameModel.isRelease;
+        let isDebug = smc.game.GameModel.isRelease;
         // 设置服务器地址
-        this.serverUrl = isRelease ?
-            ProtocolEvent.ReleaseServer : // 正式服
-            ProtocolEvent.TestServer;    // 测试服
+        this.serverUrl = isDebug ?
+            ProtocolEvent.TestServer :
+            ProtocolEvent.ReleaseServer;
 
         //如果是本地测试,则使用本地测试地址
         if (oops.config.game.isLocalTest) {
             this.serverUrl = ProtocolEvent.LocalTest;
         }
-        console.log("[ServerHandler] 当前服务器地址:", this.serverUrl);
+        // console.log("[ServerHandler] 当前服务器地址:", this.serverUrl);
     }
 
     private buildCallback(success: string, fail?: string) {

+ 1 - 1
assets/script/game/initialize/view/LoadingViewComp.ts

@@ -55,7 +55,7 @@ export class LoadingViewComp extends CCVMParentComp {
 
     async enter() {
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
-            LoginHandler.inst.getVersionStatus()
+            await LoginHandler.inst.getVersionStatus()
             const state = await LoginHandler.inst.getPrivacyStatus();
             if (state.data.result) {
                 //同意之后都加载一次启屏广告

+ 0 - 111
buildConfig_android.json

@@ -1,111 +0,0 @@
-{
-  "name": "连赚方块",
-  "server": "",
-  "engineModulesConfigKey": "migrationsConfig",
-  "platform": "android",
-  "buildPath": "project://build",
-  "debug": false,
-  "buildMode": "normal",
-  "mangleProperties": false,
-  "md5Cache": false,
-  "skipCompressTexture": false,
-  "sourceMaps": false,
-  "overwriteProjectSettings": {
-    "macroConfig": {
-      "cleanupImageCache": "inherit-project-setting"
-    },
-    "includeModules": {
-      "physics": "inherit-project-setting",
-      "physics-2d": "inherit-project-setting",
-      "gfx-webgl2": "off"
-    }
-  },
-  "nativeCodeBundleMode": "wasm",
-  "polyfills": {
-    "asyncFunctions": false
-  },
-  "experimentalEraseModules": false,
-  "startSceneAssetBundle": false,
-  "bundleConfigs": [],
-  "inlineEnum": true,
-  "useBuiltinServer": false,
-  "md5CacheOptions": {
-    "excludes": [],
-    "includes": [],
-    "replaceOnly": [],
-    "handleTemplateMd5Link": true
-  },
-  "mainBundleIsRemote": false,
-  "mainBundleCompressionType": "merge_dep",
-  "useSplashScreen": false,
-  "bundleCommonChunk": false,
-  "packAutoAtlas": true,
-  "startScene": "ba0b085f-f8d5-40b0-9964-2fd25728d707",
-  "outputName": "android",
-  "taskName": "android",
-  "scenes": [
-    {
-      "url": "db://assets/main.scene",
-      "uuid": "ba0b085f-f8d5-40b0-9964-2fd25728d707"
-    }
-  ],
-  "wasmCompressionMode": false,
-  "packages": {
-    "android": {
-      "packageName": "com.dingxilong.fangkuai",
-      "resizeableActivity": true,
-      "maxAspectRatio": "2.4",
-      "orientation": {
-        "portrait": true,
-        "upsideDown": false,
-        "landscapeRight": false,
-        "landscapeLeft": false
-      },
-      "apiLevel": 34,
-      "appABIs": [
-        "arm64-v8a"
-      ],
-      "useDebugKeystore": false,
-      "keystorePath": "D:\\workspace\\Eliminate_gold_nuggets\\key_store\\lzfk.jks",
-      "keystorePassword": "lzfk888",
-      "keystoreAlias": "lzfk",
-      "keystoreAliasPassword": "lzfk888",
-      "appBundle": false,
-      "androidInstant": false,
-      "inputSDK": false,
-      "remoteUrl": "",
-      "sdkPath": "",
-      "ndkPath": "",
-      "javaHome": "",
-      "javaPath": "",
-      "renderBackEnd": {
-        "vulkan": false,
-        "gles3": true,
-        "gles2": true
-      },
-      "swappy": false,
-      "__version__": "1.0.1"
-    },
-    "native": {
-      "encrypted": false,
-      "xxteaKey": "a1ICxjbOpNgb6xU1",
-      "compressZip": false,
-      "JobSystem": "none",
-      "__version__": "1.0.2"
-    },
-    "cocos-service": {
-      "configID": "0d7f50",
-      "services": [],
-      "__version__": "3.0.9"
-    },
-    "oops-plugin-hot-update": {
-      "hotUpdateEnable": false,
-      "hotUpdateAddress": "http://127.0.0.1",
-      "hotUpdateVersion": "1.0.0",
-      "hotUpdateBuildNum": 1,
-      "__version__": "1.0.0"
-    }
-  },
-  "__version__": "1.3.9",
-  "logDest": "project://temp/builder/log/android2025-4-23 20-05.log"
-}

BIN
native/engine/android/app/release/com.dingxilong.fangkuai-v1.0.0-release-250507150216.apk


BIN
native/engine/android/app/release/com.dingxilong.fangkuai-v1.0.0-release-250506173040_100_jiagu_sign.apk


BIN
native/engine/android/app/release/com.dingxilong.fangkuai-v1.0.0-release-250506173040_100_jiagu.apk


+ 19 - 0
native/engine/android/app/release/log.txt

@@ -0,0 +1,19 @@
+开始打包
+渠道信息:a=52102,c=BDLZFKXM
+打包成功 : apk文件 = D:\workspace\Eliminate_gold_nuggets\native\engine\android\app\release\com.dingxilong.fangkuai-v1.0.1-release-250509121049_101_jiagu_sign-BDLZFKXM-52102.apk
+------------------------------------------------
+包校验结果APK: com.dingxilong.fangkuai-v1.0.1-release-250509121049_101_jiagu_sign-BDLZFKXM-52102.apk
+ChannelName = BDLZFKXM
+AppId = 52102
+TgPlatformId = 104
+==============================================
+
+渠道信息:a=52103,c=BDLZFKXM
+打包成功 : apk文件 = D:\workspace\Eliminate_gold_nuggets\native\engine\android\app\release\com.dingxilong.fangkuai-v1.0.1-release-250509121049_101_jiagu_sign-BDLZFKXM-52103.apk
+------------------------------------------------
+包校验结果APK: com.dingxilong.fangkuai-v1.0.1-release-250509121049_101_jiagu_sign-BDLZFKXM-52103.apk
+ChannelName = BDLZFKXM
+AppId = 52103
+TgPlatformId = 104
+==============================================
+

+ 3 - 3
native/engine/android/app/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 100,
-      "versionName": "1.0.0",
-      "outputFile": "com.dingxilong.fangkuai-v1.0.0-release-250507150216.apk"
+      "versionCode": 101,
+      "versionName": "1.0.1",
+      "outputFile": "com.dingxilong.fangkuai-v1.0.1-release-250509121049.apk"
     }
   ],
   "elementType": "File"