wuwangdong há 4 anos atrás
pai
commit
02543f86d4

+ 3 - 1
assets/resources/module/login/login.prefab

@@ -430,7 +430,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "08cd98e8-cbd9-44c8-8cb6-09609780aa3c"
+    },
     "_type": 0,
     "_sizeMode": 0,
     "_fillType": 0,

BIN
assets/resources/module/login/texture/logo.png


+ 8 - 8
assets/resources/module/login/texture/logo.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 478,
-  "height": 310,
+  "width": 365,
+  "height": 242,
   "platformSettings": {},
   "subMetas": {
     "logo": {
@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 1,
+      "offsetX": 0,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 477,
-      "height": 308,
-      "rawWidth": 478,
-      "rawHeight": 310,
+      "width": 365,
+      "height": 242,
+      "rawWidth": 365,
+      "rawHeight": 242,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

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

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

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

+ 1 - 1
build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

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


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/config.json


+ 1 - 1
build/jsb-link/assets/resources/import/08/08cd98e8-cbd9-44c8-8cb6-09609780aa3c.json

@@ -1 +1 @@
-[1,["b6EIzAa+tHBpfcR1apW/DX"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"logo","rect":[0,0,477,308],"offset":[-0.5,1],"originalSize":[478,310],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["b6EIzAa+tHBpfcR1apW/DX"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"logo","rect":[0,0,365,242],"offset":[0,0],"originalSize":[365,242],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

+ 1 - 0
build/jsb-link/assets/resources/import/26/268df3e0-c961-4534-bfe0-19d0f4527be6.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","d28bad6d-ac92-49a6-a9a6-ad6a05f2101c@6c48a"],["_spriteFrame","root","node","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_prefab","_contentSize","_trs"],2,9,4,5,7],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.PrefabInfo",["root"],3,1]],[[0,0,2],[1,0,1,2,3,4,2],[2,0,1,2,1],[3,0,1]],[[0,"crop"],[1,"crop",[[2,-2,[0],1]],[3,-1],[5,175,173],[-91.155,12.43,0,0,0,0,1,0.5,0.5,1]]],0,[0,1,1,0,2,1,0,3,1,2],[0,0],[-1,0],[0,1]]

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
build/jsb-link/assets/resources/import/f7/f7b563d2-2a35-4ed4-b0b0-05dd74c0033f.json


BIN
build/jsb-link/assets/resources/native/b6/b6108cc0-6beb-4706-97dc-4756a95bf0d7.png


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


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

@@ -16636,7 +16636,7 @@ value: !0
 o.ServerUrl = o.HttpData = void 0;
 var n, a = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -17875,7 +17875,7 @@ value: !0
 o.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";

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

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1634542547561,
-    "genTime": 1634542547561,
+    "buildTime": 1634547199163,
+    "genTime": 1634547199163,
     "genVersion": null
 }

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff