lihe

54fa908e · haiyoucuv · d267957a · 54fa908e · 54fa908e · d267957a
Commit 54fa908e authored Sep 30, 2020 by haiyoucuv
175 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
+++ b/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
@@ -4,7 +4,7 @@
    "message": "nisei amet sunt Lorem",
    "data": {
        "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
-        "currentLevel": 120,
+        "currentLevel": 96,
        "power": 101,
        "tools": {
            "steps": 100,

--- a/resource/JoinPanel/joinBg.png
+++ b/resource/JoinPanel/joinBg.png
--- a/resource/JoinPanel/joinBtn.png
+++ b/resource/JoinPanel/joinBtn.png
--- a/resource/festival/fesRedBombSta1.png
+++ b/resource/festival/fesRedBombSta1.png
--- a/resource/fiveVerHorDis/hor_ele0_0.png
+++ b/resource/fiveVerHorDis/hor_ele0_0.png
--- a/resource/fiveVerHorDis/hor_ele0_1.png
+++ b/resource/fiveVerHorDis/hor_ele0_1.png
--- a/resource/fiveVerHorDis/hor_ele0_10.png
+++ b/resource/fiveVerHorDis/hor_ele0_10.png
--- a/resource/fiveVerHorDis/hor_ele0_11.png
+++ b/resource/fiveVerHorDis/hor_ele0_11.png
--- a/resource/fiveVerHorDis/hor_ele0_12.png
+++ b/resource/fiveVerHorDis/hor_ele0_12.png
--- a/resource/fiveVerHorDis/hor_ele0_13.png
+++ b/resource/fiveVerHorDis/hor_ele0_13.png
--- a/resource/fiveVerHorDis/hor_ele0_14.png
+++ b/resource/fiveVerHorDis/hor_ele0_14.png
--- a/resource/fiveVerHorDis/hor_ele0_15.png
+++ b/resource/fiveVerHorDis/hor_ele0_15.png
--- a/resource/fiveVerHorDis/hor_ele0_2.png
+++ b/resource/fiveVerHorDis/hor_ele0_2.png
--- a/resource/fiveVerHorDis/hor_ele0_3.png
+++ b/resource/fiveVerHorDis/hor_ele0_3.png
--- a/resource/fiveVerHorDis/hor_ele0_4.png
+++ b/resource/fiveVerHorDis/hor_ele0_4.png
--- a/resource/fiveVerHorDis/hor_ele0_5.png
+++ b/resource/fiveVerHorDis/hor_ele0_5.png
--- a/resource/fiveVerHorDis/hor_ele0_6.png
+++ b/resource/fiveVerHorDis/hor_ele0_6.png
--- a/resource/fiveVerHorDis/hor_ele0_7.png
+++ b/resource/fiveVerHorDis/hor_ele0_7.png
--- a/resource/fiveVerHorDis/hor_ele0_8.png
+++ b/resource/fiveVerHorDis/hor_ele0_8.png
--- a/resource/fiveVerHorDis/hor_ele0_9.png
+++ b/resource/fiveVerHorDis/hor_ele0_9.png
--- a/resource/fiveVerHorDis/hor_ele1_0.png
+++ b/resource/fiveVerHorDis/hor_ele1_0.png
--- a/resource/fiveVerHorDis/hor_ele1_1.png
+++ b/resource/fiveVerHorDis/hor_ele1_1.png
--- a/resource/fiveVerHorDis/hor_ele1_10.png
+++ b/resource/fiveVerHorDis/hor_ele1_10.png
--- a/resource/fiveVerHorDis/hor_ele1_11.png
+++ b/resource/fiveVerHorDis/hor_ele1_11.png
--- a/resource/fiveVerHorDis/hor_ele1_12.png
+++ b/resource/fiveVerHorDis/hor_ele1_12.png
--- a/resource/fiveVerHorDis/hor_ele1_13.png
+++ b/resource/fiveVerHorDis/hor_ele1_13.png
--- a/resource/fiveVerHorDis/hor_ele1_14.png
+++ b/resource/fiveVerHorDis/hor_ele1_14.png
--- a/resource/fiveVerHorDis/hor_ele1_15.png
+++ b/resource/fiveVerHorDis/hor_ele1_15.png
--- a/resource/fiveVerHorDis/hor_ele1_2.png
+++ b/resource/fiveVerHorDis/hor_ele1_2.png
--- a/resource/fiveVerHorDis/hor_ele1_3.png
+++ b/resource/fiveVerHorDis/hor_ele1_3.png
--- a/resource/fiveVerHorDis/hor_ele1_4.png
+++ b/resource/fiveVerHorDis/hor_ele1_4.png
--- a/resource/fiveVerHorDis/hor_ele1_5.png
+++ b/resource/fiveVerHorDis/hor_ele1_5.png
--- a/resource/fiveVerHorDis/hor_ele1_6.png
+++ b/resource/fiveVerHorDis/hor_ele1_6.png
--- a/resource/fiveVerHorDis/hor_ele1_7.png
+++ b/resource/fiveVerHorDis/hor_ele1_7.png
--- a/resource/fiveVerHorDis/hor_ele1_8.png
+++ b/resource/fiveVerHorDis/hor_ele1_8.png
--- a/resource/fiveVerHorDis/hor_ele1_9.png
+++ b/resource/fiveVerHorDis/hor_ele1_9.png
--- a/resource/fiveVerHorDis/hor_ele2_0.png
+++ b/resource/fiveVerHorDis/hor_ele2_0.png
--- a/resource/fiveVerHorDis/hor_ele2_1.png
+++ b/resource/fiveVerHorDis/hor_ele2_1.png
--- a/resource/fiveVerHorDis/hor_ele2_10.png
+++ b/resource/fiveVerHorDis/hor_ele2_10.png
--- a/resource/fiveVerHorDis/hor_ele2_11.png
+++ b/resource/fiveVerHorDis/hor_ele2_11.png
--- a/resource/fiveVerHorDis/hor_ele2_12.png
+++ b/resource/fiveVerHorDis/hor_ele2_12.png
--- a/resource/fiveVerHorDis/hor_ele2_13.png
+++ b/resource/fiveVerHorDis/hor_ele2_13.png
--- a/resource/fiveVerHorDis/hor_ele2_14.png
+++ b/resource/fiveVerHorDis/hor_ele2_14.png
--- a/resource/fiveVerHorDis/hor_ele2_15.png
+++ b/resource/fiveVerHorDis/hor_ele2_15.png
--- a/resource/fiveVerHorDis/hor_ele2_2.png
+++ b/resource/fiveVerHorDis/hor_ele2_2.png
--- a/resource/fiveVerHorDis/hor_ele2_3.png
+++ b/resource/fiveVerHorDis/hor_ele2_3.png
--- a/resource/fiveVerHorDis/hor_ele2_4.png
+++ b/resource/fiveVerHorDis/hor_ele2_4.png
--- a/resource/fiveVerHorDis/hor_ele2_5.png
+++ b/resource/fiveVerHorDis/hor_ele2_5.png
--- a/resource/fiveVerHorDis/hor_ele2_6.png
+++ b/resource/fiveVerHorDis/hor_ele2_6.png
--- a/resource/fiveVerHorDis/hor_ele2_7.png
+++ b/resource/fiveVerHorDis/hor_ele2_7.png
--- a/resource/fiveVerHorDis/hor_ele2_8.png
+++ b/resource/fiveVerHorDis/hor_ele2_8.png
--- a/resource/fiveVerHorDis/hor_ele2_9.png
+++ b/resource/fiveVerHorDis/hor_ele2_9.png
--- a/resource/fiveVerHorDis/hor_ele3_0.png
+++ b/resource/fiveVerHorDis/hor_ele3_0.png
--- a/resource/fiveVerHorDis/hor_ele3_1.png
+++ b/resource/fiveVerHorDis/hor_ele3_1.png
--- a/resource/fiveVerHorDis/hor_ele3_10.png
+++ b/resource/fiveVerHorDis/hor_ele3_10.png
--- a/resource/fiveVerHorDis/hor_ele3_11.png
+++ b/resource/fiveVerHorDis/hor_ele3_11.png
--- a/resource/fiveVerHorDis/hor_ele3_12.png
+++ b/resource/fiveVerHorDis/hor_ele3_12.png
--- a/resource/fiveVerHorDis/hor_ele3_13.png
+++ b/resource/fiveVerHorDis/hor_ele3_13.png
--- a/resource/fiveVerHorDis/hor_ele3_14.png
+++ b/resource/fiveVerHorDis/hor_ele3_14.png
--- a/resource/fiveVerHorDis/hor_ele3_15.png
+++ b/resource/fiveVerHorDis/hor_ele3_15.png
--- a/resource/fiveVerHorDis/hor_ele3_2.png
+++ b/resource/fiveVerHorDis/hor_ele3_2.png
--- a/resource/fiveVerHorDis/hor_ele3_3.png
+++ b/resource/fiveVerHorDis/hor_ele3_3.png
--- a/resource/fiveVerHorDis/hor_ele3_4.png
+++ b/resource/fiveVerHorDis/hor_ele3_4.png
--- a/resource/fiveVerHorDis/hor_ele3_5.png
+++ b/resource/fiveVerHorDis/hor_ele3_5.png
--- a/resource/fiveVerHorDis/hor_ele3_6.png
+++ b/resource/fiveVerHorDis/hor_ele3_6.png
--- a/resource/fiveVerHorDis/hor_ele3_7.png
+++ b/resource/fiveVerHorDis/hor_ele3_7.png
--- a/resource/fiveVerHorDis/hor_ele3_8.png
+++ b/resource/fiveVerHorDis/hor_ele3_8.png
--- a/resource/fiveVerHorDis/hor_ele3_9.png
+++ b/resource/fiveVerHorDis/hor_ele3_9.png
--- a/resource/fiveVerHorDis/hor_ele4_0.png
+++ b/resource/fiveVerHorDis/hor_ele4_0.png
--- a/resource/fiveVerHorDis/hor_ele4_1.png
+++ b/resource/fiveVerHorDis/hor_ele4_1.png
--- a/resource/fiveVerHorDis/hor_ele4_10.png
+++ b/resource/fiveVerHorDis/hor_ele4_10.png
--- a/resource/fiveVerHorDis/hor_ele4_11.png
+++ b/resource/fiveVerHorDis/hor_ele4_11.png
--- a/resource/fiveVerHorDis/hor_ele4_12.png
+++ b/resource/fiveVerHorDis/hor_ele4_12.png
--- a/resource/fiveVerHorDis/hor_ele4_13.png
+++ b/resource/fiveVerHorDis/hor_ele4_13.png
--- a/resource/fiveVerHorDis/hor_ele4_14.png
+++ b/resource/fiveVerHorDis/hor_ele4_14.png
--- a/resource/fiveVerHorDis/hor_ele4_15.png
+++ b/resource/fiveVerHorDis/hor_ele4_15.png
--- a/resource/fiveVerHorDis/hor_ele4_2.png
+++ b/resource/fiveVerHorDis/hor_ele4_2.png
--- a/resource/fiveVerHorDis/hor_ele4_3.png
+++ b/resource/fiveVerHorDis/hor_ele4_3.png
--- a/resource/fiveVerHorDis/hor_ele4_4.png
+++ b/resource/fiveVerHorDis/hor_ele4_4.png
--- a/resource/fiveVerHorDis/hor_ele4_5.png
+++ b/resource/fiveVerHorDis/hor_ele4_5.png
--- a/resource/fiveVerHorDis/hor_ele4_6.png
+++ b/resource/fiveVerHorDis/hor_ele4_6.png
--- a/resource/fiveVerHorDis/hor_ele4_7.png
+++ b/resource/fiveVerHorDis/hor_ele4_7.png
--- a/resource/fiveVerHorDis/hor_ele4_8.png
+++ b/resource/fiveVerHorDis/hor_ele4_8.png
--- a/resource/fiveVerHorDis/hor_ele4_9.png
+++ b/resource/fiveVerHorDis/hor_ele4_9.png
--- a/resource/fiveVerHorDis/ver_ele0_0.png
+++ b/resource/fiveVerHorDis/ver_ele0_0.png
--- a/resource/fiveVerHorDis/ver_ele0_1.png
+++ b/resource/fiveVerHorDis/ver_ele0_1.png
--- a/resource/fiveVerHorDis/ver_ele0_10.png
+++ b/resource/fiveVerHorDis/ver_ele0_10.png
--- a/resource/fiveVerHorDis/ver_ele0_11.png
+++ b/resource/fiveVerHorDis/ver_ele0_11.png
--- a/resource/fiveVerHorDis/ver_ele0_12.png
+++ b/resource/fiveVerHorDis/ver_ele0_12.png
--- a/resource/fiveVerHorDis/ver_ele0_13.png
+++ b/resource/fiveVerHorDis/ver_ele0_13.png
--- a/resource/fiveVerHorDis/ver_ele0_14.png
+++ b/resource/fiveVerHorDis/ver_ele0_14.png
--- a/resource/fiveVerHorDis/ver_ele0_15.png
+++ b/resource/fiveVerHorDis/ver_ele0_15.png
--- a/resource/fiveVerHorDis/ver_ele0_2.png
+++ b/resource/fiveVerHorDis/ver_ele0_2.png
--- a/resource/fiveVerHorDis/ver_ele0_3.png
+++ b/resource/fiveVerHorDis/ver_ele0_3.png
--- a/resource/fiveVerHorDis/ver_ele0_4.png
+++ b/resource/fiveVerHorDis/ver_ele0_4.png
--- a/resource/fiveVerHorDis/ver_ele0_5.png
+++ b/resource/fiveVerHorDis/ver_ele0_5.png
--- a/resource/fiveVerHorDis/ver_ele0_6.png
+++ b/resource/fiveVerHorDis/ver_ele0_6.png
--- a/resource/fiveVerHorDis/ver_ele0_7.png
+++ b/resource/fiveVerHorDis/ver_ele0_7.png
--- a/resource/fiveVerHorDis/ver_ele0_8.png
+++ b/resource/fiveVerHorDis/ver_ele0_8.png
--- a/resource/fiveVerHorDis/ver_ele0_9.png
+++ b/resource/fiveVerHorDis/ver_ele0_9.png
--- a/resource/fiveVerHorDis/ver_ele1_0.png
+++ b/resource/fiveVerHorDis/ver_ele1_0.png
--- a/resource/fiveVerHorDis/ver_ele1_1.png
+++ b/resource/fiveVerHorDis/ver_ele1_1.png
--- a/resource/fiveVerHorDis/ver_ele1_10.png
+++ b/resource/fiveVerHorDis/ver_ele1_10.png
--- a/resource/fiveVerHorDis/ver_ele1_11.png
+++ b/resource/fiveVerHorDis/ver_ele1_11.png
--- a/resource/fiveVerHorDis/ver_ele1_12.png
+++ b/resource/fiveVerHorDis/ver_ele1_12.png
--- a/resource/fiveVerHorDis/ver_ele1_13.png
+++ b/resource/fiveVerHorDis/ver_ele1_13.png
--- a/resource/fiveVerHorDis/ver_ele1_14.png
+++ b/resource/fiveVerHorDis/ver_ele1_14.png
--- a/resource/fiveVerHorDis/ver_ele1_15.png
+++ b/resource/fiveVerHorDis/ver_ele1_15.png
--- a/resource/fiveVerHorDis/ver_ele1_2.png
+++ b/resource/fiveVerHorDis/ver_ele1_2.png
--- a/resource/fiveVerHorDis/ver_ele1_3.png
+++ b/resource/fiveVerHorDis/ver_ele1_3.png
--- a/resource/fiveVerHorDis/ver_ele1_4.png
+++ b/resource/fiveVerHorDis/ver_ele1_4.png
--- a/resource/fiveVerHorDis/ver_ele1_5.png
+++ b/resource/fiveVerHorDis/ver_ele1_5.png
--- a/resource/fiveVerHorDis/ver_ele1_6.png
+++ b/resource/fiveVerHorDis/ver_ele1_6.png
--- a/resource/fiveVerHorDis/ver_ele1_7.png
+++ b/resource/fiveVerHorDis/ver_ele1_7.png
--- a/resource/fiveVerHorDis/ver_ele1_8.png
+++ b/resource/fiveVerHorDis/ver_ele1_8.png
--- a/resource/fiveVerHorDis/ver_ele1_9.png
+++ b/resource/fiveVerHorDis/ver_ele1_9.png
--- a/resource/fiveVerHorDis/ver_ele2_0.png
+++ b/resource/fiveVerHorDis/ver_ele2_0.png
--- a/resource/fiveVerHorDis/ver_ele2_1.png
+++ b/resource/fiveVerHorDis/ver_ele2_1.png
--- a/resource/fiveVerHorDis/ver_ele2_10.png
+++ b/resource/fiveVerHorDis/ver_ele2_10.png
--- a/resource/fiveVerHorDis/ver_ele2_11.png
+++ b/resource/fiveVerHorDis/ver_ele2_11.png
--- a/resource/fiveVerHorDis/ver_ele2_12.png
+++ b/resource/fiveVerHorDis/ver_ele2_12.png
--- a/resource/fiveVerHorDis/ver_ele2_13.png
+++ b/resource/fiveVerHorDis/ver_ele2_13.png
--- a/resource/fiveVerHorDis/ver_ele2_14.png
+++ b/resource/fiveVerHorDis/ver_ele2_14.png
--- a/resource/fiveVerHorDis/ver_ele2_15.png
+++ b/resource/fiveVerHorDis/ver_ele2_15.png
--- a/resource/fiveVerHorDis/ver_ele2_2.png
+++ b/resource/fiveVerHorDis/ver_ele2_2.png
--- a/resource/fiveVerHorDis/ver_ele2_3.png
+++ b/resource/fiveVerHorDis/ver_ele2_3.png
--- a/resource/fiveVerHorDis/ver_ele2_4.png
+++ b/resource/fiveVerHorDis/ver_ele2_4.png
--- a/resource/fiveVerHorDis/ver_ele2_5.png
+++ b/resource/fiveVerHorDis/ver_ele2_5.png
--- a/resource/fiveVerHorDis/ver_ele2_6.png
+++ b/resource/fiveVerHorDis/ver_ele2_6.png
--- a/resource/fiveVerHorDis/ver_ele2_7.png
+++ b/resource/fiveVerHorDis/ver_ele2_7.png
--- a/resource/fiveVerHorDis/ver_ele2_8.png
+++ b/resource/fiveVerHorDis/ver_ele2_8.png
--- a/resource/fiveVerHorDis/ver_ele2_9.png
+++ b/resource/fiveVerHorDis/ver_ele2_9.png
--- a/resource/fiveVerHorDis/ver_ele3_0.png
+++ b/resource/fiveVerHorDis/ver_ele3_0.png
--- a/resource/fiveVerHorDis/ver_ele3_1.png
+++ b/resource/fiveVerHorDis/ver_ele3_1.png
--- a/resource/fiveVerHorDis/ver_ele3_10.png
+++ b/resource/fiveVerHorDis/ver_ele3_10.png
--- a/resource/fiveVerHorDis/ver_ele3_11.png
+++ b/resource/fiveVerHorDis/ver_ele3_11.png
--- a/resource/fiveVerHorDis/ver_ele3_12.png
+++ b/resource/fiveVerHorDis/ver_ele3_12.png
--- a/resource/fiveVerHorDis/ver_ele3_13.png
+++ b/resource/fiveVerHorDis/ver_ele3_13.png
--- a/resource/fiveVerHorDis/ver_ele3_14.png
+++ b/resource/fiveVerHorDis/ver_ele3_14.png
--- a/resource/fiveVerHorDis/ver_ele3_15.png
+++ b/resource/fiveVerHorDis/ver_ele3_15.png
--- a/resource/fiveVerHorDis/ver_ele3_2.png
+++ b/resource/fiveVerHorDis/ver_ele3_2.png
--- a/resource/fiveVerHorDis/ver_ele3_3.png
+++ b/resource/fiveVerHorDis/ver_ele3_3.png
--- a/resource/fiveVerHorDis/ver_ele3_4.png
+++ b/resource/fiveVerHorDis/ver_ele3_4.png
--- a/resource/fiveVerHorDis/ver_ele3_5.png
+++ b/resource/fiveVerHorDis/ver_ele3_5.png
--- a/resource/fiveVerHorDis/ver_ele3_6.png
+++ b/resource/fiveVerHorDis/ver_ele3_6.png
--- a/resource/fiveVerHorDis/ver_ele3_7.png
+++ b/resource/fiveVerHorDis/ver_ele3_7.png
--- a/resource/fiveVerHorDis/ver_ele3_8.png
+++ b/resource/fiveVerHorDis/ver_ele3_8.png
--- a/resource/fiveVerHorDis/ver_ele3_9.png
+++ b/resource/fiveVerHorDis/ver_ele3_9.png
--- a/resource/fiveVerHorDis/ver_ele4_0.png
+++ b/resource/fiveVerHorDis/ver_ele4_0.png
--- a/resource/fiveVerHorDis/ver_ele4_1.png
+++ b/resource/fiveVerHorDis/ver_ele4_1.png
--- a/resource/fiveVerHorDis/ver_ele4_10.png
+++ b/resource/fiveVerHorDis/ver_ele4_10.png
--- a/resource/fiveVerHorDis/ver_ele4_11.png
+++ b/resource/fiveVerHorDis/ver_ele4_11.png
--- a/resource/fiveVerHorDis/ver_ele4_12.png
+++ b/resource/fiveVerHorDis/ver_ele4_12.png
--- a/resource/fiveVerHorDis/ver_ele4_13.png
+++ b/resource/fiveVerHorDis/ver_ele4_13.png
--- a/resource/fiveVerHorDis/ver_ele4_14.png
+++ b/resource/fiveVerHorDis/ver_ele4_14.png
--- a/resource/fiveVerHorDis/ver_ele4_15.png
+++ b/resource/fiveVerHorDis/ver_ele4_15.png
--- a/resource/fiveVerHorDis/ver_ele4_2.png
+++ b/resource/fiveVerHorDis/ver_ele4_2.png
--- a/resource/fiveVerHorDis/ver_ele4_3.png
+++ b/resource/fiveVerHorDis/ver_ele4_3.png
--- a/resource/fiveVerHorDis/ver_ele4_4.png
+++ b/resource/fiveVerHorDis/ver_ele4_4.png
--- a/resource/fiveVerHorDis/ver_ele4_5.png
+++ b/resource/fiveVerHorDis/ver_ele4_5.png
--- a/resource/fiveVerHorDis/ver_ele4_6.png
+++ b/resource/fiveVerHorDis/ver_ele4_6.png
--- a/resource/fiveVerHorDis/ver_ele4_7.png
+++ b/resource/fiveVerHorDis/ver_ele4_7.png
--- a/resource/fiveVerHorDis/ver_ele4_8.png
+++ b/resource/fiveVerHorDis/ver_ele4_8.png
--- a/resource/fiveVerHorDis/ver_ele4_9.png
+++ b/resource/fiveVerHorDis/ver_ele4_9.png
--- a/resource/playScene/bubleEle0.png
+++ b/resource/playScene/bubleEle0.png
--- a/resource/playScene/bubleEle1.png
+++ b/resource/playScene/bubleEle1.png
--- a/resource/playScene/bubleEle2.png
+++ b/resource/playScene/bubleEle2.png
--- a/resource/playScene/bubleEle3.png
+++ b/resource/playScene/bubleEle3.png
--- a/resource/playScene/bubleEle4.png
+++ b/resource/playScene/bubleEle4.png
--- a/resource/res.json
+++ b/resource/res.json
--- a/src/ResJson.ts
+++ b/src/ResJson.ts
--- a/src/scene/PlayScene.ts
+++ b/src/scene/PlayScene.ts
--- a/src/something/anisCall/FesRedBombShowAni.ts
+++ b/src/something/anisCall/FesRedBombShowAni.ts
--- a/src/something/class/FestivalEle.ts
+++ b/src/something/class/FestivalEle.ts