kaka 4 lat temu
rodzic
commit
a74197f667

Plik diff jest za duży
+ 136 - 256
assets/resources/game/prefab/game.prefab


Plik diff jest za duży
+ 135 - 255
assets/resources/game/prefab/gameplay.prefab


+ 3 - 3
assets/resources/module/guideToWx/guideToWx.prefab

@@ -192,8 +192,8 @@
     },
     },
     "_contentSize": {
     "_contentSize": {
       "__type__": "cc.Size",
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 655,
+      "height": 1055
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
@@ -452,7 +452,7 @@
     "_resourceType": 1,
     "_resourceType": 1,
     "_remoteURL": "",
     "_remoteURL": "",
     "_clip": {
     "_clip": {
-      "__uuid__": "88321c8b-c1e6-4749-b9bb-5ec3eb1bbb45"
+      "__uuid__": "c46c1f64-f14f-4e56-b337-b6952b34b32c"
     },
     },
     "_volume": 1,
     "_volume": 1,
     "_mute": false,
     "_mute": false,

BIN
assets/resources/module/guideToWx/texture/加我送钱icon.png


+ 36 - 0
assets/resources/module/guideToWx/texture/加我送钱icon.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ec70c561-c48d-4239-b0f1-0d99f9dfbe0f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 106,
+  "height": 93,
+  "platformSettings": {},
+  "subMetas": {
+    "加我送钱icon": {
+      "ver": "1.0.4",
+      "uuid": "d8e27dcf-f1ab-491f-9936-9115de704fd8",
+      "rawTextureUuid": "ec70c561-c48d-4239-b0f1-0d99f9dfbe0f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 106,
+      "height": 93,
+      "rawWidth": 106,
+      "rawHeight": 93,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/resources/module/guideToWx/texture/弹窗.png


+ 6 - 6
assets/resources/module/guideToWx/texture/弹窗.png.meta

@@ -18,12 +18,12 @@
       "trimType": "auto",
       "trimType": "auto",
       "trimThreshold": 1,
       "trimThreshold": 1,
       "rotated": false,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 750,
-      "height": 1334,
+      "offsetX": 0.5,
+      "offsetY": 3.5,
+      "trimX": 48,
+      "trimY": 136,
+      "width": 655,
+      "height": 1055,
       "rawWidth": 750,
       "rawWidth": 750,
       "rawHeight": 1334,
       "rawHeight": 1334,
       "borderTop": 0,
       "borderTop": 0,

BIN
assets/resources/video/WxVideo.mp4


+ 5 - 0
assets/resources/video/WxVideo.mp4.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "c46c1f64-f14f-4e56-b337-b6952b34b32c",
+  "subMetas": {}
+}

+ 3 - 0
assets/script/game/game/FunBtns.ts

@@ -69,6 +69,9 @@ export default class FunBtns extends cc.Component {
             }
             }
             this.btn11.active = (gData.guideToWxData.guideToWxSwith && show);
             this.btn11.active = (gData.guideToWxData.guideToWxSwith && show);
         }
         }
+
+        // //test
+        // this.btn11.active = true;
     }
     }
 
 
     update() {
     update() {

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


+ 4 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle

@@ -6,6 +6,10 @@ android {
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
     buildToolsVersion PROP_BUILD_TOOLS_VERSION
     buildToolsVersion PROP_BUILD_TOOLS_VERSION
 
 
+    lintOptions {
+        abortOnError false
+    }
+
     defaultConfig {
     defaultConfig {
         applicationId PACKAGE_NAME
         applicationId PACKAGE_NAME
         minSdkVersion PROP_MIN_SDK_VERSION
         minSdkVersion PROP_MIN_SDK_VERSION

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików