diff --git a/assets/Texture/BTN_Messege_NoAd.png b/assets/Texture/BTN_Messege_NoAd.png new file mode 100644 index 0000000..be25376 Binary files /dev/null and b/assets/Texture/BTN_Messege_NoAd.png differ diff --git a/assets/Texture/BTN_Messege_NoAd.png.meta b/assets/Texture/BTN_Messege_NoAd.png.meta new file mode 100644 index 0000000..fe0d913 --- /dev/null +++ b/assets/Texture/BTN_Messege_NoAd.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5@6c48a", + "displayName": "BTN_Messege_NoAd", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5@f9941", + "displayName": "BTN_Messege_NoAd", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 2, + "trimX": 14, + "trimY": 15, + "width": 191, + "height": 230, + "rawWidth": 220, + "rawHeight": 264, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -95.5, + -115, + 0, + 95.5, + -115, + 0, + -95.5, + 115, + 0, + 95.5, + 115, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 14, + 249, + 205, + 249, + 14, + 19, + 205, + 19 + ], + "nuv": [ + 0.06363636363636363, + 0.07196969696969698, + 0.9318181818181818, + 0.07196969696969698, + 0.06363636363636363, + 0.9431818181818182, + 0.9318181818181818, + 0.9431818181818182 + ], + "minPos": [ + -95.5, + -115, + 0 + ], + "maxPos": [ + 95.5, + 115, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5@6c48a" + } +} diff --git a/assets/level/enemy/enemy_level2.prefab b/assets/level/enemy/enemy_level2.prefab index 272fa0a..c8bee2a 100644 --- a/assets/level/enemy/enemy_level2.prefab +++ b/assets/level/enemy/enemy_level2.prefab @@ -22,28 +22,25 @@ "__id__": 2 }, { - "__id__": 26 + "__id__": 31 }, { - "__id__": 36 + "__id__": 41 }, { - "__id__": 44 + "__id__": 49 }, { - "__id__": 52 + "__id__": 57 }, { - "__id__": 60 - }, - { - "__id__": 69 + "__id__": 65 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 79 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -119,20 +116,20 @@ { "__id__": 19 }, - { - "__id__": 20 - }, { "__id__": 21 }, { - "__id__": 22 - }, - { - "__id__": 24 + "__id__": 23 }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 29 } ], "removedComponents": [] @@ -231,16 +228,16 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -1.427, - "y": 14.249, - "z": -14.623 + "x": 10.447, + "y": 20.004, + "z": 10.412 }, "_lrot": { "__type__": "cc.Quat", - "x": 7.459310946705706e-15, - "y": 6.661338147755795e-16, - "z": 3.400838638478755e-14, - "w": 1 + "x": -0.2535034721780704, + "y": -0.6151280422601505, + "z": -0.21843256639152805, + "w": 0.7138912348239523 }, "_lscale": { "__type__": "cc.Vec3", @@ -252,8 +249,8 @@ "_layer": 1073741824, "_euler": { "__type__": "cc.Vec3", - "x": 8.547740706439404e-13, - "y": 7.633331235515097e-14, + "x": -39.1, + "y": -81.5, "z": 3.897074015796997e-12 }, "_id": "" @@ -467,7 +464,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -479,50 +476,68 @@ "z": 33.169 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5dcoqOTeFH17bOJaSbTxbF" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 22 }, "propertyPath": [ "_lrot" ], "value": { "__type__": "cc.Quat", - "x": 0.2558982231418301, - "y": 0.6797730135803354, - "z": 0.2764239107735779, - "w": -0.6292968861780619 + "x": 0, + "y": 0, + "z": 0, + "w": 1 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5dcoqOTeFH17bOJaSbTxbF" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 24 }, "propertyPath": [ "_euler" ], "value": { "__type__": "cc.Vec3", - "x": 2.365584965206669, - "y": -24.73747228609443, - "z": 0.00003636823677411123 + "x": 0, + "y": 0, + "z": 0 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5dcoqOTeFH17bOJaSbTxbF" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 26 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -1.427, - "y": 14.249, - "z": -14.623 + "x": 10.447, + "y": 20.004, + "z": 10.412 } }, { @@ -534,34 +549,46 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 28 }, "propertyPath": [ "_lrot" ], "value": { "__type__": "cc.Quat", - "x": 7.459310946705706e-15, - "y": 6.661338147755795e-16, - "z": 3.400838638478755e-14, - "w": 1 + "x": -0.2535034721780704, + "y": -0.6151280422601505, + "z": -0.21843256639152805, + "w": 0.7138912348239523 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3c2vTJLKFFm6Sn4a/YKDs7" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 30 }, "propertyPath": [ "_euler" ], "value": { "__type__": "cc.Vec3", - "x": 8.547740706439404e-13, - "y": 7.633331235515097e-14, + "x": -39.1, + "y": -81.5, "z": 3.897074015796997e-12 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3c2vTJLKFFm6Sn4a/YKDs7" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -569,14 +596,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 32 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 31 }, "asset": { "__uuid__": "3eb6a584-bf66-49ad-9701-b92767edfbb0", @@ -584,7 +611,7 @@ }, "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", "instance": { - "__id__": 28 + "__id__": 33 }, "targetOverrides": null }, @@ -597,20 +624,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 29 - }, - { - "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 33 - }, { "__id__": 34 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 38 + }, + { + "__id__": 39 } ], "removedComponents": [] @@ -618,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 35 }, "propertyPath": [ "_name" @@ -634,7 +661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -649,7 +676,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 35 }, "propertyPath": [ "_lrot" @@ -665,7 +692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 35 }, "propertyPath": [ "_euler" @@ -680,7 +707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 40 }, "propertyPath": [ "_lpos" @@ -705,14 +732,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 37 + "__id__": 42 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 36 + "__id__": 41 }, "asset": { "__uuid__": "4a1148a6-8292-4bdd-895a-7ca86d88e159", @@ -720,7 +747,7 @@ }, "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", "instance": { - "__id__": 38 + "__id__": 43 }, "targetOverrides": null }, @@ -734,16 +761,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 39 + "__id__": 44 }, { - "__id__": 41 + "__id__": 46 }, { - "__id__": 42 + "__id__": 47 }, { - "__id__": 43 + "__id__": 48 } ], "removedComponents": [] @@ -751,7 +778,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 40 + "__id__": 45 }, "propertyPath": [ "_name" @@ -767,14 +794,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 40 + "__id__": 45 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 248.209, + "x": 323.962, "y": 44.127, "z": 18.278 } @@ -782,7 +809,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 40 + "__id__": 45 }, "propertyPath": [ "_lrot" @@ -798,7 +825,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 40 + "__id__": 45 }, "propertyPath": [ "_euler" @@ -817,14 +844,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 50 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 49 }, "asset": { "__uuid__": "5e947bd2-dea0-4e5f-a88b-60651b74f843", @@ -832,7 +859,7 @@ }, "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", "instance": { - "__id__": 46 + "__id__": 51 }, "targetOverrides": null }, @@ -846,16 +873,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 52 }, { - "__id__": 49 + "__id__": 54 }, { - "__id__": 50 + "__id__": 55 }, { - "__id__": 51 + "__id__": 56 } ], "removedComponents": [] @@ -863,7 +890,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 53 }, "propertyPath": [ "_name" @@ -879,7 +906,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 53 }, "propertyPath": [ "_lpos" @@ -894,7 +921,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 53 }, "propertyPath": [ "_lrot" @@ -910,7 +937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 53 }, "propertyPath": [ "_euler" @@ -929,14 +956,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 53 + "__id__": 58 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 52 + "__id__": 57 }, "asset": { "__uuid__": "6e202f39-8069-4886-a0e1-5701c3b8dfe1", @@ -944,7 +971,7 @@ }, "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", "instance": { - "__id__": 54 + "__id__": 59 }, "targetOverrides": null }, @@ -958,16 +985,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 55 + "__id__": 60 }, { - "__id__": 57 + "__id__": 62 }, { - "__id__": 58 + "__id__": 63 }, { - "__id__": 59 + "__id__": 64 } ], "removedComponents": [] @@ -975,7 +1002,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -996,7 +1023,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 61 }, "propertyPath": [ "_name" @@ -1006,7 +1033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1022,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1041,14 +1068,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 61 + "__id__": 66 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 60 + "__id__": 65 }, "asset": { "__uuid__": "1e535d2a-99dc-4c31-bfdc-f010e8d336ad", @@ -1056,7 +1083,7 @@ }, "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", "instance": { - "__id__": 62 + "__id__": 67 }, "targetOverrides": null }, @@ -1069,20 +1096,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 63 - }, - { - "__id__": 65 - }, - { - "__id__": 66 - }, - { - "__id__": 67 - }, { "__id__": 68 + }, + { + "__id__": 70 + }, + { + "__id__": 71 + }, + { + "__id__": 72 + }, + { + "__id__": 73 } ], "removedComponents": [] @@ -1090,7 +1117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 69 }, "propertyPath": [ "_lpos" @@ -1111,7 +1138,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 69 }, "propertyPath": [ "_name" @@ -1121,7 +1148,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 69 }, "propertyPath": [ "_lrot" @@ -1137,7 +1164,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 69 }, "propertyPath": [ "_euler" @@ -1152,7 +1179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 69 }, "propertyPath": [ "_lscale" @@ -1164,142 +1191,6 @@ "z": 1 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 70 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 69 - }, - "asset": { - "__uuid__": "3eb6a584-bf66-49ad-9701-b92767edfbb0", - "__expectedType__": "cc.Prefab" - }, - "fileId": "6ePK98RnZM3b2Wg/nK9Ypm", - "instance": { - "__id__": 71 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "06BV1JQzhFpqX+hgU5I36I", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 72 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 73 - }, - "propertyPath": [ - "_name" - ], - "value": "ZhanLi-001" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "6ePK98RnZM3b2Wg/nK9Ypm" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 73 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 134.277, - "y": 25.453, - "z": -19.72 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 73 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": -0.37888676027110246, - "y": -0.37888676027110246, - "z": -0.5970300016676449, - "w": 0.5970300016676451 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 73 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": -90, - "y": -90, - "z": -25.2 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 78 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -7.323848194573657e-10, - "z": 0.39319515228271484 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "61rwL60uJNErdkz9jrysJd" - ] - }, { "__type__": "cc.PrefabInfo", "root": { @@ -1312,22 +1203,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 69 + "__id__": 65 }, { - "__id__": 60 + "__id__": 57 }, { - "__id__": 52 + "__id__": 49 }, { - "__id__": 44 + "__id__": 41 }, { - "__id__": 36 - }, - { - "__id__": 26 + "__id__": 31 }, { "__id__": 2 diff --git a/assets/resources/ui/MainPanel.prefab b/assets/resources/ui/MainPanel.prefab index 2a15df3..7c950ef 100644 --- a/assets/resources/ui/MainPanel.prefab +++ b/assets/resources/ui/MainPanel.prefab @@ -2331,7 +2331,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 9.968, + "x": 3.612, "y": 0, "z": 0 }, @@ -2493,7 +2493,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 108.25799999999998, + "x": 98.981, "y": 0, "z": 7.225 }, @@ -2610,7 +2610,7 @@ "__id__": 78 }, "_left": 0, - "_right": -41.18399999999998, + "_right": -7.957000000000008, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -2658,7 +2658,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 214.74, + "width": 262.64, "height": 60 }, "_anchorPoint": { @@ -2766,7 +2766,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": null, + "_target": { + "__id__": 78 + }, "_id": "" }, { @@ -2782,8 +2784,6 @@ "__id__": 0 }, "fileId": "0fw0pkxO9EBKE9wKEq3IQb", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -4922,8 +4922,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, - "height": 0 + "width": 300, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6006,7 +6006,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 27.416, - "y": -24.468999999999994, + "y": -14.819000000000003, "z": 0 }, "_lrot": { @@ -6330,7 +6330,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 261.9, - "height": 116.7 + "height": 97.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6455,8 +6455,6 @@ "__id__": 0 }, "fileId": "9foWqFDr9CeY3XyLvAXHP8", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/ui/PlayPanel.prefab b/assets/resources/ui/PlayPanel.prefab index e21df6e..162076c 100644 --- a/assets/resources/ui/PlayPanel.prefab +++ b/assets/resources/ui/PlayPanel.prefab @@ -4782,7 +4782,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2a2e04cf-eee8-450b-87c5-8eff020eca6c@f9941", + "__uuid__": "57169a53-e32c-4259-a7fe-7f3ae04aa8a5@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -5299,7 +5299,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 681.763, + "y": 634.943, "z": 0 }, "_lrot": { @@ -5407,7 +5407,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 228.23699999999997, + "_top": 275.057, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -5809,6 +5809,8 @@ "__id__": 0 }, "fileId": "3coDqttrNCZp5UKo/cRvPm", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5845,7 +5847,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 22.127, - "y": 797.753, + "y": 748.469, "z": 0 }, "_lrot": { @@ -6255,7 +6257,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 136.74699999999996, + "_top": 186.03099999999995, "_bottom": 0, "_horizontalCenter": 22.127, "_verticalCenter": 0, diff --git a/assets/scripts/framework/data/LocalSaveMgr.ts b/assets/scripts/framework/data/LocalSaveMgr.ts index 166f11b..da586bd 100644 --- a/assets/scripts/framework/data/LocalSaveMgr.ts +++ b/assets/scripts/framework/data/LocalSaveMgr.ts @@ -235,8 +235,14 @@ export class LocalSaveMgr extends Component { case 1: break; case 2: break; default: - if ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["power"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown >= (Config["maxHp"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)) + if ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["power"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown >= (Config["maxHp"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)) { + if ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["isOnTimerRun"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown) { + void ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["isOnTimerRun"] = false); + void ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["lastAddPowerTimer"] = null); + void (this["save"]()); + } return; + } void (this["startPowerTimerIfNeeded"]()); const elapsed = (Date["now"]() - ((this["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["lastAddPowerTimer"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)) / 1000; if (elapsed <= (Config["powerCD"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)) diff --git a/assets/scripts/ui/MainPanel.ts b/assets/scripts/ui/MainPanel.ts index f24f899..99b11ec 100644 --- a/assets/scripts/ui/MainPanel.ts +++ b/assets/scripts/ui/MainPanel.ts @@ -11,6 +11,7 @@ import { AudioMgr } from '../framework/audio/AudioMgr'; import { AddHeartPanel } from './AddHeartPanel'; import { GameController } from '../GameController'; import { Weapon } from '../data/ConfigData'; +import { Config } from '../data/GameConfig'; import { EventCenter } from '../EventCenter'; const { ccclass, property } = _decorator; @ccclass('MainPanel') @@ -113,9 +114,10 @@ export class MainPanel extends PanelBase { case 2: break; default: const playerData = (LocalSaveMgr["instance"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["playerData"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown; + const isPowerFull = playerData["power"] >= Config.maxHp; void (this["setLabelStrings"]([ [this["heart"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, playerData["power"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown], - [this["heartTimer"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, playerData["isOnTimerRun"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown ? this["formatTime"](Math["max"](0, Math["ceil"]((LocalSaveMgr["instance"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getPowerCD"]()))) + [this["heartTimer"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown, !isPowerFull && (playerData["isOnTimerRun"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown) ? this["formatTime"](Math["max"](0, Math["ceil"]((LocalSaveMgr["instance"] satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown satisfies unknown)["getPowerCD"]()))) : 'Full'], ])); } diff --git a/profiles/v2/packages/reference-image.json b/profiles/v2/packages/reference-image.json index 192fd46..df5dc96 100644 --- a/profiles/v2/packages/reference-image.json +++ b/profiles/v2/packages/reference-image.json @@ -3,6 +3,6 @@ "config": { "images": [], "sceneUUID": {}, - "scene": "29bc61af-9ade-4095-bb78-e7f6f6ffde45" + "scene": "c3d9a1af-8e7b-4cc9-a9f4-69160e77209e" } } diff --git a/tmp/imagegen/BTN_Messege_NoAd_alpha.png b/tmp/imagegen/BTN_Messege_NoAd_alpha.png new file mode 100644 index 0000000..e7c83c3 Binary files /dev/null and b/tmp/imagegen/BTN_Messege_NoAd_alpha.png differ diff --git a/tmp/imagegen/BTN_Messege_NoAd_keyed.png b/tmp/imagegen/BTN_Messege_NoAd_keyed.png new file mode 100644 index 0000000..5aab9bd Binary files /dev/null and b/tmp/imagegen/BTN_Messege_NoAd_keyed.png differ