From ba6abe5f7efaaed1f462283eca10ad2531201f1c Mon Sep 17 00:00:00 2001 From: "guoqing.zhu" <1521292690@qq.com> Date: Tue, 31 May 2022 00:38:07 +0800 Subject: [PATCH] update info --- assets/res/prefabs/NUI/UIGuninfo.prefab | 28 +- assets/res/prefabs/NUI/UINheroinfo.prefab | 22 +- .../res/prefabs/NUI/cell_HeroItemGroup.prefab | 352 ++++++++++-------- assets/res/prefabs/NUI/cell_guns.prefab | 212 ++++++----- assets/scripts/UI/guns/guns_info.ts | 11 + assets/scripts/UI/guns/guns_single.ts | 10 + assets/scripts/UI/hero/UIHeroinfo.ts | 12 + assets/scripts/UI/hero/herochoseone.js | 19 + 8 files changed, 386 insertions(+), 280 deletions(-) diff --git a/assets/res/prefabs/NUI/UIGuninfo.prefab b/assets/res/prefabs/NUI/UIGuninfo.prefab index 552bffac..cfc4363f 100644 --- a/assets/res/prefabs/NUI/UIGuninfo.prefab +++ b/assets/res/prefabs/NUI/UIGuninfo.prefab @@ -10767,7 +10767,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 76, + "width": 200, "height": 12 }, "_anchorPoint": { @@ -10829,7 +10829,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 76, + "width": 2.7755575615628914e-14, "height": 12 }, "_anchorPoint": { @@ -10930,17 +10930,17 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 66.74, + "width": 22.25, "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 36, + "x": 86.6, "y": -18, "z": 0 }, @@ -10973,8 +10973,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "150", - "_N$string": "150", + "_string": "0", + "_N$string": "0", "_fontSize": 40, "_lineHeight": 40, "_enableWrapText": true, @@ -11008,7 +11008,7 @@ "__id__": 310 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -11106,7 +11106,7 @@ "__id__": 310 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -11232,12 +11232,12 @@ "__id__": 310 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 200, "_N$barSprite": { "__id__": 312 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 1.3877787807814457e-16, "_N$reverse": false, "_id": "" }, @@ -12014,6 +12014,12 @@ "lab_successrate": { "__id__": 286 }, + "limitBar": { + "__id__": 324 + }, + "cegget": { + "__id__": 315 + }, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/UINheroinfo.prefab b/assets/res/prefabs/NUI/UINheroinfo.prefab index 387f7af9..364d0773 100644 --- a/assets/res/prefabs/NUI/UINheroinfo.prefab +++ b/assets/res/prefabs/NUI/UINheroinfo.prefab @@ -6366,7 +6366,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 110, + "width": 320, "height": 12 }, "_anchorPoint": { @@ -6428,7 +6428,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 110, + "width": 0, "height": 12 }, "_anchorPoint": { @@ -6534,12 +6534,12 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 69, + "x": 128.8, "y": -18, "z": 0 }, @@ -6607,7 +6607,7 @@ "__id__": 178 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -6705,7 +6705,7 @@ "__id__": 178 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -6831,12 +6831,12 @@ "__id__": 178 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 320, "_N$barSprite": { "__id__": 180 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 0, "_N$reverse": false, "_id": "" }, @@ -20849,6 +20849,12 @@ "buyHero": { "__uuid__": "e00b6534-7aa5-4b4e-a98a-71d3f563886e" }, + "limitBar": { + "__id__": 192 + }, + "cegget": { + "__id__": 183 + }, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab b/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab index f0139646..2a5f4229 100644 --- a/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab +++ b/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab @@ -2670,7 +2670,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 100, "height": 8 }, "_anchorPoint": { @@ -2732,7 +2732,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 2.7755575615628914e-15, "height": 8 }, "_anchorPoint": { @@ -2838,12 +2838,12 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 15, + "x": 44.2, "y": -10, "z": 0 }, @@ -2911,7 +2911,7 @@ "__id__": 70 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -3009,7 +3009,7 @@ "__id__": 70 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -3135,12 +3135,12 @@ "__id__": 70 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 100, "_N$barSprite": { "__id__": 72 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -4685,6 +4685,12 @@ "infoPage": { "__uuid__": "1d196a77-b46b-43d2-9d2e-cfa0bfcf0602" }, + "limitBar": { + "__id__": 84 + }, + "cegget": { + "__id__": 75 + }, "_id": "" }, { @@ -4953,7 +4959,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "43P28B79RB2JmS7uuwpeHw", + "fileId": "a1gDjwCm9B97hk+CO/23s1", "sync": false }, { @@ -5185,7 +5191,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "22w3d2SyVN76Ar5SaUm5BT", + "fileId": "94HJqbgwpGj7XY9ikaQYpo", "sync": false }, { @@ -5224,7 +5230,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "9enG1iRI5Dr5gdvyWpkSD5", + "fileId": "d5NrUmmtZDG6DAhdFzykLH", "sync": false }, { @@ -5325,7 +5331,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "30xm1RP9tLOYQRYERYIPYS", + "fileId": "55690THgpOE5iDbZADsudS", "sync": false }, { @@ -5336,7 +5342,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7a/jzjDUtHrrrWm4J848Ps", + "fileId": "ceBEScXtxAYoz23kpoYMTy", "sync": false }, { @@ -5509,7 +5515,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "04BxQCc+1NSLuwmaDege1V", + "fileId": "06TYuPIVZLeJzolh7+UScR", "sync": false }, { @@ -5535,7 +5541,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "17D1uZEQdO9p6sxM9gl72x", + "fileId": "fboS9U9z9M2YOfOZf8hrgr", "sync": false }, { @@ -5636,7 +5642,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "3dnqKmFPZBOYvBo2WJ3D9z", + "fileId": "0fZIY9tdNLFI2TQBxjD8vM", "sync": false }, { @@ -5737,7 +5743,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "4fqvVkU5hEwrge1Yo4TITk", + "fileId": "abWSZpNgZFMbqYlyNm9rDc", "sync": false }, { @@ -5930,7 +5936,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "fe7RXPtBlBRaBBJb/1PT1U", + "fileId": "e6bscci+BDtqp6hBOWNZso", "sync": false }, { @@ -5999,7 +6005,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "22i2Mr0TxL9p2e+2SpmSit", + "fileId": "6bRiGqc8ZIOYD04L7mO/vj", "sync": false }, { @@ -6178,7 +6184,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e1aKgPvyFDlqbF2kJKiaFX", + "fileId": "3aZMLi/V1Md6CtwJcK1uaT", "sync": false }, { @@ -6279,7 +6285,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "a9L/MmWe9Ae6Q/8cUnIltc", + "fileId": "4ddYj9Y/FPaq3eRutPgDMv", "sync": false }, { @@ -6380,7 +6386,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "aeK1gpY1RLuLhMp16gNmqy", + "fileId": "49/+qJ2xBKka+e6p9l5Juq", "sync": false }, { @@ -6481,7 +6487,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "11jujxz8tKTqcUYymco3BA", + "fileId": "e6mh1teh1MIrtFzbPAM1x8", "sync": false }, { @@ -6582,7 +6588,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "98KUFI4WlMaJuDiZm6YPsO", + "fileId": "7b9xk4GC1N17dhoP7xN5ex", "sync": false }, { @@ -6626,7 +6632,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "fcqOWSzr5Aio2+x7XwIWBJ", + "fileId": "63v6JH8eZM9oIuu/JwHUj0", "sync": false }, { @@ -6862,7 +6868,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "14qGPlX8tIRqXsQxj8Wu0x", + "fileId": "a4r3KbA0BIa5KBYl+8TxoS", "sync": false }, { @@ -7029,7 +7035,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "8aizGzV6pBKK44QPTM/1qX", + "fileId": "b0CsGTLoBIub9aou+uF9x3", "sync": false }, { @@ -7130,7 +7136,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "fb0jCarZ9AV7U2NU7vbkcY", + "fileId": "77fjDvcp1Kp68SdH3uS5jI", "sync": false }, { @@ -7169,7 +7175,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "beaIvzA4VOJI+4SmYZhNXE", + "fileId": "ef76m1gspA8ocIk3GqN0va", "sync": false }, { @@ -7282,7 +7288,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 100, "height": 8 }, "_anchorPoint": { @@ -7344,7 +7350,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 2.7755575615628914e-15, "height": 8 }, "_anchorPoint": { @@ -7414,7 +7420,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "26SxQNv/BEzaUi+TE7kq0i", + "fileId": "32jztRyb5Kmr3rlXd0ajug", "sync": false }, { @@ -7450,12 +7456,12 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 15, + "x": 44.2, "y": -10, "z": 0 }, @@ -7512,7 +7518,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "1awwhp9TpIqq+6ykYZg/er", + "fileId": "7cBp95NihNhrByEMflBiNb", "sync": false }, { @@ -7523,7 +7529,7 @@ "__id__": 203 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -7610,7 +7616,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "b2xRO7WMFCRpz8ja3tV+nF", + "fileId": "81aFT0YKBEWY2iHCgFj1jC", "sync": false }, { @@ -7621,7 +7627,7 @@ "__id__": 203 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -7708,7 +7714,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e5dtdenWxB7q6MNzSQlUvv", + "fileId": "920hSR1NtDcIexsDCh0j/G", "sync": false }, { @@ -7747,12 +7753,12 @@ "__id__": 203 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 100, "_N$barSprite": { "__id__": 205 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -7764,7 +7770,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e5t2ODLKpCQopu6pPZ6XZK", + "fileId": "68R8gZIWFLzq7TXVA3jxfA", "sync": false }, { @@ -7803,7 +7809,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "eeQvg/9QRFo6fdmkw1BELQ", + "fileId": "b7CiWzLpJMP79S3hX0jbeO", "sync": false }, { @@ -8048,7 +8054,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "88ykdz1jBAJpPIxh/6U+JE", + "fileId": "fbz3Q7qoBEz4RC4X029ZZd", "sync": false }, { @@ -8146,7 +8152,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "6798oQoFhD6LUPdFgu9qp9", + "fileId": "44IepbM9ZJB4xkYITEWYre", "sync": false }, { @@ -8244,7 +8250,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "0auirc4f9LsYdwbxuErAlP", + "fileId": "80o8yQk7NCvJYx64AcGP+d", "sync": false }, { @@ -8342,7 +8348,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7ayFoYGgdFLKrtr5zwxCa4", + "fileId": "a5Ib+56flLvq8bse1dxHI9", "sync": false }, { @@ -8398,7 +8404,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "a2EPVh3PhA0pr6EgQDxkcI", + "fileId": "20y0iUXU1H+bjrKWP3TGfx", "sync": false }, { @@ -8437,7 +8443,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e5p87+CoNGiLAfbIenMYiX", + "fileId": "77mqOWkdRK0YQPcdZVjwWR", "sync": false }, { @@ -8448,7 +8454,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "04SsvcsklE0bbXSYCjmGkH", + "fileId": "1ecIbuupdNOJSm09KrUdZe", "sync": false }, { @@ -8548,7 +8554,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "2dyM8GMS5Pe5DAyWkgT/5y", + "fileId": "55r1gGK9xCjLrx5Phrdt7X", "sync": false }, { @@ -8559,7 +8565,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "3esCqVPI9E1r6wY44a1W3x", + "fileId": "f2OJsN14pFLJbWaioMpn8a", "sync": false }, { @@ -8723,7 +8729,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "19qKDLyHFOl7+inQe9yiLb", + "fileId": "8cSuIgP25HXouF6G1fh4DL", "sync": false }, { @@ -8762,7 +8768,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "859j8PBOhAXZiWlC11Ve+X", + "fileId": "a5Dj1vLMBFU5ZeMyvBB25D", "sync": false }, { @@ -8863,7 +8869,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "f0thM2h61EAZiOpUEi1NFb", + "fileId": "73AUFYqmFHQZBlmhQfg2in", "sync": false }, { @@ -9027,7 +9033,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c0LsO9R+JOWLs/nG5tdXbJ", + "fileId": "e5ouHpwwhJ/qJyBRp/vSaU", "sync": false }, { @@ -9066,7 +9072,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "ddnjN2OJFKVZ4fAyztSNss", + "fileId": "45z4N7iBBIJrhzCt7mSai5", "sync": false }, { @@ -9232,7 +9238,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "45JrnaSQFIdZZ8rlfz+USW", + "fileId": "01f+kV9cRF0bNM3QiT04Mz", "sync": false }, { @@ -9271,7 +9277,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "bdzAWz6xBG0Jk0LCpIUC1G", + "fileId": "f6GRu4g6JI/4/orhp6S15D", "sync": false }, { @@ -9297,6 +9303,12 @@ "infoPage": { "__uuid__": "1d196a77-b46b-43d2-9d2e-cfa0bfcf0602" }, + "limitBar": { + "__id__": 217 + }, + "cegget": { + "__id__": 208 + }, "_id": "" }, { @@ -9307,7 +9319,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "8f29Dgn1dKHZ9xID7OyVLB", + "fileId": "a9mhJc2upBwYoNjAsSnZ88", "sync": false }, { @@ -9565,7 +9577,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "aaY8e12AdIB4DAHxHn4KcY", + "fileId": "ceqsI+gBpC3LyiCWyGRcUH", "sync": false }, { @@ -9797,7 +9809,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "06GVU7gOdH56DF1yD2QS/e", + "fileId": "d4lhGW3l5M9Z5IJ5qN9ZJk", "sync": false }, { @@ -9836,7 +9848,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7dSFzZ49tDuoA+smqFyd5S", + "fileId": "edcPlI6rZGCbyMKKiIDHDB", "sync": false }, { @@ -9937,7 +9949,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "f7QTJA2JdPFIQe0o5R0imB", + "fileId": "9c0mNrySlMWZ0JAyGuSBrz", "sync": false }, { @@ -9948,7 +9960,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "68F1FHwFFNcb0iFPQNlcrV", + "fileId": "13dNFnjdRG3bkjAr0zpxhX", "sync": false }, { @@ -10121,7 +10133,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "55abOMjydFRqF5rbdIADyC", + "fileId": "50Hzp/Ht5MWrhRqGt+Kt+p", "sync": false }, { @@ -10147,7 +10159,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "80738D9yxMbZgna9EBr+LR", + "fileId": "89re0pvDhMMYXx4Ykf28r/", "sync": false }, { @@ -10248,7 +10260,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "ddZSoHRWVF47DNUflHuNXU", + "fileId": "31/FLspqRCP7wEccRaMhJx", "sync": false }, { @@ -10349,7 +10361,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "cbQHuameZJLLiK4sqNPzOl", + "fileId": "96nNzGELNJhqX5XdE7XdNi", "sync": false }, { @@ -10542,7 +10554,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "1aecmr3y5H/r4Tm9r1+qOz", + "fileId": "3fveRLBSVDPK+rsI1qdoBz", "sync": false }, { @@ -10611,7 +10623,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "49AzbzlJpLaZj2jFUDf7Bd", + "fileId": "46mqERMopOA58zqGUwha9W", "sync": false }, { @@ -10790,7 +10802,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "4aPCVcOVZOCI5G4GAM0HPf", + "fileId": "2eWDkqWodNw6qxnzkPjGU0", "sync": false }, { @@ -10891,7 +10903,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "67ftFs6cxBZJH/Td0iuvS6", + "fileId": "f4uYXNzr5L6ogkeammeevI", "sync": false }, { @@ -10992,7 +11004,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "d47TSFoaJOmavEQCY1rZlU", + "fileId": "19aDxdYRhI+blS6SqH/A5m", "sync": false }, { @@ -11093,7 +11105,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "5b9du/mfRFs6poTcATBG00", + "fileId": "93Bn/HJptERoQpPjBGBOwb", "sync": false }, { @@ -11194,7 +11206,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "61tyC6J3FCd69YDcGBeLIq", + "fileId": "6dBrxUiFlHn5MndWJ9U1jk", "sync": false }, { @@ -11238,7 +11250,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "acJ6kKPIxOeaePS+vBG/kw", + "fileId": "bb7VJel7BB+oqpIo/Ha4Ng", "sync": false }, { @@ -11474,7 +11486,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "46UAbuCqxHHKDOdZaW1nOD", + "fileId": "38wq/jHQJJ95VGpZmGwMb6", "sync": false }, { @@ -11641,7 +11653,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "62iimBdZpLCbeRv52rddxw", + "fileId": "70oCkfMzlOU4VGyUSmnoCk", "sync": false }, { @@ -11742,7 +11754,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e1aV0pwUtLNr5c0NS2IKeo", + "fileId": "dfTU/NJoxFfo9AUgLzBYeq", "sync": false }, { @@ -11781,7 +11793,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "16Xy3NBdROtb+xoGMHPjib", + "fileId": "7fxHIZqx1DN4gm2V5BiRj4", "sync": false }, { @@ -11894,7 +11906,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 100, "height": 8 }, "_anchorPoint": { @@ -11956,7 +11968,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 2.7755575615628914e-15, "height": 8 }, "_anchorPoint": { @@ -12026,7 +12038,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "18XoXe4zZI9Zov55ieoLSK", + "fileId": "2f7oVI4MdGjbPzLel67WNz", "sync": false }, { @@ -12062,12 +12074,12 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 15, + "x": 44.2, "y": -10, "z": 0 }, @@ -12124,7 +12136,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "07rzSJXYxCKJEGh4L7aJqZ", + "fileId": "69bF6lDX1MY6YN+rZ3C6x0", "sync": false }, { @@ -12135,7 +12147,7 @@ "__id__": 336 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -12222,7 +12234,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7bdUwXh5FJ1pqY3dxl41dd", + "fileId": "acDriFKkZLLI9SNqRAix8x", "sync": false }, { @@ -12233,7 +12245,7 @@ "__id__": 336 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -12320,7 +12332,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "22Orf6+0tLkpO6rYOP2eVy", + "fileId": "02G8fgWGFL75HK5omYUCG2", "sync": false }, { @@ -12359,12 +12371,12 @@ "__id__": 336 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 100, "_N$barSprite": { "__id__": 338 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -12376,7 +12388,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "38nFS8a7dL75A+WkMjU3yR", + "fileId": "a9lqy1S/hH+Z++AGjmvFSA", "sync": false }, { @@ -12415,7 +12427,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7eDN5WzXhNqYIcd35sifnl", + "fileId": "55t2PB/x1DR7QgvdxOZxpD", "sync": false }, { @@ -12660,7 +12672,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "dbSEpcHEVL2q8qgRa+Q6fF", + "fileId": "86qaboidVGIoxvZtNiVSJ6", "sync": false }, { @@ -12758,7 +12770,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "7bjMwYrTRPBqHL4Ulad3mu", + "fileId": "9fjRNEaFtC74O2HOdbOrGk", "sync": false }, { @@ -12856,7 +12868,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "b7ZzzLioZPX4VZFR9llMp9", + "fileId": "884Rx04rRPOpqET/kH4hzb", "sync": false }, { @@ -12954,7 +12966,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "17pv8Uk4NBZamxVgKVVfgN", + "fileId": "cdgznFtMhG/ZYLtOGIpRIi", "sync": false }, { @@ -13010,7 +13022,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "a1QWP1ZdBBY4MkYfD0W1jK", + "fileId": "72cBytfX1NOIuqxMSdgWYR", "sync": false }, { @@ -13049,7 +13061,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "8avkl98kZD/qXy4IeCoqMt", + "fileId": "0ae0Y4yotFbpDWvbWvtTIM", "sync": false }, { @@ -13060,7 +13072,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "d5v/YjQ2ROZaJd5SW4H7Wp", + "fileId": "feAJ4OsuRGaqz9xN1Ac4AR", "sync": false }, { @@ -13160,7 +13172,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "d3RTecWQ9FHrqrhDXMaBji", + "fileId": "27pCmoK8NN3YMlIPyURyrM", "sync": false }, { @@ -13171,7 +13183,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "deoOBEsuJBBItyCAi4Hj5e", + "fileId": "d4NWzJPpFPmqJVVJMr1I15", "sync": false }, { @@ -13335,7 +13347,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "02EgonuadPwa7UJzat0KEi", + "fileId": "696sZYcr1KyLw0zyE5bmV9", "sync": false }, { @@ -13374,7 +13386,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "52EdLifLFNRpoLmFVp2y4h", + "fileId": "99sSmPW3JAoozTYgeEebKT", "sync": false }, { @@ -13475,7 +13487,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e9XnLPzNdAHL5YVdYJ1tIy", + "fileId": "cebWnz9OVEjKhP4Tx9+BhI", "sync": false }, { @@ -13639,7 +13651,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "364jZ2a6FKtJpVKlh3e3LL", + "fileId": "44ZzUZ9VVCTY9zWSkZ6aiI", "sync": false }, { @@ -13678,7 +13690,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "baBTXu2K9PsJAXubLf9Xc2", + "fileId": "0eiEimaDFLJI9nreOzYrQ+", "sync": false }, { @@ -13844,7 +13856,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "83K0La6a1BsZOEE3/5vn4Y", + "fileId": "25cTNwDFZJ+Jcja5kxsAya", "sync": false }, { @@ -13883,7 +13895,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "a7Ept9I41G+bBcu3nUh459", + "fileId": "4aiuwtKJJDOaUZRY9Gxdzv", "sync": false }, { @@ -13909,6 +13921,12 @@ "infoPage": { "__uuid__": "1d196a77-b46b-43d2-9d2e-cfa0bfcf0602" }, + "limitBar": { + "__id__": 350 + }, + "cegget": { + "__id__": 341 + }, "_id": "" }, { @@ -13919,7 +13937,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "264vgZv3RJpJH6NiSzyZcD", + "fileId": "a8y0FUp01MKoLYuxIROdOO", "sync": false }, { @@ -14177,7 +14195,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "4bF+3Nh4NFMKXsRQ2lkryR", + "fileId": "d2vXjdKixFmYYmWjU3LbK2", "sync": false }, { @@ -14409,7 +14427,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "2eurK/tKZHoL14sFpScVOe", + "fileId": "473kKLe/5AF4XZJH47IZFj", "sync": false }, { @@ -14448,7 +14466,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "dabXV29XhD05FaF1KqoSmd", + "fileId": "26fGquLmlMu4ACJJ8iriEo", "sync": false }, { @@ -14549,7 +14567,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "34UyefQYpJGYE+wh1xl8kk", + "fileId": "6fBoVV98BF/ZLFdOvZWlP/", "sync": false }, { @@ -14560,7 +14578,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "21C/aS361FQoIVSOvXQqDu", + "fileId": "3f7HEyThhKPaQtiPI1uM0p", "sync": false }, { @@ -14733,7 +14751,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "4emM7lWadBU6Qn3OMgkaUd", + "fileId": "19FfMqLtdJvabLcOe0htfz", "sync": false }, { @@ -14759,7 +14777,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "8dtth14jlGMaW3wxN9zr/Q", + "fileId": "06dNMJz0FPBagubOs7fYR0", "sync": false }, { @@ -14860,7 +14878,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "b4QIzzUkdHe63ABG745yr9", + "fileId": "f3700ZiHREF55FLp8KEVgR", "sync": false }, { @@ -14961,7 +14979,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e6RWi7UrZI8YDeupGvn1Na", + "fileId": "27guv+pX5KiLMY5Jl8r6Y5", "sync": false }, { @@ -15154,7 +15172,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "f0OsJMQTBO77qos7Dk+wUV", + "fileId": "3cAHpCsS5H5J3C/doI6bAt", "sync": false }, { @@ -15223,7 +15241,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "90vSVvfIBGAbw3QJhUQIfT", + "fileId": "a3IIbIyTNO6oygcuKzNAyA", "sync": false }, { @@ -15402,7 +15420,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "0c7c5zRTNC3aGuJKn5Ng1e", + "fileId": "a1hp4skeZFjb/5MQYfic2J", "sync": false }, { @@ -15503,7 +15521,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c0WUvAQO5GuaLL4TRhw/0C", + "fileId": "15bb2J/HlCep/LqQYCY9nI", "sync": false }, { @@ -15604,7 +15622,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "88fgZAQW9FC6jPK0vPJAlT", + "fileId": "33unPdf61M1adviPhkAiiz", "sync": false }, { @@ -15705,7 +15723,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c8xQfF+KVAEbFh23iif1mY", + "fileId": "45cJA6y09Hg5jLmaa6xuga", "sync": false }, { @@ -15806,7 +15824,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c1P7ldjjJNJoyODXxISoTi", + "fileId": "54hZgn8bBIvb5VJKymS2tX", "sync": false }, { @@ -15850,7 +15868,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "21Y2wRpotHobX3CR6K+eod", + "fileId": "e0G2hEcORLu6yxEIcqtfLw", "sync": false }, { @@ -16086,7 +16104,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c6qjXvNo1GJa78q75MJkP+", + "fileId": "2e01O6hO1IaZ2AmDPLWdYc", "sync": false }, { @@ -16253,7 +16271,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "12CG3P/dhDrIyPh4Q8E6Dr", + "fileId": "ecarmoU/FPeIuHnDrhgZzF", "sync": false }, { @@ -16354,7 +16372,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "48jUdP+4BNvbj8jBIcfboC", + "fileId": "9b4nCkG99I5JE0uHSSjc7e", "sync": false }, { @@ -16393,7 +16411,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "43vJPEuodB85c+jD6qQNsc", + "fileId": "4bJs5q5ZpCEriqWUC6Oc9k", "sync": false }, { @@ -16506,7 +16524,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 100, "height": 8 }, "_anchorPoint": { @@ -16568,7 +16586,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 2.7755575615628914e-15, "height": 8 }, "_anchorPoint": { @@ -16638,7 +16656,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "bek+6dT2xJZb+xG2TxyCtt", + "fileId": "97nqFjKbtJ3aBBxCFgM/wE", "sync": false }, { @@ -16674,12 +16692,12 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 15, + "x": 44.2, "y": -10, "z": 0 }, @@ -16736,7 +16754,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "f6SP9xCwZNvJNhLhs2hXVH", + "fileId": "0b7WkcNVRG4LhXqr+Zgmrb", "sync": false }, { @@ -16747,7 +16765,7 @@ "__id__": 469 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -16834,7 +16852,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "708zmbXPZNjJm0RS5L5H8z", + "fileId": "eabGfZu0BINrgOt1F88kL3", "sync": false }, { @@ -16845,7 +16863,7 @@ "__id__": 469 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -16932,7 +16950,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "b9nck++eZLqZw/VK5nOiKm", + "fileId": "cehVgxmHFPyr7tE43t7X9i", "sync": false }, { @@ -16971,12 +16989,12 @@ "__id__": 469 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 100, "_N$barSprite": { "__id__": 471 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -16988,7 +17006,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "0fSmOSkgtNMbmhEgV13cJi", + "fileId": "aasilq+wxOn4G9INSZEWtK", "sync": false }, { @@ -17027,7 +17045,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "74E2dZOixEDItkEZhEL8bK", + "fileId": "deJArVkWVBwoZDVgOvysQY", "sync": false }, { @@ -17272,7 +17290,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e8S50rEjRAHbvxjCKwnMMF", + "fileId": "2cKbOcUXVDGrPIBwxGTYJC", "sync": false }, { @@ -17370,7 +17388,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "91YPT8HgtBWb7O4fKZM+wl", + "fileId": "aarH+5oTZEzqbO5/8sGa+p", "sync": false }, { @@ -17468,7 +17486,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "54igEuHx5GLKr2tJt4Losv", + "fileId": "88Ou3XUvBJf6NBy3neho3Q", "sync": false }, { @@ -17566,7 +17584,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "2d/9RLiipPepro2kU3RziZ", + "fileId": "63gATov9lNuI+Ei6Z0S4i2", "sync": false }, { @@ -17622,7 +17640,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "1eKFgLm9BAG581CTuU8mrV", + "fileId": "92hVbglT9FeKLIHJp4D72h", "sync": false }, { @@ -17661,7 +17679,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "1fox+coPxFUqSuLQOuPzM7", + "fileId": "97mdCccVVNwJCxkOPsn9fr", "sync": false }, { @@ -17672,7 +17690,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "bcJp7vfXFDk5sxYln8FVct", + "fileId": "653PrcJatMFpjj4+b9HS0C", "sync": false }, { @@ -17772,7 +17790,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "88AwQtRKhJH4e6tFZpieym", + "fileId": "23KOtlttVFZLGdMmjq3DA+", "sync": false }, { @@ -17783,7 +17801,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "96IkNcYFJKgrfiwjLxYsXY", + "fileId": "384QNaE1BNZL+e8T1NsT3Y", "sync": false }, { @@ -17947,7 +17965,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "82o6L74vxJpJUXRM6EUUdA", + "fileId": "8fu3NgBwBNI5HnePMEhGpL", "sync": false }, { @@ -17986,7 +18004,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "e4BHciUN5IrpruEBL1QzCz", + "fileId": "e0m3OOP1JAtI99kI7qwM7W", "sync": false }, { @@ -18087,7 +18105,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "6dn8hXHiFOEYUNuU561BIf", + "fileId": "116xWWMjBFJ7EMd8125hg1", "sync": false }, { @@ -18251,7 +18269,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "10thu4p6pKuLYEwXJ2P3Ar", + "fileId": "570YCriS9INKoTBYbbwB51", "sync": false }, { @@ -18290,7 +18308,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "c0sLSD+UtB5q0lxXydLhis", + "fileId": "eee2Oa375M9qux+C8FjbpL", "sync": false }, { @@ -18456,7 +18474,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "b4UmeY6DFHZKtP2AwZSJ1q", + "fileId": "14YyTU6kNKLpdTXNRmMdAA", "sync": false }, { @@ -18495,7 +18513,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "9eNu5Y9JNK5qHLl5gg58C8", + "fileId": "84qdSJZW1PD7RM3Nf5BPXr", "sync": false }, { @@ -18521,6 +18539,12 @@ "infoPage": { "__uuid__": "1d196a77-b46b-43d2-9d2e-cfa0bfcf0602" }, + "limitBar": { + "__id__": 483 + }, + "cegget": { + "__id__": 474 + }, "_id": "" }, { @@ -18531,7 +18555,7 @@ "asset": { "__uuid__": "4ed9ea9f-e693-49bb-8c73-e14d406fa1df" }, - "fileId": "74/zjSrQxPP6GaMbK5px+C", + "fileId": "6fIVfXlDhERIo1up7mMvzr", "sync": false }, { diff --git a/assets/res/prefabs/NUI/cell_guns.prefab b/assets/res/prefabs/NUI/cell_guns.prefab index 0dc74d08..3d204023 100644 --- a/assets/res/prefabs/NUI/cell_guns.prefab +++ b/assets/res/prefabs/NUI/cell_guns.prefab @@ -1242,7 +1242,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 200, "height": 8 }, "_anchorPoint": { @@ -1304,7 +1304,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, + "width": 5.551115123125783e-15, "height": 8 }, "_anchorPoint": { @@ -1410,19 +1410,19 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 40, - "y": -10, + "x": 93.4, + "y": -13.1, "z": 0 }, "_scale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.3, + "y": 0.3, "z": 1 }, "_rotationX": 0, @@ -1483,7 +1483,7 @@ "__id__": 30 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -1581,7 +1581,7 @@ "__id__": 30 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -1707,12 +1707,12 @@ "__id__": 30 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 200, "_N$barSprite": { "__id__": 32 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -3354,6 +3354,12 @@ "infoPage": { "__uuid__": "8d8395f4-3a15-4514-9394-9ea02aaa6252" }, + "limitBar": { + "__id__": 44 + }, + "cegget": { + "__id__": 35 + }, "_id": "" }, { @@ -3629,7 +3635,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "42R9B+CURO36WDgg7crcfB", + "fileId": "21j1oOpxRNTYg6pG+Li6jj", "sync": false }, { @@ -3730,7 +3736,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "61SVL2UfxD1Z8TJhHN4DZX", + "fileId": "cci5V0FZtAyYYGd5wiF+oE", "sync": false }, { @@ -3980,7 +3986,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "47kRkbBMhBSYP9ZICPtQ3X", + "fileId": "1czhg04DZIFZsXAW0IUED0", "sync": false }, { @@ -4081,7 +4087,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "b2JRWxzfpD7LwwzgFcpqiE", + "fileId": "96uJfmVTdHnIP+S5ol2K8U", "sync": false }, { @@ -4182,7 +4188,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "e6qLyWeWtFfrGSOk8lz1BT", + "fileId": "d8RCsNfhJHUaVi6mH+RnVW", "sync": false }, { @@ -4283,7 +4289,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "8fAcDl+fZBDb4UEoci6GCk", + "fileId": "74Ohx2RUFKZICKQQNXbI8i", "sync": false }, { @@ -4384,7 +4390,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "56OS1WDWpNCrmWjy252lJL", + "fileId": "a2E7cbMLVEW5lA6tQ24hQ7", "sync": false }, { @@ -4428,7 +4434,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "caaXBPwIlBeotvyeG68SvD", + "fileId": "b6rpEzbvNEvLuipREr21+m", "sync": false }, { @@ -4606,7 +4612,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 200, "height": 8 }, "_anchorPoint": { @@ -4668,7 +4674,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, + "width": 5.551115123125783e-15, "height": 8 }, "_anchorPoint": { @@ -4738,7 +4744,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "8dx7/aN+JAM7s/y3h5/szU", + "fileId": "97xUiOxHpBXrrcBxXH2Sit", "sync": false }, { @@ -4774,19 +4780,19 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 40, - "y": -10, + "x": 93.4, + "y": -13.1, "z": 0 }, "_scale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.3, + "y": 0.3, "z": 1 }, "_rotationX": 0, @@ -4836,7 +4842,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "aeNrg2yBRBD7rNidWNvULO", + "fileId": "1cLiMC8vtIq7s16wBXjSU9", "sync": false }, { @@ -4847,7 +4853,7 @@ "__id__": 128 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -4934,7 +4940,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "3fpFvO7ixA+ZRl9DMrcoI9", + "fileId": "e4Z8BZXfVAE46inahXO0xG", "sync": false }, { @@ -4945,7 +4951,7 @@ "__id__": 128 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -5032,7 +5038,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "b1BU9RNjxK5aSjRvTInSJJ", + "fileId": "bdFQ/ihWZCLLJGYN1muDiI", "sync": false }, { @@ -5071,12 +5077,12 @@ "__id__": 128 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 200, "_N$barSprite": { "__id__": 130 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -5088,7 +5094,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "6fTQSD0RNIXI9wEFtanFq/", + "fileId": "f77AIx89pM9ZoRAjR5F7iu", "sync": false }, { @@ -5127,7 +5133,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "2cu80RZABCY7vdzE14IGQl", + "fileId": "daNmqvEQNMyITAOCP4kBAY", "sync": false }, { @@ -5372,7 +5378,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "5952t6DrNJTJxZO/sw83Kc", + "fileId": "35+ae0rmNC0JMy2fuleiIl", "sync": false }, { @@ -5470,7 +5476,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "55aXLYythHQYNmg4IkBp/L", + "fileId": "74iI2H9CxAJKt6IodZXPpV", "sync": false }, { @@ -5568,7 +5574,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "3bUqfc0zxNuoPSnerQngUM", + "fileId": "93aZVVWUpHlLSA8artwY0K", "sync": false }, { @@ -5666,7 +5672,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "fa2yOmt+NEcJb5gmtMz1v/", + "fileId": "55Dxy8cLxOiLJBj5U9ITil", "sync": false }, { @@ -5722,7 +5728,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "f4/EMnv1xBaYX78CowKwea", + "fileId": "e0QP8MRVpFdKszyGezLiyt", "sync": false }, { @@ -5761,7 +5767,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "60AX0H2pJDA7OyJ213OJl+", + "fileId": "a8Lrdnh09Ixq9+fM28ls9f", "sync": false }, { @@ -5772,7 +5778,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "a801JPerlGw6b42OJMWvhQ", + "fileId": "755kjTsZdBxorV/y22KWHA", "sync": false }, { @@ -5872,7 +5878,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "eehFADYbNJcp73tmsqvTQL", + "fileId": "5382/kLwRJL4Cskm49VFT2", "sync": false }, { @@ -6042,7 +6048,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "39uLjobsBEXb3r7NOUqLXU", + "fileId": "ceWKceMYlGxoyV+kWUZ1Tb", "sync": false }, { @@ -6140,7 +6146,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "bbAySw35tEya48EOzPBRKd", + "fileId": "79iYfUP+FDiZn/FwERo/Ie", "sync": false }, { @@ -6179,7 +6185,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "09HsDIJkdJKLhp5Gd2l9v0", + "fileId": "86Lwm0RDFArpk/F9pA6sxT", "sync": false }, { @@ -6190,7 +6196,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "df76SnwblAYrL7EnQyfz4h", + "fileId": "2cDPRDbC9Pqb+nVLV3jsEI", "sync": false }, { @@ -6290,7 +6296,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "c68PtjwsdAD6p8xQQiHsRU", + "fileId": "35WzwBrFhFA4zqzzD+7zpG", "sync": false }, { @@ -6454,7 +6460,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "ccXyjajEtNB4cJOPJ/GZSn", + "fileId": "47N09XtVFDDLFnzWBmEa72", "sync": false }, { @@ -6493,7 +6499,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "adD2hCICdN9KZRitv/r/h3", + "fileId": "b8AVRUoyJC2ZalDz4DqMyQ", "sync": false }, { @@ -6659,7 +6665,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "9caZTH8ZRF+7MTsZF/uc36", + "fileId": "76qs2PWCJIJqent0xTjGkt", "sync": false }, { @@ -6698,7 +6704,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "58gEq4OPRDWbBI1GOwS7LO", + "fileId": "9aZ2uT3L5Abrs9/HGsmAfM", "sync": false }, { @@ -6718,6 +6724,12 @@ "infoPage": { "__uuid__": "8d8395f4-3a15-4514-9394-9ea02aaa6252" }, + "limitBar": { + "__id__": 142 + }, + "cegget": { + "__id__": 133 + }, "_id": "" }, { @@ -6808,7 +6820,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "04oSyeq7pKeLvdZFaX7EJX", + "fileId": "e5UTQCGZlES7iq1NUmGtvz", "sync": false }, { @@ -6993,7 +7005,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "420KyLGvdILoCAG7+2/r00", + "fileId": "4fjyg7XU5M1LLprpQ/+U7C", "sync": false }, { @@ -7094,7 +7106,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "312Orb3S5ARrszaNLVE6Y6", + "fileId": "feyqIQ0rdIfbxozIVrHlt7", "sync": false }, { @@ -7344,7 +7356,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "bf8mxBjfFG050iFC/b5WZP", + "fileId": "c5+653555Lv51LCs1MiMw+", "sync": false }, { @@ -7445,7 +7457,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "61A+G6wExJ4bfQvy4791yq", + "fileId": "53KhsIKxBG6JmUY3c5lQit", "sync": false }, { @@ -7546,7 +7558,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "9ej8PInx9JG55Mwe/vfjUC", + "fileId": "c5FEWhdLpKsoQedp56y+G/", "sync": false }, { @@ -7647,7 +7659,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "d5bF1gqUBMgJyMDGmurHSB", + "fileId": "88GR0ByVhPGIAsP6O+t+5v", "sync": false }, { @@ -7748,7 +7760,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "50wCvydwxORbZ4hTwFX+CI", + "fileId": "965YY20yFGR4TcQiDImqCD", "sync": false }, { @@ -7792,7 +7804,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "f8NmlnmrtM/qtZ+lcybyDv", + "fileId": "db937MunBAXpEItplOZcoH", "sync": false }, { @@ -7970,7 +7982,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 200, "height": 8 }, "_anchorPoint": { @@ -8032,7 +8044,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, + "width": 5.551115123125783e-15, "height": 8 }, "_anchorPoint": { @@ -8102,7 +8114,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "7935ab73FOD5LI1WPq9yDK", + "fileId": "7fPZytULNLdKWed/9Comf7", "sync": false }, { @@ -8138,19 +8150,19 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_position": { "__type__": "cc.Vec3", - "x": 40, - "y": -10, + "x": 93.4, + "y": -13.1, "z": 0 }, "_scale": { "__type__": "cc.Vec3", - "x": 0.2, - "y": 0.2, + "x": 0.3, + "y": 0.3, "z": 1 }, "_rotationX": 0, @@ -8200,7 +8212,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "931FmH96tLm6k46kWy1CZS", + "fileId": "bbEo6RwZdKVY1NVnLh8gnd", "sync": false }, { @@ -8211,7 +8223,7 @@ "__id__": 226 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -8298,7 +8310,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "28GSNdg6FJdrcr429YAhHd", + "fileId": "53ZQQ0Ut1O87QaTKdIK32f", "sync": false }, { @@ -8309,7 +8321,7 @@ "__id__": 226 }, "_children": [], - "_active": true, + "_active": false, "_level": 7, "_components": [ { @@ -8396,7 +8408,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "25N6DVF5JD04LoQ4DiwZLB", + "fileId": "71lEevxvdLuab900OfbogZ", "sync": false }, { @@ -8435,12 +8447,12 @@ "__id__": 226 }, "_enabled": true, - "_N$totalLength": 84, + "_N$totalLength": 200, "_N$barSprite": { "__id__": 228 }, "_N$mode": 0, - "_N$progress": 0.5, + "_N$progress": 2.7755575615628914e-17, "_N$reverse": false, "_id": "" }, @@ -8452,7 +8464,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "00qgNHvMhA7pUXKlWAh3MC", + "fileId": "ccYQ/CVq9CmZ8iZUI+4Xjv", "sync": false }, { @@ -8491,7 +8503,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "c5cU/jsmNAh7jPnkLiCYwz", + "fileId": "4cO49wGcVPk4iCmhdHK293", "sync": false }, { @@ -8736,7 +8748,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "f5apb3CmxIapUzB+todVfH", + "fileId": "f7W5jt3GFJKLimodWYQRhi", "sync": false }, { @@ -8834,7 +8846,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "90tUmRrt9G96iJnl1G7iaI", + "fileId": "c5FHfGKS5BJbOpSVcJdJ3c", "sync": false }, { @@ -8932,7 +8944,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "d7qzVvplxL9opHa03uhXew", + "fileId": "08BCjRtm9NOqvkYRIuMGAq", "sync": false }, { @@ -9030,7 +9042,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "520Ttguq9Db6umYztU/zUZ", + "fileId": "2a8EuxIhZKLrLW9LOB84Zv", "sync": false }, { @@ -9086,7 +9098,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "25eHHiL19NQImdZecBDVak", + "fileId": "7393gVuttCD61geNqBFEv7", "sync": false }, { @@ -9125,7 +9137,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "57lURSJs5KMKvo4aKCV0cN", + "fileId": "d99fjDTxVEhp8CuQ1hYbmi", "sync": false }, { @@ -9136,7 +9148,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "917wykOupM1Yu9pIyJ6zGK", + "fileId": "3aK8bcZeBEirbR4nt39xr3", "sync": false }, { @@ -9236,7 +9248,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "fboHPcA+1HOLJA+GJpXrlm", + "fileId": "56/J0VdMRBApbgbKDmjd1i", "sync": false }, { @@ -9406,7 +9418,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "c0Fo6ZOPlAjJzAZG3y+lq+", + "fileId": "2aq7LGaMJGzJVLFNEMO476", "sync": false }, { @@ -9504,7 +9516,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "0bt4/tETdAPaYfdFoCiMwx", + "fileId": "d2AeiU9uRBCKpeTK59K2cP", "sync": false }, { @@ -9543,7 +9555,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "57KqtsR69NaKnzCHm65Oak", + "fileId": "4cyqPfSk9LepCWe9b7J+zO", "sync": false }, { @@ -9554,7 +9566,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "7ctlB/64FEYKR/ECo+Z8SP", + "fileId": "30xQe9GUtA0KPPQPKrW5Nn", "sync": false }, { @@ -9654,7 +9666,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "5cCHcsL6BG6pMYo0SHf7Cg", + "fileId": "6ab3nM6xhH4rV80G9oYCXL", "sync": false }, { @@ -9818,7 +9830,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "f1/Cd8b2tFuLFAkGYBmC4x", + "fileId": "32fSljlspKZJtna/jM7F6+", "sync": false }, { @@ -9857,7 +9869,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "81Yk7xp/NF8Ikz5O+kCdTW", + "fileId": "1dH0HonGVMTpguRcbaIXof", "sync": false }, { @@ -10023,7 +10035,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "e1AwFPQIRASKZFZ5m5gFWg", + "fileId": "ceVMAp7AJNFZEiI9VYcsE4", "sync": false }, { @@ -10062,7 +10074,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "b0SXC/bmxNwJ8jop8DrgB7", + "fileId": "d8O+jYJddIca4fINAb8JPn", "sync": false }, { @@ -10082,6 +10094,12 @@ "infoPage": { "__uuid__": "8d8395f4-3a15-4514-9394-9ea02aaa6252" }, + "limitBar": { + "__id__": 240 + }, + "cegget": { + "__id__": 231 + }, "_id": "" }, { @@ -10172,7 +10190,7 @@ "asset": { "__uuid__": "59d41064-fb21-4842-953c-7f0dd7f54924" }, - "fileId": "2fQW0aaJFLiKwVZtBpcGYN", + "fileId": "c7mSZy4/5GfqTa41GKLijm", "sync": false }, { diff --git a/assets/scripts/UI/guns/guns_info.ts b/assets/scripts/UI/guns/guns_info.ts index 91e5f4c7..c93c9264 100644 --- a/assets/scripts/UI/guns/guns_info.ts +++ b/assets/scripts/UI/guns/guns_info.ts @@ -30,6 +30,10 @@ export default class guns_info extends UIBase { @property(cc.Label) lab_lucky: cc.Label = null; @property(cc.Label) lab_successrate: cc.Label = null; + @property(cc.ProgressBar) limitBar:cc.ProgressBar = null; + + @property(cc.Label) cegget:cc.Label = null; + protected update(dt: number): void { if (this.scrollView.getScrollOffset().y <= 0) { this.arrow_down.active = true; @@ -75,6 +79,13 @@ export default class guns_info extends UIBase { element.node.color = cc.Color.GRAY; } }); + + // + var limit = data.ceg_uplimit + var get = data.today_get_gold + + this.limitBar.progress =1-(limit-get)/limit + this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` } onClickAdvance() { diff --git a/assets/scripts/UI/guns/guns_single.ts b/assets/scripts/UI/guns/guns_single.ts index 5f5f9710..dd445adf 100644 --- a/assets/scripts/UI/guns/guns_single.ts +++ b/assets/scripts/UI/guns/guns_single.ts @@ -9,11 +9,15 @@ export class guns_single extends cc.Component { @property(cc.Node) imgNode: cc.Node = null; @property(cc.Prefab) infoPage: cc.Prefab = null; + @property(cc.ProgressBar) limitBar:cc.ProgressBar = null; + + @property(cc.Label) cegget:cc.Label = null; private curData = {}; private guninfo = {}; init(data) { + if (data == 0) { this.node.active = false; return; @@ -21,6 +25,12 @@ export class guns_single extends cc.Component { // console.log(data) + // + var limit = data.ceg_uplimit + var get = data.today_get_gold + + this.limitBar.progress =1-(limit-get)/limit + this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` this.node.active = true; this.curData = data; diff --git a/assets/scripts/UI/hero/UIHeroinfo.ts b/assets/scripts/UI/hero/UIHeroinfo.ts index 6d752522..9b1aebc8 100644 --- a/assets/scripts/UI/hero/UIHeroinfo.ts +++ b/assets/scripts/UI/hero/UIHeroinfo.ts @@ -74,6 +74,10 @@ export class UIHeroinfo extends UIBase { @property(cc.Prefab) buyHero: cc.Prefab = null; + @property(cc.ProgressBar) limitBar:cc.ProgressBar = null; + + @property(cc.Label) cegget:cc.Label = null; + private hero_id = 0; private allSkins = []; private curentBuyId = 0; @@ -97,6 +101,14 @@ export class UIHeroinfo extends UIBase { } init(data: any) { + + // + var limit = data.ceg_uplimit + var get = data.today_get_gold + + this.limitBar.progress =1-(limit-get)/limit + this.cegget.string = `${data.today_get_gold}/${data.ceg_uplimit}` + this.hero_id = data.hero_id; // init map const infoMap = new Map([ diff --git a/assets/scripts/UI/hero/herochoseone.js b/assets/scripts/UI/hero/herochoseone.js index cc5476b1..6bb8b381 100644 --- a/assets/scripts/UI/hero/herochoseone.js +++ b/assets/scripts/UI/hero/herochoseone.js @@ -25,6 +25,15 @@ cc.Class({ default: null, type: cc.Prefab, }, + limitBar: { + default: null, + type: cc.ProgressBar, + }, + cegget: { + default: null, + type: cc.Label, + }, + }, initdata(v) { @@ -35,6 +44,16 @@ cc.Class({ this.node.active = false; return; } + + + // + var limit = v.ceg_uplimit + var get = v.today_get_gold + + this.limitBar.progress =1-(limit-get)/limit + this.cegget.string = `${v.today_get_gold}/${v.ceg_uplimit}` + + this.hero_id = v.hero_id; var self = this; var cfg = gameConfig.playerConfig[v.hero_id];